Commit Graph

4243 Commits

Author SHA1 Message Date
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
ayyoob
525b55d603 avoid race condition by loading tiers 2017-03-06 11:30:22 +05:30
Ayyoob Hamza
f554f62e1d Merge pull request #621 from ayyoob/cloud-3.1.0
added permission and subscription fix
2017-03-03 17:07:58 +05:30
ayyoob
5e4b0564b7 added permission fix for operation and synchronised application creation to avoid duplicate subscription 2017-03-03 17:02:36 +05:30
Susinda Perera
1009c98da4 Merge pull request #620 from Megala21/revert_task
Reverting task related changes, that are done for cloud deployment
2017-03-03 14:03:41 +05:30
ayyoob
6a0c0cb299 added default permissions 2017-03-02 20:27:32 +05:30
Megala
a2d0c59e17 Revert 2988357eb9 2017-03-02 15:18:34 +05:30
Megala
4fdeec89cc Revert f3f7635d3b 2017-03-02 15:11:59 +05:30
Milan Perera
2a250371a2 Merge pull request #619 from ayyoob/cloud-3.1.0
added logger trace and made api app registration to be device type specific
2017-03-02 14:33:56 +05:30
ayyoob
d66e439f49 added carbon local ip as config 2017-03-02 14:05:57 +05:30
Susinda Perera
44904b6601 Merge pull request #618 from susinda/3.1.0-test
increment carbon-devicemgt version to 2.0.20
2017-03-02 12:40:16 +05:30
Susinda
09b74211c4 increment carbon-devicemgt version to 2.0.20 2017-03-02 12:39:19 +05:30
ayyoob
5d3aa49e06 added logger trace support for apim integration service 2017-03-02 00:31:34 +05:30
ayyoob
c088a9bc93 fixed api subscribe issue for device specific app creation 2017-03-01 23:26:17 +05:30
WSO2 Builder
7f98d37835 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration 2017-02-28 21:22:53 +05:30