Commit Graph

2889 Commits

Author SHA1 Message Date
Pasindu
f0a9c0b78f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-07 07:20:38 +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
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
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
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
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
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
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
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
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
Pasindu
1c358dac44 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-16 08:26:46 +05:30
Hasunie
3727bcb1e1 Merge pull request #660 from sameeragunarathne/master
fix multi tenant issues in windows device enrollment
2017-05-15 17:06:37 +05:30
GDLMadushanka
740d144112 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-15 10:11:27 +05:30
GDLMadushanka
d25b4d84ec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-15 10:11:00 +05:30
Pasindu
913cc567fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-15 10:09:47 +05:30