Commit Graph

3579 Commits

Author SHA1 Message Date
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
Pasindu
eb9be0e124 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-05 09:07:33 +05:30
Pasindu
096ea49ab9 Daily commit 2017-06-05 09:02:52 +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
Hasunie
30eb8ca91d adding debug logs to GlobalThrowableMapper 2017-06-02 12:44:48 +05:30
ayyoob
3a7536f1f6 update version 2017-06-01 23:26:02 +05:30
Rasika Perera
54e5994b0b Removed redundant analytics artifacts 2017-06-01 22:05:58 +05:30
Rasika Perera
e6de7a4d90 Removed android analytics feature, a common set of streams,execution plan and receivers will be used 2017-06-01 22:04:09 +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
Rasika Perera
9d336caee8 Fixes to geo-fencing ui 2017-06-01 05:00:00 +05:30
Rasika Perera
d94f624518 Added geo fencing unit 2017-05-31 10:58:49 +05:30
Rasika Perera
7b88ae13ba Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt-plugins 2017-05-31 08:06:58 +05:30
GDLMadushanka
9715a08b20 Merge remote-tracking branch 'upstream/master' 2017-05-31 08:05:13 +05:30
Rasika Perera
62f0b3f2a5 Version bump on gpl siddhi geo extension 2017-05-30 22:32:32 +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
Rasika Perera
6261995bea Adding GPL Siddhi Geo Exension 2017-05-30 16:32:18 +05:30
Rasika Perera
84711e58c6 Added geo-fencing to the devicemgt app 2017-05-30 16:32:18 +05:30
Pasindu
ee9c3ad5ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-30 12:16:03 +05:30
Pasindu
ea274ac2b3 change pom 2017-05-30 12:14:19 +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
WSO2 Builder
dff15c5978 [WSO2 Release] [Jenkins #2741] [Release 3.0.37] prepare release v3.0.37 2017-05-30 11:07:36 +05:30