Commit Graph

3134 Commits

Author SHA1 Message Date
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
WSO2 Builder
b03936ca49 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19 2017-02-28 21:19:50 +05:30
charitha
abdffdbf39 Add tenant id to Enrollment Certificate 2017-02-28 21:18:46 +05:30
charitha
14dfc1b538 Fix minor issues found with jmeter tests 2017-02-28 21:18:22 +05:30
madhawap
f1b761d987 Minor code formating 2017-02-28 21:16:56 +05:30
Kamidu Sachith Punchihewa
8e530b0523 adding the removed tenant based token handlers 2017-02-28 21:16:21 +05:30
WSO2 Builder
82888e1d20 [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration 2017-02-28 21:15:10 +05:30
WSO2 Builder
b11c2e451b [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18 2017-02-28 21:14:44 +05:30
WSO2 Builder
67a091ff5a [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration 2017-02-28 21:12:47 +05:30
WSO2 Builder
dcc2088455 [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17 2017-02-28 21:12:14 +05:30
lakshani
eb12e5b9f1 Adding commit 'added java doc comments' 2017-02-28 21:11:15 +05:30
lakshani
9e5574dccc Adding commit 'added change device status to device view page' 2017-02-28 21:09:05 +05:30
lakshani
3f90b403c0 Adding lakshani's commit 'updated device status button' 2017-02-28 21:03:53 +05:30
WSO2 Builder
927b2d451d [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration 2017-02-28 21:00:32 +05:30
WSO2 Builder
dfe9b1ff9c [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16 2017-02-28 21:00:08 +05:30
charitha
7374a0825d Fix https://wso2.org/jira/browse/IOTS-436 2017-02-28 20:56:32 +05:30
charitha
d2991585aa Applying charithas commit on IOTS-436 2017-02-28 20:56:25 +05:30
ayyoob
470500b80e added ssl context 2017-02-27 16:44:21 +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
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
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
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
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
367dc1a30b resolving return type issue in group mgt 2017-02-19 17:48:11 +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
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
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
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
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
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
d92c52b89b Adding cloud error pages for jaggery.conf 2017-02-14 19:49:41 +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
kamidu
587f847934 ui improvements to device cloud 2017-02-14 19:28:09 +05:30
Milan Perera
28606f1729 Merge pull request #598 from ayyoob/210releasepatch
210releasepatch
2017-02-14 15:52:05 +05:30
Imesh Chandrasiri
c26d7fd15d Changed device loading icon for device loading page 2017-02-14 15:15:38 +05:30
Imesh Chandrasiri
dcb29b7792 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-14 14:48:48 +05:30
Imesh Chandrasiri
5a7fa99e0a Fix data table icon padding issue 2017-02-14 14:48:38 +05:30
Rasika Perera
fbae181f07 Fixing footer getting cluttered on /devicemgt/devices/search page 2017-02-14 14:46:17 +05:30
Imesh Chandrasiri
b579870672 Data table icon cursor added 2017-02-14 13:21:59 +05:30
Imesh Chandrasiri
23edb1de7a Model Popup title space issue fix 2017-02-14 10:23:58 +05:30
Imesh Chandrasiri
8bbb612de6 Fixing cloud header height issue and theme color 2017-02-13 16:06:28 +05:30
geethkokila
f3f7635d3b Fixing the task to get the only the device enrolled tenants 2017-02-13 12:34:09 +05:30
kamidu
8a07639d6b Fix responsive issue in clud header 2017-02-10 03:25:01 +05:30
kamidu
6e19ec31e3 fix url issues in the config.json 2017-02-10 02:47:25 +05:30
kamidu
b946eeae74 fix url issues in the config.json 2017-02-09 23:24:15 +05:30
kamidu
f772b35769 enable cloud related configurations to the devicemgt application 2017-02-09 20:15:49 +05:30
kamidu
4eaf2b41c8 enable cloud related configurations to the devicemgt application 2017-02-09 20:02:28 +05:30
ayyoob
dac7d3c1ee made device management to be default tag 2017-02-09 09:59:06 +05:30
ayyoob
67ae4c7c68 fixed api subscription issue 2017-02-09 09:11:22 +05:30
ayyoob
6c96d228ae added subscription fix 2017-02-09 03:02:56 +05:30
ayyoob
018b230b5a Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-08 13:12:30 +05:30
ayyoob
87910bc92b transferred mutual authenticator to jwt authenticator 2017-02-08 13:10:36 +05:30
kamidu
ddef86e226 stylish issues 2017-02-07 20:38:10 +05:30
kamidu
9cba33a6dc Modification to the header panel 2017-02-07 15:28:19 +05:30
kamidu
fd3ff5496c cloud relatd ui fixes 2017-02-06 17:23:28 +05:30
Kamidu Sachith Punchihewa
00b1f982c6 Update user-menu.hbs 2017-02-06 12:01:27 +05:30
ayyoob
ed7b67dd24 made it accept tenant domain as parameter 2017-02-06 03:47:27 +05:30
ayyoob
b7566f4e4a added artifact deployment support through UI 2017-02-05 17:51:48 +05:30
ayyoob
0999bb70a0 exposed artefact deployment through api
Merged Jasintha’s code
2017-02-05 17:51:15 +05:30
ayyoob
274d3e9aeb used jwt grant type instead of saml 2017-02-04 20:51:56 +05:30
Kamidu Sachith Punchihewa
559fe98cc9 Merge pull request #585 from wso2/master
Cloud ui fixes and the new master fixes
2017-02-03 17:24:49 +05:30
WSO2 Builder
54a278a1bc [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration 2017-02-03 16:08:26 +05:30
WSO2 Builder
3bc46c4d2d [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15 2017-02-03 16:08:12 +05:30
kamidu
befa75af9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-02-03 12:44:09 +05:30
kamidu
6af09cdd31 Remove the defaut black color for icons 2017-02-03 12:44:01 +05:30
WSO2 Builder
1bc8f5c28d [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration 2017-02-02 15:56:43 +05:30
WSO2 Builder
1483503790 [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14 2017-02-02 15:56:36 +05:30
Hasunie
54d0d7a5ee Merge pull request #582 from charithag/master-update-swagger-docs
Update swagger docs
2017-02-02 14:59:06 +05:30
kamidu
41fd402619 DIABLE CLOUD UI IN THE MASTER 2017-02-02 13:13:39 +05:30
kamidu
43b0d1f1ce Enable appstore and app publisher 2017-02-02 13:07:41 +05:30
Milan Perera
701d6e4522 Updated the snapshot version of intergration client 2017-02-01 12:55:56 +05:30
Milan Perera
a5f41ef734 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud 2017-02-01 12:14:59 +05:30
ayyoob
1387d326ca merged with origin 2017-02-01 00:08:14 +05:30