Commit Graph

779 Commits

Author SHA1 Message Date
WSO2 Builder
ad7b87917f [WSO2 Release] [Jenkins #2792] [Release 4.0.5] prepare for next development iteration 2017-06-22 21:03:37 +05:30
WSO2 Builder
5888a5321a [WSO2 Release] [Jenkins #2792] [Release 4.0.5] prepare release v4.0.5 2017-06-22 21:03:24 +05:30
kamidu
f1c054ae62 fixing the baclisting application view issue in policy view 2017-06-22 20:51:42 +05:30
ayyoob
dc3420cadb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-22 20:22:14 +05:30
Kamidu Sachith Punchihewa
87255d05b1 Merge pull request #711 from dunithd/master
Adding new UX design for Raspberry Pi device details page.
2017-06-22 17:00:20 +05:30
dunithd
da21efe9be Adding new UX design for Raspberry Pi device details page. 2017-06-22 16:51:19 +05:30
sinthuja
39f45539c8 Merge pull request #700 from Nirothipan/master
AndroidTryIt Emulator
2017-06-22 15:43:14 +05:30
Pasindu
01381d1254 fixes issue wso2/product-iots#990 2017-06-22 15:23:52 +05:30
Nirothipan
f141836cba adding space in print ln 2017-06-22 15:14:04 +05:30
Nirothipan
fe342b6eb3 Adding correction 2017-06-22 15:06:36 +05:30
Nirothipan
73a0176c3a removind version 2017-06-22 15:06:16 +05:30
Pasindu
80529706be Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-22 14:05:03 +05:30
Pasindu
7e2b3220ea COSU profile configuration policy UI added. 2017-06-22 14:02:58 +05:30
kamidu
b2cba60b7d Fixing the wordinng missmatch in android virtual devices 2017-06-22 13:52:26 +05:30
Nirothipan
da6d525d25 copying jar file to target directory 2017-06-22 13:36:18 +05:30
Nirothipan
558cb57815 adding file permissions 2017-06-22 13:35:30 +05:30
Nirothipan
44e667d814 creating ant directory in target 2017-06-22 13:34:46 +05:30
Nirothipan
6aba44e6c7 Chnage in download Artifacts method 2017-06-22 13:33:45 +05:30
kamidu
00a6b1b12c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-22 12:42:49 +05:30
kamidu
e39c2a1d8d Fixing Notification validation issue
;
2017-06-22 12:42:15 +05:30
ayyoob
61a3455ec5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-22 04:51:41 +05:30
Nirothipan
3fec4edf90 adding warn messages 2017-06-21 23:13:58 +05:30
Nirothipan
dbe3820290 changing file permissions 2017-06-21 22:53:31 +05:30
dunithd
16812a9943 Adding new UX design for Windows/virtual fire alarm device details page 2017-06-21 19:37:42 +05:30
Nirothipan
11774f5f8b changing version 2017-06-21 17:53:30 +05:30
Nirothipan
a2d703334a reformatting code 2017-06-21 17:34:20 +05:30
Nirothipan
6388ea1e45 getting the project verion automatically 2017-06-21 17:16:03 +05:30
Nirothipan
ef8b53960d README modified to be more clear 2017-06-21 17:15:31 +05:30
Nirothipan
e270290105 with corrections 2017-06-21 17:14:42 +05:30
Nirothipan
3361c79317 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-21 15:46:54 +05:30
Nirothipan
eccad44dff edits 2017-06-21 14:24:22 +05:30
Nirothipan
9a2fe3cfb1 edits 2017-06-21 14:11:51 +05:30
Nirothipan
14583ac30c ile permissions 2017-06-21 14:11:33 +05:30
Nirothipan
ce8893e41c Adding File Permissions 2017-06-21 14:10:42 +05:30
Nirothipan
f4037a8885 Chaging Java App name 2017-06-21 11:27:14 +05:30
Nirothipan
0a6ddb3b0f Adding maven-dependency-plugin 2017-06-21 11:26:43 +05:30
Nirothipan
b646dc6801 removing output directory attribute 2017-06-21 11:26:05 +05:30
Nirothipan
054c10df3e updates 2017-06-21 09:57:30 +05:30
Nirothipan
85346a531b . 2017-06-21 09:57:13 +05:30
Nirothipan
acc82acdbe Change of Module order 2017-06-21 09:56:40 +05:30
ayyoob
a983ae7c2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0 2017-06-21 04:11:33 +05:30
dunithd
c4fcaaf498 Applying new UX for Android device details page 2017-06-21 04:08:51 +05:30
Nirothipan
952a78b81b . 2017-06-21 00:12:45 +05:30
Nirothipan
7fc365f205 changes after code review 2017-06-20 23:52:35 +05:30
Nirothipan
ad09d0d21f adding constants 2017-06-20 20:30:12 +05:30
Nirothipan
414af3339e Givins as system properties 2017-06-20 20:29:40 +05:30
Nirothipan
944a28aae0 Adding correction 2017-06-20 20:28:58 +05:30
WSO2 Builder
76a68034d1 [WSO2 Release] [Jenkins #2785] [Release 4.0.4] prepare for next development iteration 2017-06-20 18:19:13 +05:30
WSO2 Builder
8a30ed71ee [WSO2 Release] [Jenkins #2785] [Release 4.0.4] prepare release v4.0.4 2017-06-20 18:18:59 +05:30
Harshan Liyanage
452ea9a888 Merge pull request #698 from janakamarasena/high-priority-fixes
UI fixes
2017-06-20 17:24:20 +05:30
WSO2 Builder
b56771328f [WSO2 Release] [Jenkins #2784] [Release 4.0.3] prepare for next development iteration 2017-06-20 15:49:39 +05:30
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
Pasindu
bfe680ca95 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-06-19 08:23:02 +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
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
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
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
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
Pasindu
ee9c3ad5ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-30 12:16:03 +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
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
Pasindu
4f4d783c37 Runtime permission policy per app changes 2017-05-24 12:03:48 +05:30
Pasindu
5bb1662dfb Resolve merging errors happened previously 2017-05-22 14:53:47 +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
Pasindu
1d832234df Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-17 10:10:16 +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
913cc567fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-15 10:09:47 +05:30
Pasindu
b8a0fd04e7 merge fix 2017-05-15 09:51:45 +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
Pasindu
5f700c5b4a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-09 08:49:00 +05:30
Pasindu
60470d039a Creating runtime permission policy for android devices 2017-05-09 08:33:17 +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