Commit Graph

2570 Commits

Author SHA1 Message Date
Harshan Liyanage
9f01dbda44 Merge branch 'ayyoob-cloud-3.1.0' into cloud-3.1.0 2017-03-07 10:14:17 +05:30
ayyoob
d9d6964fee added missing plugins 2017-03-07 02:14:52 +05:30
ayyoob
2dd7f53489 added log support for server to server communication 2017-03-07 02:04:26 +05:30
Harshan Liyanage
0c3be8d00f Merge branch 'hasuniea-cloud-3.1.0' into cloud-3.1.0 2017-03-03 17:45:59 +05:30
Harshan Liyanage
b82a59c828 Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0 2017-03-03 17:45:26 +05:30
Hasunie
7fcf4e9a3b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:38:39 +05:30
Hasunie
3e50f0b737 adding initial operations 2017-03-03 17:37:55 +05:30
Harshan Liyanage
dc054e6ed5 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:10:17 +05:30
Harshan Liyanage
f2761e9b0a Removed info operation addition upon page load 2017-03-03 17:10:02 +05:30
Ayyoob Hamza
0129ebc847 Merge pull request #599 from ayyoob/cloud-3.1.0
fixed operation bar permission issue
2017-03-03 17:08:04 +05:30
ayyoob
a10eb7cb14 removed feature 2017-03-03 17:03:57 +05:30
ayyoob
77ec1c4107 fixed operation bar permission rendering issue 2017-03-02 20:27:46 +05:30
Milan Perera
360a58dce6 Merge pull request #596 from Kamidu/cloud-3.1.0
fix for leaflet tile not loading issues
2017-03-02 15:23:48 +05:30
kamidu
6604c23257 fix for leaflet tile not loading issues 2017-03-02 15:20:27 +05:30
Milan Perera
9458958521 Merge pull request #595 from ayyoob/cloud-3.1.0
resolved device type download issue in windows OS and added logs
2017-03-02 14:40:11 +05:30
ayyoob
eda4710211 resolved device type download issue in windows OS and added log support for service clients. 2017-03-02 00:32:39 +05:30
ayyoob
384ab40f5b added ssl context 2017-02-27 16:44:26 +05:30
Kamidu Sachith Punchihewa
dfc348f043 Merge pull request #588 from Kamidu/cloud-3.1.0
adding location operation to device view page
2017-02-19 19:11:08 +05:30
Kamidu Sachith Punchihewa
740bb976fa adding location operation to device view page 2017-02-19 19:10:20 +05:30
Kamidu Sachith Punchihewa
5708229ec1 Merge pull request #587 from Kamidu/cloud-3.1.0
adding screen shots
2017-02-17 20:47:17 +05:30
kamidu
afaa75d3a9 adding screen shots 2017-02-17 20:46:09 +05:30
Hasunie
56c40123de Merge pull request #586 from Kamidu/cloud-3.1.0
wording sugessions for cloud
2017-02-16 12:02:40 +05:30
kamidu
463d8a9dff wording sugessions for cloud 2017-02-16 00:23:58 +05:30
Kamidu Sachith Punchihewa
cbffdf6154 Merge pull request #581 from DimalChandrasiri/cloud-3.1.0
Model Popup title space issue fix
2017-02-15 11:18:57 +05:30
Imesh Chandrasiri
20bd1b399b Removed conflict markings 2017-02-15 11:16:41 +05:30
Imesh Chandrasiri
a890d9fb89 Device enrollment page revamp 2017-02-15 11:14:07 +05:30
Imesh Chandrasiri
bccc47ebd2 Conflict fix 2017-02-15 10:46:07 +05:30
Imesh Chandrasiri
4b7637a426 Device enrollment page revampl 2017-02-15 10:43:47 +05:30
Imesh Chandrasiri
37b032d710 Merge branch 'cloud-3.1.0' into cloud-3.1.0 2017-02-15 10:20:21 +05:30
Imesh Chandrasiri
67313882ed Device enrollment page changes for cloud 2017-02-14 22:39:17 +05:30
Kamidu Sachith Punchihewa
32c50e0ef7 Merge pull request #585 from Kamidu/cloud-3.1.0
Cloud 3.1.0
2017-02-14 22:29:55 +05:30
kamidu
71c93eec29 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-14 19:27:11 +05:30
kamidu
305df1c2bd enhansing the device cloud ui 2017-02-14 19:27:02 +05:30
Milan Perera
33b6368f3d Merge pull request #583 from ayyoob/210releasepatch
added device management api to be default
2017-02-14 15:52:57 +05:30
kamidu
9d733d6cc1 Fixing android location issue 2017-02-14 12:58:13 +05:30
Imesh Chandrasiri
f10e26f0a9 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-14 10:27:20 +05:30
Imesh Chandrasiri
2fcd5ca020 Model Popup title space issue fix 2017-02-14 10:26:56 +05:30
ayyoob
a294c20a2a added device management api to be default 2017-02-09 09:59:24 +05:30
ayyoob
facadb13b2 added mutual authenticator 2017-02-08 13:10:48 +05:30
ayyoob
e66311b844 fixed few multi tenant issues 2017-02-06 03:47:54 +05:30
ayyoob
00feadac97 fixed validation url property 2017-02-05 21:49:37 +05:30
ayyoob
917b1259c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-05 17:54:39 +05:30
ayyoob
dd3017578a added artefact deployment support for device types 2017-02-05 17:52:52 +05:30
Kamidu Sachith Punchihewa
475d5840f5 Merge pull request #577 from Kamidu/master
fix for the build issue
2017-02-03 17:21:47 +05:30
kamidu
5593e79757 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-03 17:20:50 +05:30
kamidu
fe338aa412 removing the module vfa plugin 2017-02-03 17:20:25 +05:30
Kamidu Sachith Punchihewa
68b36babe6 Merge pull request #575 from wso2/master
UI fixes for device cloud
2017-02-03 16:53:19 +05:30
Kamidu Sachith Punchihewa
28b9b6b334 Merge pull request #576 from Kamidu/master
Merge branch 'master' with 'cloud 3.0.1'
2017-02-03 16:53:01 +05:30
kamidu
c49338e3ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-03 16:51:36 +05:30
kamidu
bd715b7aac resolving branch conflicts 2017-02-03 16:51:25 +05:30