Commit Graph

4062 Commits

Author SHA1 Message Date
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
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
charitha
fc4c9ae240 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-02-14 14:51:24 +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
dcde3a0b3d Merge pull request #597 from rasika/cloud-3.1.0
Fixing footer getting cluttered on /devicemgt/devices/search page
2017-02-14 14:47:18 +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
ef2a8df3a1 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-09 23:24:22 +05:30
kamidu
b946eeae74 fix url issues in the config.json 2017-02-09 23:24:15 +05:30
geethkokila
bce1395182 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-09 20:29:12 +05:30
kamidu
f772b35769 enable cloud related configurations to the devicemgt application 2017-02-09 20:15:49 +05:30
Geeth
a67204cf31 Merge pull request #590 from Kamidu/cloud-3.1.0
enable cloud related configurations to the devicemgt application
2017-02-09 20:05:31 +05:30
kamidu
4eaf2b41c8 enable cloud related configurations to the devicemgt application 2017-02-09 20:02:28 +05:30
geethkokila
5c659484e6 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-09 16:56:36 +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 Sachith Punchihewa
99de059dc5 Merge pull request #586 from Kamidu/cloud-3.1.0
cloud relatd ui fixes
2017-02-07 20:43:02 +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
WSO2 Builder
b051bd108b [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration 2017-02-06 22:57:33 +05:30
WSO2 Builder
ce78ac277e [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17 2017-02-06 22:57:23 +05:30
Geeth
d344ab2e00 Merge pull request #587 from lakshani/devicestatus
Added "change device status" feature to device view page
2017-02-06 22:37:45 +05:30
lakshani
18cb2b3e1f added java doc comments 2017-02-06 22:33:50 +05:30
lakshani
a2679fde4c added change device status to device view page 2017-02-06 22:23:55 +05:30
kamidu
fd3ff5496c cloud relatd ui fixes 2017-02-06 17:23:28 +05:30
lakshani
2d83033b26 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicestatus 2017-02-06 14:05:32 +05:30
lakshani
a9a6883adc updated device status button 2017-02-06 14:05:11 +05:30
charitha
fbd8516c82 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-02-06 12:38:51 +05:30
WSO2 Builder
c954731870 [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration 2017-02-06 12:15:58 +05:30
WSO2 Builder
e68c3d170b [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16 2017-02-06 12:15:44 +05:30
geethkokila
71a689ea4b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-06 12:03:53 +05:30
Kamidu Sachith Punchihewa
681c320542 Update user-menu.hbs 2017-02-06 12:02:13 +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