Commit Graph

3968 Commits

Author SHA1 Message Date
WSO2 Builder
4328c3c39d [WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare release v2.0.27 2017-03-15 18:04:12 +05:30
Kamidu Sachith Punchihewa
14d517e89d Merge pull request #641 from wso2/cloud-3.1.0
Cloud related fixes
2017-03-15 17:47:26 +05:30
WSO2 Builder
c6bb8e0128 [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare for next development iteration 2017-03-14 17:47:54 +05:30
WSO2 Builder
da9002ba9f [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare release v2.0.26 2017-03-14 17:47:43 +05:30
Susinda Perera
9453a0b9cb Merge pull request #638 from amalhub/master
Fixing issue: Portal dashboard login is not supported for non-admin role users
2017-03-14 17:42:09 +05:30
amalhub
541f5440ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-03-14 17:09:57 +05:30
amalhub
2c0ac79dce Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/637 2017-03-14 17:07:16 +05:30
Hasunie
1ee313ea77 Merge pull request #636 from harshanL/cloud-3.1.0
Fixed Device renaming issue.
2017-03-14 16:49:21 +05:30
WSO2 Builder
6114f4b2d5 [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare for next development iteration 2017-03-14 15:27:06 +05:30
WSO2 Builder
ea8f19f26d [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare release v2.0.25 2017-03-14 15:26:55 +05:30
Harshan Liyanage
1cbdb84cf1 Fixed merge conflicts with PR-623 2017-03-14 14:59:03 +05:30
Harshan Liyanage
e686b2af0e Resolved merge conflicts 2017-03-14 14:54:48 +05:30
Harshan Liyanage
3106839d4d Merge pull request #635 from Kamidu/cloud-3.1.0
re enabling device renaming
2017-03-14 14:37:10 +05:30
kamidu
6fe7470af5 re enabling device renaming 2017-03-14 14:29:36 +05:30
Harshan Liyanage
4272bd1a7a Merge branch 'sameeragunarathne-master' 2017-03-14 14:27:17 +05:30
Harshan Liyanage
755786db8b Merge branch 'master' of https://github.com/sameeragunarathne/carbon-device-mgt into sameeragunarathne-master 2017-03-14 14:26:40 +05:30
Harshan Liyanage
06ccbe28cc Fixed Device renaming issue. 2017-03-14 14:13:21 +05:30
Harshan Liyanage
da70593110 Merge pull request #634 from Kamidu/cloud-3.1.0
Cloud 3.1.0
2017-03-14 14:11:20 +05:30
WSO2 Builder
d433525145 [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration 2017-03-14 14:09:19 +05:30
WSO2 Builder
35ee3eca3a [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24 2017-03-14 14:09:08 +05:30
kamidu
590e21f419 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-03-14 14:07:25 +05:30
kamidu
3ff2c9894f role filtering for device cloud is enabled 2017-03-14 14:06:22 +05:30
Kamidu Sachith Punchihewa
1a35595701 Merge pull request #633 from harshanL/master
Fixed device renaming issue.
2017-03-14 14:03:18 +05:30
Harshan Liyanage
a7e28f2b10 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-03-14 13:42:52 +05:30
Harshan Liyanage
75486b3bb8 Fixed Device renaming issue. 2017-03-14 13:42:32 +05:30
Susinda Perera
d86bdb0be4 Update build status button 2017-03-14 12:45:59 +05:30
sameera910409
33132b1f8e refactor code for firebase cloud messaging 2017-03-14 10:26:23 +05:30
WSO2 Builder
4e0afb7d39 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration 2017-03-13 18:09:06 +05:30
WSO2 Builder
33f1448c82 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23 2017-03-13 18:08:55 +05:30
Harshan Liyanage
3ab025a6d8 Merge pull request #631 from ayyoob/cloud-3.1.0
added claimable property and fixed unsecured endpoint bug
2017-03-13 18:03:18 +05:30
ayyoob
b1b0b03ce1 changed license year 2017-03-13 18:01:41 +05:30
Harshan Liyanage
190d322858 Merge pull request #632 from Kamidu/cloud-3.1.0
Role filtering for device cloud
2017-03-13 17:47:49 +05:30
Kamidu Punchihewa
fa013bb537 Merge branch 'cloud-3.1.0' of https://github.com/Kamidu/carbon-device-mgt into cloud-3.1.0 2017-03-13 17:12:35 +05:30
Kamidu Punchihewa
e063fd0da9 code cleanup results 2017-03-13 17:11:07 +05:30
Kamidu Punchihewa
3e72231d5b code cleanup results 2017-03-13 17:08:54 +05:30
Kamidu Punchihewa
e6333438b9 ading role filtering and ui fixes 2017-03-13 17:01:54 +05:30
WSO2 Builder
e95e96f06c [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration 2017-03-10 13:09:08 +05:30
WSO2 Builder
5d55413e02 [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22 2017-03-10 13:08:55 +05:30
Susinda
40469d0e4d Adding maven.javadoc.skip to org.wso2.carbon.apimgt.integration.generated.client project 2017-03-10 12:57:47 +05:30
Susinda Perera
700da104fd Merge pull request #630 from susinda/master
Adding Hasunie's fix on initialOperations implementation
2017-03-10 12:02:05 +05:30
Susinda
e23aaa6647 Adding Hasunie's fix on initialOperations implementation 2017-03-10 11:54:43 +05:30
Susinda
668744a604 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-03-09 14:51:32 +05:30
Susinda
7083c4ec9b version corrected to 2.0.22-SNAPSHOT 2017-03-09 14:49:49 +05:30
Charitha Goonetilleke
8d4681aca5 Merge pull request #629 from ruwany/master
Fixing build break
2017-03-09 14:39:07 +05:30
Ace
1c1c49a846 Fixing build break 2017-03-09 14:23:27 +05:30
Susinda Perera
bd7d6939e5 Merge pull request #628 from susinda/master
Merging from cloud-3.1.0
2017-03-09 13:58:59 +05:30
Susinda
e83fa8cb02 org.wso2.carbon.apimgt.integration.generated.client version increment 2017-03-09 13:50:15 +05:30
WSO2 Builder
ae3300afde [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration 2017-03-09 13:14:50 +05:30
WSO2 Builder
6646c0c56f [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21 2017-03-09 13:14:38 +05:30
Susinda Perera
7c9659ed29 Merge pull request #1 from susinda/cloud-3.1.0
Cloud 3.1.0
2017-03-09 12:44:36 +05:30