Commit Graph

4243 Commits

Author SHA1 Message Date
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
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
geethkokila
275f413652 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-03 16:20:11 +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 Sachith Punchihewa
5f8f4a82d1 Merge pull request #583 from Kamidu/master
cloud ui and enable location without das
2017-02-03 15:56:26 +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
charitha
c224fe7cab Fix https://wso2.org/jira/browse/IOTS-436 2017-02-02 19:28:07 +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
charitha
72ccc9d076 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-02-02 15:54:09 +05:30
charitha
79018f9a4c Fix https://wso2.org/jira/browse/IOTS-436 2017-02-02 15:52:41 +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
charitha
49465ee0c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-02-02 14:56:16 +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