Commit Graph

3130 Commits

Author SHA1 Message Date
Rasika Perera
55a50aa679 Removed geo dashboard portal features 2017-06-12 15:34:47 +05:30
Rasika Perera
965f85a71e Removed gpl siddhi geo extension plugin 2017-06-12 15:33:34 +05:30
Rasika Perera
4713448c4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing 2017-06-12 15:14:08 +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
Rasika Perera
3427d7b637 Fixing issues in gpl siddhi geo extension feature 2017-06-06 10:46:59 +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
Rasika Perera
575e4932e6 Fixing geo script issue 2017-06-06 05:36:36 +05:30
Hasunie
c627699bdf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-05 14:08:16 +05:30
Rasika Perera
9c23a39709 Version bump on gpl siddhi geo extension 2017-06-05 11:01:16 +05:30
Rasika Perera
1eb4118712 Version bump thrift adapter 2017-06-05 10:43:14 +05:30
Rasika Perera
7aa2cfde67 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-05 10:30:32 +05:30
Rasika Perera
f74c5cebb5 Updating carbon-device-mgt version 2017-06-05 10:27:19 +05:30
Rasika Perera
3570e62735 Removed duplicated dependencies 2017-06-05 10:22:48 +05:30
Rasika Perera
f883a4dade Removed redundant analytics from Android Device Type 2017-06-05 10:20:41 +05:30
Rasika Perera
646221d308 Thrift transport pom version bump 2017-06-05 10:20:00 +05:30
Rasika Perera
dcbf9f30b0 Removed publishing into org.wso2.android.agent.Stream 2017-06-05 10:18:14 +05:30
Rasika Perera
870073eda2 Removed deviceType specific streams, All should use IoT Location stream 2017-06-05 10:17:03 +05:30
Rasika Perera
9d3f1a40d6 Changes to IoT Analytic artifacts 2017-06-05 10:07:25 +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