Commit Graph

664 Commits

Author SHA1 Message Date
WSO2 Builder
3150193276 [WSO2 Release] [Jenkins #2784] [Release 4.0.3] prepare release v4.0.3 2017-06-20 15:49:25 +05:30
Harshan Liyanage
e81868b448 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-20 15:30:13 +05:30
Harshan Liyanage
dbfdb0d084 Prevented unnecessary API calls to fetch device-info if the device is disenrolled which resolves wso2/product-iots#429 2017-06-20 15:29:59 +05:30
Nirothipan
6acf7c4225 edits in print messages in kilServer Method 2017-06-20 11:12:31 +05:30
Nirothipan
702287e09b Adding kill-server method 2017-06-20 11:01:27 +05:30
Nirothipan
d786b7d839 Edits 2017-06-20 10:52:16 +05:30
Nirothipan
b1e8687751 Code clean up 2017-06-19 22:30:39 +05:30
Nirothipan
7c5c0de4ee README changes 2017-06-19 18:19:24 +05:30
Hasunie
2dc23d0574 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-19 18:17:48 +05:30
Nirothipan
1e10d31801 README changes 2017-06-19 18:14:41 +05:30
Nirothipan
5e7a0c73ec Edits in README 2017-06-19 18:04:57 +05:30
Nirothipan
603ec856a6 type corrections 2017-06-19 17:59:47 +05:30
Nirothipan
f70cc79590 correction 2017-06-19 17:57:57 +05:30
Nirothipan
9569b0bba7 correction 2017-06-19 17:42:51 +05:30
Nirothipan
424a02fa20 edits 2017-06-19 17:07:04 +05:30
Nirothipan
eee153eee9 Adding org.wso2.carbon.device.mgt.mobile.android.emulator module 2017-06-19 17:00:35 +05:30
Nirothipan
0a0448ab97 Android Emulator client 2017-06-19 16:58:37 +05:30
WSO2 Builder
25de54d79d [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare for next development iteration 2017-06-19 16:39:43 +05:30
WSO2 Builder
d5ca9bec5c [WSO2 Release] [Jenkins #2781] [Release 4.0.2] prepare release v4.0.2 2017-06-19 16:39:28 +05:30
ayyoob
d1500dcd6d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-17 19:31:22 +05:30
Janak Amarasena
22e9cca3f3 UI fixes 2017-06-16 16:53:28 +05:30
Rasika Perera
13d777ff71 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing 2017-06-16 15:50:57 +05:30
WSO2 Builder
428fabd043 [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare for next development iteration 2017-06-15 16:37:19 +05:30
WSO2 Builder
2e8fb5739b [WSO2 Release] [Jenkins #2774] [Release 4.0.1] prepare release v4.0.1 2017-06-15 16:37:06 +05:30
WSO2 Builder
a72dbe91ef [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare for next development iteration 2017-06-15 15:32:45 +05:30
WSO2 Builder
5be8ef0a50 [WSO2 Release] [Jenkins #2773] [Release 4.0.0] prepare release v4.0.0 2017-06-15 15:32:32 +05:30
Hasunie
592d6e7085 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-14 17:56:36 +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
Rasika Perera
cac3600070 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing 2017-06-14 10:45:38 +05:30
Hasunie
40ee0203aa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-13 17:25:05 +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
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
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
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
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
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
Hasunie
c627699bdf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-05 14:08:16 +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
dcbf9f30b0 Removed publishing into org.wso2.android.agent.Stream 2017-06-05 10:18:14 +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
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
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
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
7b88ae13ba Merge branch 'devicetype-3.1.0' of https://github.com/ayyoob/carbon-device-mgt-plugins 2017-05-31 08:06:58 +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
84711e58c6 Added geo-fencing to the devicemgt app 2017-05-30 16:32:18 +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
ayyoob
94d626ca3c changed event definition 2017-05-30 00:31:04 +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
b32bf11c91 fixed multi tenant issues after testing thrift endpoint with multitenant 2017-05-29 01:01:26 +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
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
kamidu
103b795a86 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-11 21:36:52 +05:30
kamidu
0c1ff01697 chaning the notification msg 2017-05-11 21:36:40 +05:30
WSO2 Builder
2242a1169b [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare for next development iteration 2017-05-11 13:04:58 +05:30
WSO2 Builder
87bccbdf1c [WSO2 Release] [Jenkins #2700] [Release 3.0.34] prepare release v3.0.34 2017-05-11 13:04:42 +05:30
madhawap
a2897012f9 Fix for disabling reboot and upgrade-firmware operations on UI
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled.
2017-05-09 12:03:08 +05:30
ayyoob
33f73eb2b3 merged with origin 2017-05-09 01:00:31 +05:30
ayyoob
06d646c87a moved artifact deployment to the platform configuration 2017-05-09 00:56:21 +05:30
WSO2 Builder
f0a70d7f27 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration 2017-05-08 18:04:55 +05:30
WSO2 Builder
24460ebde1 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33 2017-05-08 18:04:39 +05:30
WSO2 Builder
df7df6ffa6 [maven-release-plugin] prepare for next development iteration 2017-05-08 12:44:37 +05:30
WSO2 Builder
3cdec9843a [maven-release-plugin] prepare release v3.0.32 2017-05-08 12:44:22 +05:30
ayyoob
359184429e Added missing fixes that was done for multi tenancy in cloud branch 2017-05-05 01:57:48 +05:30
WSO2 Builder
2db4069053 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration 2017-05-02 20:47:53 +05:30
WSO2 Builder
902d7e3cf2 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 2017-05-02 20:47:39 +05:30
warunalakshitha
543e68771e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-01 20:53:24 +05:30
WSO2 Builder
e2becd3169 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration 2017-05-01 19:57:06 +05:30
WSO2 Builder
85c36c0ca8 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 2017-05-01 19:56:48 +05:30
warunalakshitha
568538cc13 add comments for performance configs 2017-04-30 13:58:49 +05:30
WSO2 Builder
c3fb32f3bc [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare for next development iteration 2017-04-28 10:33:09 +05:30
WSO2 Builder
1b0047c39f [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29 2017-04-28 10:32:49 +05:30
WSO2 Builder
99e587eb78 [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare for next development iteration 2017-04-28 08:38:44 +05:30
WSO2 Builder
9b8929a8cd [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28 2017-04-28 08:38:35 +05:30
Kamidu Sachith Punchihewa
6759a99ae9 Merge pull request #657 from rasika/master
Fixing Android policy view and policy edit doesn't honor isCloud enabled param
2017-04-28 07:58:30 +05:30
Rasika Perera
511c61175c #654 : Fixing Android policy view and policy edit doesn't honor isCloud enabled parameter 2017-04-25 14:46:55 +05:30
WSO2 Builder
1a91d1ddc0 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare for next development iteration 2017-04-25 13:14:01 +05:30
WSO2 Builder
426a016c37 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare release v3.0.27 2017-04-25 13:13:43 +05:30
WSO2 Builder
de5ff24046 Merge commit 'dc4c32129ac05dfe6247cb060cc0949fcdf5c2ed' into db9e6dc2-9fc6-4b4a-8465-9e6ea06cdee0 2017-04-25 12:50:57 +05:30
WSO2 Builder
dc4c32129a [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare for next development iteration 2017-04-25 11:47:30 +05:30
WSO2 Builder
b1c6ae0e2c [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare release v3.0.26 2017-04-25 11:47:01 +05:30
charitha
9febce0601 Add latest agent (3.1.16) 2017-04-25 11:32:20 +05:30
Charitha Goonetilleke
186b3e16e4 Merge pull request #653 from ruwany/master
Merging cloud-310 branch with master
2017-04-25 11:29:04 +05:30
WSO2 Builder
72fab84bf9 [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare for next development iteration 2017-04-24 17:57:19 +05:30