Commit Graph

2866 Commits

Author SHA1 Message Date
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
Ruwan
431c099bdb Merge pull request #579 from Savidude/master
Bug fixes on Raspberry Pi agent
2017-02-09 16:24:12 +05:30
savi_wso2
16f6bda20a Bug fixes on Raspberry Pi agent 2017-02-09 15:59:47 +05:30
lakshani
d6a99bfe1d adding commits edb8e71ac2 and 3c349a71e6 from lakshani 2017-02-09 14:39:11 +05:30
lakshani
f5d71d917e Added change device status feature to mobile plugings 2017-02-09 14:14:44 +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
Hasunie
f8471abff2 Merge pull request #578 from lakshani/devicestatus
Added "change device status" feature to mobile plugings
2017-02-07 10:59:32 +05:30
lakshani
3c349a71e6 removed unwanted repositories from restconnector 2017-02-07 10:42:28 +05:30
lakshani
edb8e71ac2 Added change device status feature to mobile plugings 2017-02-07 10:38:12 +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
Kamidu Sachith Punchihewa
849ea1e2a7 Merge pull request #574 from Kamidu/master
Location improvements
2017-02-03 15:56:17 +05:30
kamidu
53840dcc37 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-03 13:01:21 +05:30
ayyoob
56de095599 resolved app connector build slowness issue 2017-02-03 05:00:57 +05:30
WSO2 Builder
d7e4580e77 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration 2017-02-02 16:06:06 +05:30
WSO2 Builder
1737eaaa79 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11 2017-02-02 16:05:58 +05:30
Hasunie
3b98e0f754 Merge pull request #572 from charithag/master-update-swagger-docs
Update swagger docs
2017-02-02 14:58:11 +05:30
Ayyoob Hamza
a85f051792 Merge pull request #573 from ayyoob/cloud-3.1.0
fixed analytics multi tenant issues
2017-02-02 04:45:26 +05:30
ayyoob
e0f6e9579d fixed multi tenant issues after testing 2017-02-02 03:17:19 +05:30