Commit Graph

2944 Commits

Author SHA1 Message Date
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
Susinda Perera
9b681d9ea0 Merge pull request #597 from susinda/3.1.0-test
carbon-device-mgt version changed to 2.0.20-SNAPSHOT
2017-03-03 15:09:42 +05:30
Susinda
66d2f32a4d carbon-device-mgt version changed to 2.0.20-SNAPSHOT 2017-03-03 14:59:51 +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
Susinda Perera
4f5e4b2230 Merge pull request #594 from susinda/3.1.0-test
Merging commits from master to 3.1.0-test
2017-02-28 20:30:49 +05:30
susinda
5ad6dc1f1d Fxing PhoneNumber Serach for android 2017-02-28 20:28:48 +05:30
lakshani
3505cc8abc Adding (cherry-pick) lakshani's commit on 'Fixed the issue in server startu' 2017-02-28 20:28:43 +05:30
Susinda Perera
6f9ea52218 Merge pull request #593 from wso2/cloud-3.1.0
Merging to 3.1.0-test from Cloud 3.1.0 - Till Feb-28
2017-02-28 19:25:12 +05:30
ayyoob
384ab40f5b added ssl context 2017-02-27 16:44:26 +05:30
Susinda Perera
95a3ee7657 Merge pull request #592 from susinda/master
Fxing PhoneNumber Serach for android
2017-02-24 16:13:42 +05:30
susinda
4b08604cd5 Fxing PhoneNumber Serach for android 2017-02-24 16:10:02 +05:30
Rasika Perera
844eb06e22 Merge pull request #591 from rasika/3.1.0-test
Fixing carbon apps not getting deployed
2017-02-23 15:23:20 +05:30
Rasika Perera
7f7256eac4 Fixing carbon apps not getting deployed 2017-02-23 15:10:06 +05:30
Hasunie
17c017379c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-21 11:50:12 +05:30
Hasunie
8954c51c01 Merge pull request #590 from lakshani/master
Fixed the issue in server startup- removed error logs
2017-02-20 14:57:27 +05:30
lakshani
ffee269a0e Fixed the issue in server startup- removed error logs 2017-02-20 14:01:56 +05:30
Chatura Dilan
a5fe0af98e Merge pull request #589 from lakshani/3.1.0-test
Fixed the issue in server startup- removed error logs
2017-02-20 14:01:37 +05:30
lakshani
964e2aade7 Fixed the issue in server startup error logs 2017-02-20 13:53:18 +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 Sachith Punchihewa
a4ac88ef58 Merge pull request #584 from madhawap/3.1.0-test
Adding Raspberry Pi fixes from master to 3.1.0-test
2017-02-14 19:45:56 +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
savi_wso2
14e33b77fd Configuring the Raspberry Pi agent to run as a service 2017-02-14 19:12:50 +05:30
savi_wso2
b8f1ba4834 Bug fixes on Raspberry Pi agent 2017-02-14 19:11:52 +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
Ruwan
46499667ea Merge pull request #580 from Savidude/master
Configuring the Raspberry Pi agent to run as a service
2017-02-14 12:58:21 +05:30
kamidu
9d733d6cc1 Fixing android location issue 2017-02-14 12:58:13 +05:30
Susinda Perera
8a9affc4b8 Merge pull request #582 from ayyoob/210releasepatch
added device management api to be default
2017-02-14 12:06:48 +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
Hasunie
0c87c32094 Merging changes 2017-02-14 10:18:57 +05:30
savi_wso2
8075d7cb32 Configuring the Raspberry Pi agent to run as a service 2017-02-11 03:17:00 +05:30