Commit Graph

4257 Commits

Author SHA1 Message Date
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
WSO2 Builder
21cdcdd21a [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration 2017-03-09 12:38:02 +05:30
WSO2 Builder
23be60ebd0 [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20 2017-03-09 12:37:49 +05:30
Susinda Perera
2147fbe092 Merge pull request #627 from susinda/master
Megre 3.1.0-test to master
2017-03-09 12:20:26 +05:30
Susinda
b0ecd4ba54 Merge branch 'master' into 3.1.0-test 2017-03-09 11:54:52 +05:30
Charitha Goonetilleke
968913f135 Merge pull request #626 from Kamidu/cloud-3.1.0
remove the cloud related config from config.json
2017-03-09 11:28:04 +05:30
kamidu
0fade6aa9f remove the cloud related config from config.jason 2017-03-08 15:54:08 +05:30
Charitha Goonetilleke
fc1cc5049f Merge pull request #625 from Kamidu/cloud-3.1.0
Device Cloud Requested UI fixes
2017-03-08 13:06:20 +05:30
kamidu
dd26f366df Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-03-08 12:50:07 +05:30
kamidu
f9a03133fa device cloude related ui improvements 2017-03-08 12:49:52 +05:30
ayyoob
2384755a97 added claimable property and fixed unsecured endpoint bug 2017-03-08 03:14:51 +05:30
Harshan Liyanage
0ac8329fbc Merge branch 'ayyoob-cloud-3.1.0' into cloud-3.1.0 2017-03-07 10:04:57 +05:30
ayyoob
964fb7ce72 regenerated swagger api based on apimgt 2.1.0 rest api 2017-03-07 01:56:51 +05:30