Commit Graph

3497 Commits

Author SHA1 Message Date
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
Pasindu
f49ecb2539 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
Some changes in android plugin for runtime permission is included.
2017-05-30 10:15:21 +05:30
Ayyoob Hamza
4b40bf7ac7 Merge pull request #676 from madhawap/master
Fix for disabling reboot and upgrade-firmware operations on UI
2017-05-30 09:07:33 +05:30
ayyoob
ef274b0b3e fixed formatting issue 2017-05-30 00:38:48 +05:30
ayyoob
94d626ca3c changed event definition 2017-05-30 00:31:04 +05:30
ayyoob
aaeac03cfb fixed issues in mqtt input adapter and thrift adapter after testing with multitenancy 2017-05-30 00:04:49 +05:30
madhawap
614d1c2606 upgrade the carbon.devicemgt.version 2017-05-29 19:13:51 +05:30
madhawap
af0ce14af1 Adding android agent apk after pasindujw's fixes 2017-05-29 18:58:25 +05:30
madhawap
a1a8ac3c71 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-29 18:55:19 +05:30
ayyoob
1b4de09d7b added missing imports 2017-05-29 12:11:31 +05:30
Vishanth
8dcb7c68c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-29 11:15:39 +05:30
ayyoob
b32bf11c91 fixed multi tenant issues after testing thrift endpoint with multitenant 2017-05-29 01:01:26 +05:30
Pasindu
4f4d783c37 Runtime permission policy per app changes 2017-05-24 12:03:48 +05:30
GDLMadushanka
4ebb5e3a28 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-24 10:51:46 +05:30
Pasindu
2682317930 Resolving Merging faults 2017-05-22 15:19:25 +05:30
Pasindu
59b6bce4b4 Resolving previous merging faults 2017-05-22 15:16:20 +05:30
Pasindu
5bb1662dfb Resolve merging errors happened previously 2017-05-22 14:53:47 +05:30
Pasindu
92821c36e0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-22 07:46:27 +05:30
ayyoob
e4247a98ff Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-05-19 14:50:26 +05:30
Amal Gunatilake
ac5d47b313 Merge pull request #681 from charithag/master
Add windows scripts for virtual firealarm agent
2017-05-19 14:18:49 +05:30
charitha
5cf096c7aa Add windows scripts for virtual firealarm agent 2017-05-19 14:11:17 +05:30
Pasindu
444dbdf865 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-19 07:01:20 +05:30
WSO2 Builder
84e12c7cca [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare for next development iteration 2017-05-17 16:51:16 +05:30
WSO2 Builder
400da8f05e [WSO2 Release] [Jenkins #2723] [Release 3.0.36] prepare release v3.0.36 2017-05-17 16:51:01 +05:30
sinthuja
5663511348 Merge pull request #680 from Megala21/master
Fixing issues in virtual fire alarm
2017-05-17 16:15:24 +05:30
megala21
20f8708edb Fixing issues in virtual fire alarm 2017-05-17 15:50:57 +05:30
Pasindu
1d832234df Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-17 10:10:16 +05:30
Pasindu
7fa1b5eddd Change devicemgt version 2017-05-17 10:09:14 +05:30
WSO2 Builder
9fcee2917f [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare for next development iteration 2017-05-16 14:24:47 +05:30
WSO2 Builder
c0c002a34b [WSO2 Release] [Jenkins #2720] [Release 3.0.35] prepare release v3.0.35 2017-05-16 14:24:33 +05:30