Commit Graph

4257 Commits

Author SHA1 Message Date
Kamidu Sachith Punchihewa
66baa3a71b adding the removed tenant based token handlers 2017-02-19 22:11:28 +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
WSO2 Builder
93258c598d [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration 2017-02-19 18:04:13 +05:30
WSO2 Builder
2da8898755 [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18 2017-02-19 18:04:00 +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
5a1331d805 Merge pull request #609 from Kamidu/master
remove websocket related codes
2017-02-19 17:54:30 +05:30
Kamidu Sachith Punchihewa
5fbe92107d remove websocket related codes 2017-02-19 17:53:35 +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
Hasunie
a577ec3b7a Merge pull request #603 from Kamidu/cloud-3.1.0
adding ui changes to the cloud related uis
2017-02-16 12:04:24 +05:30
kamidu
4725eb3c3b chenge the group creating steps 2017-02-16 11:59:47 +05:30
kamidu
486e02fd71 adding ui changes to the cloud related uis 2017-02-16 06:11:42 +05:30
Hasunie
315be0a3c7 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-15 18:09:29 +05:30
Rasika Perera
9ca552584a Merge pull request #602 from rasika/cloud-3.1.0
Adding tooltips
2017-02-15 13:49:28 +05:30
Rasika Perera
b8a1b945bb Adding tooltips 2017-02-15 13:47:59 +05:30
Kamidu Sachith Punchihewa
bfaf03d2dc Merge pull request #594 from DimalChandrasiri/cloud-3.1.0
Model Popup title space issue fix
2017-02-15 11:18:46 +05:30
Imesh Chandrasiri
9d80fcfd54 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-14 22:38:27 +05:30
Imesh Chandrasiri
7bc5d35746 data table padding fix 2017-02-14 22:38:09 +05:30
Kamidu Sachith Punchihewa
4d02f9971e Merge pull request #591 from Kamidu/cloud-3.1.0
enable cloud related configurations to the devicemgt application
2017-02-14 22:29:25 +05:30
Hasunie
b584a39a41 removing comma seperation in import packages 2017-02-14 22:28:00 +05:30
Hasunie
476e439fe2 Fixing the task to get the only device registered tenants 2017-02-14 22:16:55 +05:30
Rasika Perera
3924e124b8 Merge pull request #600 from rasika/cloud-3.1.0
Adding cloud error pages for jaggery.conf
2017-02-14 19:52:55 +05:30
Rasika Perera
d92c52b89b Adding cloud error pages for jaggery.conf 2017-02-14 19:49:41 +05:30
Rasika Perera
50a5e10a88 Merge pull request #599 from rasika/cloud-3.1.0
Moving error into common logic page.
2017-02-14 19:40:24 +05:30
Rasika Perera
8931478a55 Moving error into common logic page. If in cloud mode; change "default": "uuf.page.error" into "default": "cdmf.page.error" in config.json 2017-02-14 19:38:11 +05:30
kamidu
aba4ceaf76 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-14 19:28:22 +05:30