Commit Graph

2911 Commits

Author SHA1 Message Date
ayyoob
e36fcfad37 updated version 2017-06-14 13:23:24 +05:30
ayyoob
fd369d55de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-14 13:19:26 +05:30
Geeth
a99749681d Merge pull request #694 from harshanL/master
Prevented getDevice calls from loading uncessary device-info.
2017-06-14 11:43:10 +05:30
Harshan Liyanage
ed28a72483 Prevented getDevice calls from loading uncessary device-info. 2017-06-13 17:12:40 +05:30
WSO2 Builder
657178a829 [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare for next development iteration 2017-06-12 16:20:24 +05:30
WSO2 Builder
b6d9066cb6 [WSO2 Release] [Jenkins #2766] [Release 3.0.42] prepare release v3.0.42 2017-06-12 16:20:03 +05:30
Megala Uthayakumar
908f8c1570 Merge pull request #693 from rasika/fix-error
Fixing typo
2017-06-12 15:59:00 +05:30
Rasika Perera
07ab82a0a8 Fixing typo 2017-06-12 15:53:02 +05:30
Megala Uthayakumar
8744cd9dc8 Merge pull request #691 from GDLMadushanka/master
Virtual Firealarm - broken pipe issue fixed and removed unwanted buttons
2017-06-12 12:38:58 +05:30
GDLMadushanka
16b85e8ff9 Removing hardcoded values 2017-06-12 12:23:27 +05:30
ayyoob
2afa84bfb4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-12 11:50:03 +05:30
GDLMadushanka
7138ba3953 button removed 2017-06-12 11:42:48 +05:30
ayyoob
b02bb79561 removed unused files 2017-06-12 11:40:24 +05:30
GDLMadushanka
e63a58df0e Virtual Firealarm - broken pipe issue fixed and removed unwanted buttons 2017-06-12 08:05:54 +05:30
WSO2 Builder
266d49f812 [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare for next development iteration 2017-06-09 13:55:42 +05:30
WSO2 Builder
8def362081 [WSO2 Release] [Jenkins #2760] [Release 3.0.41] prepare release v3.0.41 2017-06-09 13:55:28 +05:30
Amal Gunatilake
40ab1df788 Merge pull request #690 from janakamarasena/master
Update Carbon Device Management version
2017-06-09 13:47:46 +05:30
Janak Amarasena
a57f7a24fc Update Carbon Device Management version 2017-06-09 13:06:27 +05:30
ayyoob
b96ba00d6c updated pom version 2017-06-08 14:45:46 +05:30
ayyoob
64107c3386 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-08 14:28:17 +05:30
WSO2 Builder
8e29ae8cae [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare for next development iteration 2017-06-07 22:49:40 +05:30
WSO2 Builder
3a27834115 [WSO2 Release] [Jenkins #2756] [Release 3.0.40] prepare release v3.0.40 2017-06-07 22:49:26 +05:30
Geeth
81ed38d756 Merge pull request #688 from harshanL/master
Added comments to the device status task android configs.
2017-06-07 18:44:04 +05:30
Harshan Liyanage
fa32e7c3e1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-07 17:35:23 +05:30
Harshan Liyanage
b3ddc12709 Added comments to the device status task configs. 2017-06-07 17:35:03 +05:30
WSO2 Builder
b9ad0c9eed [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare for next development iteration 2017-06-06 12:16:40 +05:30
WSO2 Builder
6179ccc4fc [WSO2 Release] [Jenkins #2753] [Release 3.0.39] prepare release v3.0.39 2017-06-06 12:16:26 +05:30
ayyoob
bef24e75d1 fixed few issues after testing 2017-06-06 11:01:04 +05:30
Megala Uthayakumar
0987dab2bf Merge pull request #686 from GDLMadushanka/master
Add a new configuration to Android Sense to redirect to DAS analytics view. Devices without this configuration redirected to default analytics view
2017-06-06 09:58:13 +05:30
GDLMadushanka
912f53ba6a remove merge confilict files 2017-06-05 09:52:01 +05:30
GDLMadushanka
15dbb4e3c3 p2 2017-06-05 09:48:53 +05:30
GDLMadushanka
c93083e11a New config added to AndroidSense device type to redirect to DAS analytics page 2017-06-05 09:41:39 +05:30
ayyoob
6b8682f2d8 few fixes after testing 2017-06-04 18:18:20 +05:30
ayyoob
796de7456f Few changes after testing mqtt and http flow 2017-06-04 06:52:51 +05:30
ayyoob
6242fde431 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-03 19:45:44 +05:30
ayyoob
9dc836928c few changes on content transformation logic 2017-06-03 13:27:40 +05:30
GDLMadushanka
064b9ad57c Merge remote-tracking branch 'upstream/master' 2017-06-03 07:31:17 +05:30
WSO2 Builder
d708765bda [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare for next development iteration 2017-06-02 21:21:42 +05:30
WSO2 Builder
4f9d50ca91 [WSO2 Release] [Jenkins #2747] [Release 3.0.38] prepare release v3.0.38 2017-06-02 21:21:27 +05:30
Kamidu Sachith Punchihewa
29b13b0050 Merge pull request #685 from wso2/rasika-patch-1
Updating carbon-device-mgt version
2017-06-02 21:13:32 +05:30
Rasika Perera
185c1698e4 Updating carbon-device-mgt version 2017-06-02 21:12:13 +05:30
Harshan Liyanage
61b8dd9224 Merge pull request #683 from harshanL/master
Changes related to product-iots#518
2017-06-02 15:50:25 +05:30
Harshan Liyanage
a3abf93715 Code refactoring which Resolves harshanl/product-iots#518 2017-06-02 15:49:24 +05:30
ayyoob
3a7536f1f6 update version 2017-06-01 23:26:02 +05:30
ayyoob
a1fb2ed9c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
Conflicts:
	pom.xml
2017-06-01 17:32:29 +05:30
ayyoob
8381070bf6 Implemented Pull Notification Support 2017-06-01 17:21:23 +05:30
GDLMadushanka
9715a08b20 Merge remote-tracking branch 'upstream/master' 2017-05-31 08:05:13 +05:30
Harshan Liyanage
ca0a9be6a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-30 17:10:03 +05:30
Harshan Liyanage
ea5c865826 Resolves harshanl/product-iots#518 2017-05-30 17:09:44 +05:30
WSO2 Builder
e7af2ee4a4 [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare for next development iteration 2017-05-30 11:07:50 +05:30