Commit Graph

3857 Commits

Author SHA1 Message Date
ayyoob
b1b0b03ce1 changed license year 2017-03-13 18:01:41 +05:30
ayyoob
2384755a97 added claimable property and fixed unsecured endpoint bug 2017-03-08 03:14:51 +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
ayyoob
6a0c0cb299 added default permissions 2017-03-02 20:27:32 +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
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
ayyoob
470500b80e added ssl context 2017-02-27 16:44:21 +05:30
Geeth
264cd7e1f1 Merge pull request #592 from geethkokila/cloud-3.1.0
Fixing the task to get the only device registered tenants
2017-02-24 12:33:14 +05:30
geethkokila
e90dc8b6c1 Fixing the compile error 2017-02-24 12:32:00 +05:30
geethkokila
d8303356cd Fixing the conflicts 2017-02-24 12:16:14 +05:30
Kamidu Sachith Punchihewa
96bdb7c4ae Merge pull request #616 from Kamidu/cloud-3.1.0
Cloud 3.1.0
2017-02-20 18:21:58 +05:30
kamidu
b7e3b28722 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-20 18:20:14 +05:30
kamidu
4e16e29b1c removing group sharing 2017-02-20 18:20:04 +05:30
Geeth
349e1448eb Merge pull request #615 from DimalChandrasiri/cloud-3.1.0
Removed analytics link temporarily
2017-02-20 17:33:46 +05:30
Imesh Chandrasiri
3c90f8ad49 temporary removal of view analytics 2017-02-20 17:19:20 +05:30
Imesh Chandrasiri
8cf92e8a5b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-20 15:11:08 +05:30
Imesh Chandrasiri
a938d57a65 Removing analytics link from groups listing 2017-02-20 15:11:00 +05:30
Kamidu Sachith Punchihewa
587c798f09 Merge pull request #613 from Kamidu/cloud-3.1.0
remove tennent related token handlers
2017-02-19 21:49:58 +05:30
Kamidu Sachith Punchihewa
4a5c99af78 remove tennent related token handlers 2017-02-19 21:49:19 +05:30
Kamidu Sachith Punchihewa
f03d701c24 Merge pull request #612 from DimalChandrasiri/cloud-3.1.0
Temporary advance search removal commit
2017-02-19 19:39:13 +05:30
Imesh Chandrasiri
5097416d69 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-19 19:34:35 +05:30
Imesh Chandrasiri
368647f176 Temporary advance search removal commit 2017-02-19 19:34:28 +05:30
Kamidu Sachith Punchihewa
112efda8d5 Merge pull request #611 from Kamidu/cloud-3.1.0
removing device edit option
2017-02-19 18:45:07 +05:30
Kamidu Sachith Punchihewa
0da8847787 removing device edit option 2017-02-19 18:44:39 +05:30
Kamidu Sachith Punchihewa
616d42ccaa Merge pull request #610 from DimalChandrasiri/cloud-3.1.0
Tooltip overflow fix
2017-02-19 18:26:30 +05:30
Imesh Chandrasiri
f5e5dce872 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-19 18:25:07 +05:30
Imesh Chandrasiri
ee209064e3 Tooltip css fix 2017-02-19 18:24:59 +05:30
Kamidu Sachith Punchihewa
617ffb6578 Merge pull request #608 from Kamidu/cloud-3.1.0
resolving return type issue in group mgt
2017-02-19 17:54:39 +05:30
Kamidu Sachith Punchihewa
367dc1a30b resolving return type issue in group mgt 2017-02-19 17:48:11 +05:30
Kamidu Sachith Punchihewa
7ad808f2fb Merge pull request #607 from Kamidu/cloud-3.1.0
Cloud 3.1.0
2017-02-19 16:05:29 +05:30
Kamidu Sachith Punchihewa
527b844ee3 Error handled on the user session invalidation 2017-02-19 16:03:49 +05:30
Kamidu Sachith Punchihewa
318fbf9215 role loading issues 2017-02-19 15:54:53 +05:30
Kamidu Sachith Punchihewa
282801c814 updating cloud dashboard 2017-02-19 15:32:28 +05:30
Kamidu Sachith Punchihewa
8f9e53fc91 Merge pull request #606 from Kamidu/cloud-3.1.0
cloud related ui fixes
2017-02-17 17:58:50 +05:30
kamidu
7480ccaa15 fixing datatable issues 2017-02-17 17:56:29 +05:30
kamidu
3e061f6e8b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-17 16:29:22 +05:30
kamidu
6a67f251ac cloud related ui fixs 2017-02-17 16:29:11 +05:30
Hasunie
d1783bc0eb Merge pull request #601 from hasuniea/cloud-3.1.0
Fixing the task to get the only device registered tenants
2017-02-16 18:45:37 +05:30
Hasunie
8bb75d291c Avoiding package exporting org.wso2.carbon.device.mgt.core.internal 2017-02-16 18:30:40 +05:30
Hasunie
2a9027a15e Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-16 18:19:35 +05:30
Hasunie
6b1ab86276 fixing policyManagementDataHolder issue 2017-02-16 18:19:05 +05:30
Kamidu Sachith Punchihewa
2aa412df8e Merge pull request #605 from DimalChandrasiri/cloud-3.1.0
Tooltip model fix
2017-02-16 16:57:08 +05:30
Imesh Chandrasiri
3786ef2636 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-16 16:49:54 +05:30
Imesh Chandrasiri
0cddd896d4 Tooltip fix 2017-02-16 16:49:44 +05:30
Kamidu Sachith Punchihewa
03ab5ab853 Merge pull request #604 from Kamidu/cloud-3.1.0
chenge the group creating steps
2017-02-16 15:25:09 +05:30