community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,497 Commits 11 Branches 275 Tags 396 MiB
77daecefa3
Commit Graph

868 Commits

Author SHA1 Message Date
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
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
WSO2 Builder
5ff67af60a [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare release v3.0.25 2017-04-24 17:57:03 +05:30
charitha
de0cb9a5a2 Add agent 3.1.15 for cloud 
(cherry picked from commit 0d6800b)
 2017-04-24 11:35:25 +05:30
charitha
ab91e3a6b0 Fixed https://github.com/wso2/cdmf-agent-android/issues/33 
(cherry picked from commit fadd2e6)
 2017-04-24 11:35:18 +05:30
charitha
d80c25ed2b Updating UIs of agents to latest 
(cherry picked from commit 90c0618)
 2017-04-24 11:35:07 +05:30
Rasika Perera
a1b0298374 Updating android agent into latest 
(cherry picked from commit a41436d)
 2017-04-24 11:34:37 +05:30
Rasika Perera
51a613f167 Resolving #642 : Improve UX on location updates for Android 
(cherry picked from commit 64b1b33)
 2017-04-24 11:24:26 +05:30
WSO2 Builder
4c0e505008 [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare for next development iteration 2017-04-21 16:28:48 +05:30
WSO2 Builder
b653b4871d [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare release v3.0.24 2017-04-21 16:28:35 +05:30
amalhub
ec75361c57 Adding latest android-agent.apk (https://github.com/wso2/cdmf-agent-android/releases/tag/v3.1.13) 2017-04-21 14:57:43 +05:30
WSO2 Builder
7a2b64605f [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare for next development iteration 2017-04-18 10:33:01 +05:30
WSO2 Builder
908ee841e9 [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare release v3.0.23 2017-04-18 10:32:45 +05:30
WSO2 Builder
84220e2c25 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare for next development iteration 2017-04-07 14:56:29 +05:30
WSO2 Builder
5da8bf98b8 [WSO2 Release] [Jenkins #2627] [Release 3.0.22] prepare release v3.0.22 2017-04-07 14:56:13 +05:30
kamidu
bcdd78ae68 Merge branch 'master' into cloud-3.1.0 2017-04-07 14:31:11 +05:30
kamidu
dc0fda3925 fixing location and operation loading ui issues 2017-04-05 17:04:28 +05:30
kamidu
eb7a83bcc8 fixing location and operation loading ui issues 2017-04-05 17:02:38 +05:30
kamidu
9d3949ea37 enabling loading for location refrsh 2017-04-05 16:35:35 +05:30
kamidu
1d663e1b68 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-04-05 11:14:26 +05:30
kamidu
4662db6701 device status fic 2017-04-05 11:14:10 +05:30
charitha
6f3578f797 Adding agent 3.1.7 for cloud 2017-04-05 10:19:31 +05:30
kamidu
9ad8cb21ae android enrollment ui fixes and operation in progress animation fix 2017-04-04 17:13:02 +05:30
Kamidu Sachith Punchihewa
8f169d0116 Revert "Updated device-mgt version & interface." 2017-04-04 13:10:05 +05:30
kamidu
2abd8823a3 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-04-03 18:28:30 +05:30
Harshan Liyanage
ff5a1c9c5d Updated device-mgt version & interface. 2017-04-03 17:48:21 +05:30
kamidu
ee24a8baea merging upstream cloud-3.1.0 2017-04-03 17:35:44 +05:30
kamidu
ace58b6649 policy filtering and location reload for cloud 2017-04-03 17:27:23 +05:30
WSO2 Builder
2cf8496351 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare for next development iteration 2017-03-30 10:31:28 +05:30
WSO2 Builder
7d6def8976 [WSO2 Release] [Jenkins #2617] [Release 3.0.21] prepare release v3.0.21 2017-03-30 10:31:12 +05:30
charitha
6398d79760 Fix https://github.com/wso2/product-iots/issues/332 
(cherry picked from commit 0e4df87)
 2017-03-29 23:16:39 +05:30
charitha
0e4df87dda Fix https://github.com/wso2/product-iots/issues/332 2017-03-29 23:15:59 +05:30
charitha
110c9405b1 Update device enrollement steps 
(cherry picked from commit ca8ad9f)
 2017-03-29 22:28:21 +05:30
charitha
ca8ad9f528 Update device enrollement steps 2017-03-29 22:27:26 +05:30
WSO2 Builder
de5f854367 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare for next development iteration 2017-03-29 15:23:01 +05:30
WSO2 Builder
13cbce1e37 [WSO2 Release] [Jenkins #2614] [Release 3.0.20] prepare release v3.0.20 2017-03-29 15:22:46 +05:30
charitha
179cc93c1a Downgraded android OS version to avoid ANR 
(cherry picked from commit e13aa77)
 2017-03-29 14:37:08 +05:30
charitha
6ea597233b Add google play store links to device enrollment page 
(cherry picked from commit 243a3df)
 2017-03-29 14:36:38 +05:30
charitha
572d85dbd1 Instruct mac users to restart after installing HAXM 
(cherry picked from commit b53fe60)
 2017-03-29 14:35:59 +05:30
charitha
e13aa77b21 Downgraded android OS version to avoid ANR 2017-03-29 14:30:12 +05:30
charitha
2d67d33eb6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-03-29 14:09:02 +05:30
charitha
243a3df89d Add google play store links to device enrollment page 2017-03-29 14:06:15 +05:30
WSO2 Builder
0f3318e353 [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare for next development iteration 2017-03-29 11:13:40 +05:30
WSO2 Builder
41041f3f6d [WSO2 Release] [Jenkins #2612] [Release 3.0.19] prepare release v3.0.19 2017-03-29 11:13:18 +05:30
charitha
d8218ef221 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-03-29 09:46:07 +05:30
charitha
b53fe60807 Instruct mac users to restart after installing HAXM 2017-03-29 09:45:34 +05:30
WSO2 Builder
cf3d543fea [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare for next development iteration 2017-03-24 15:45:48 +05:30
WSO2 Builder
59194a1286 [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare release v3.0.18 2017-03-24 15:45:32 +05:30
charitha
52060c9d40 Fixed unzipping issue in tryit tool 
(cherry picked from commit 01187db)
 2017-03-24 14:45:19 +05:30
charitha
33342e0e97 Fix documentation links 2017-03-24 14:44:55 +05:30
charitha
01187db029 Fixed unzipping issue in tryit tool 2017-03-24 14:35:31 +05:30
WSO2 Builder
82ac8417d3 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare for next development iteration 2017-03-23 13:14:16 +05:30
WSO2 Builder
d0e9362ee1 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare release v3.0.17 2017-03-23 13:14:05 +05:30
charitha
6aee69ef5b Updated splash screen images 2017-03-23 08:53:28 +05:30
charitha
8ee81f497d Adding latest Android agent 2017-03-23 01:11:14 +05:30
charitha
3bfa383cea Adding Android-tryit tool 
(cherry picked from commit c3e241e)
 2017-03-23 01:08:33 +05:30
sameera910409
d907f1bc51 fix https://wso2.org/jira/browse/EMM-1880 2017-03-22 19:02:47 +05:30
WSO2 Builder
2049e44319 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare for next development iteration 2017-03-22 15:53:43 +05:30
WSO2 Builder
d15dc25c13 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare release v3.0.16 2017-03-22 15:53:34 +05:30
Geeth
bc7b77e07a Merge pull request #622 from charithag/master-androidtryit 
Adding Android-tryit tool
 2017-03-22 15:32:54 +05:30
charitha
c3e241e1d5 Adding Android-tryit tool 2017-03-22 15:29:37 +05:30
WSO2 Builder
8df6e56f40 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare for next development iteration 2017-03-21 20:11:47 +05:30
WSO2 Builder
2e8f5a63d2 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare release v3.0.15 2017-03-21 20:11:33 +05:30
Harshan Liyanage
893eccd817 Merge pull request #618 from hasuniea/master 
resolved #616
 2017-03-16 15:55:27 +05:30
Harshan Liyanage
bd2ded8563 Removed unnecessary braces. 2017-03-16 15:54:39 +05:30
Susinda
1c13f1b97d Cloud and general doc links issue fixed 2017-03-16 14:42:09 +05:30
Hasunie
809a30fc7a fixing code format issue 2017-03-16 14:22:24 +05:30
Hasunie
7de234c164 resolved #616 2017-03-16 14:14:32 +05:30
Hasunie
143569b83b Fixing null property in AndriodAPIUtils 2017-03-16 12:26:37 +05:30
WSO2 Builder
c49b33bb4a [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare for next development iteration 2017-03-15 18:08:34 +05:30
WSO2 Builder
e1064dca07 [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare release v3.0.14 2017-03-15 18:08:26 +05:30
Kamidu Sachith Punchihewa
95f64b0a15 Merge pull request #615 from wso2/cloud-3.1.0 
Cloud related fixes
 2017-03-15 17:47:31 +05:30
WSO2 Builder
68f329cbda [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare for next development iteration 2017-03-14 16:48:21 +05:30
WSO2 Builder
8669d1b44e [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare release v3.0.13 2017-03-14 16:48:11 +05:30
Harshan Liyanage
2753deb365 Merge pull request #602 from sameeragunarathne/master 
refactor code for firebase cloud messaging
 2017-03-14 16:41:19 +05:30
Harshan Liyanage
1882171824 Merge pull request #611 from Kamidu/cloud-3.1.0 
android view related ui fixes
 2017-03-13 17:47:10 +05:30
WSO2 Builder
18d3518236 [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare for next development iteration 2017-03-13 17:43:20 +05:30
WSO2 Builder
867790d3cb [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12 2017-03-13 17:43:10 +05:30
kamidu
c97dfb4080 android view related ui fixes : MACOS :: Git config auto genarated for sachithp@wso2's-MacBook-Pro.local 2017-03-13 17:40:26 +05:30
sameera910409
078209347a refactor code for firebase cloud messaging 2017-03-13 14:30:27 +05:30
Susinda
1ebc84450f revert the implementation 'agent download from github release' 2017-03-13 14:15:03 +05:30
Susinda
286d293ddd revert the implementation 'agent download from github release' 2017-03-13 13:55:42 +05:30
Susinda
7c3d94cf77 Added README file to avoid git ignoring empty dirs 2017-03-10 12:43:31 +05:30
Susinda
f96389e671 Android agent downloadded from github relese location, Hasuni's fix on initial operations added 2017-03-10 12:00:27 +05:30
Susinda Perera
fb6cfb6699 Merge pull request #1 from susinda/cloud-3.1.0 
Merging from Cloud 3.1.0
 2017-03-09 12:45:44 +05:30
kamidu
d2d56651cc fix for leaflet tile not loading issues 
(cherry picked from commit 6604c23257)
 2017-03-07 15:25:24 +05:30
Harshan Liyanage
b82a59c828 Merge branch 'cloud-3.1.0' of https://github.com/hasuniea/carbon-device-mgt-plugins into hasuniea-cloud-3.1.0 2017-03-03 17:45:26 +05:30
Hasunie
7fcf4e9a3b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:38:39 +05:30
Hasunie
3e50f0b737 adding initial operations 2017-03-03 17:37:55 +05:30
Harshan Liyanage
dc054e6ed5 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-03-03 17:10:17 +05:30
Harshan Liyanage
f2761e9b0a Removed info operation addition upon page load 2017-03-03 17:10:02 +05:30
ayyoob
a10eb7cb14 removed feature 2017-03-03 17:03:57 +05:30
ayyoob
77ec1c4107 fixed operation bar permission rendering issue 2017-03-02 20:27:46 +05:30
kamidu
6604c23257 fix for leaflet tile not loading issues 2017-03-02 15:20:27 +05:30
susinda
5ad6dc1f1d Fxing PhoneNumber Serach for android 2017-02-28 20:28:48 +05:30
Susinda Perera
6f9ea52218 Merge pull request #593 from wso2/cloud-3.1.0 
Merging to 3.1.0-test from Cloud 3.1.0 - Till Feb-28
 2017-02-28 19:25:12 +05:30
Kamidu Sachith Punchihewa
740bb976fa adding location operation to device view page 2017-02-19 19:10:20 +05:30
kamidu
afaa75d3a9 adding screen shots 2017-02-17 20:46:09 +05:30
kamidu
463d8a9dff wording sugessions for cloud 2017-02-16 00:23:58 +05:30
Imesh Chandrasiri
20bd1b399b Removed conflict markings 2017-02-15 11:16:41 +05:30
Imesh Chandrasiri
a890d9fb89 Device enrollment page revamp 2017-02-15 11:14:07 +05:30
Imesh Chandrasiri
bccc47ebd2 Conflict fix 2017-02-15 10:46:07 +05:30
Imesh Chandrasiri
4b7637a426 Device enrollment page revampl 2017-02-15 10:43:47 +05:30
Imesh Chandrasiri
37b032d710 Merge branch 'cloud-3.1.0' into cloud-3.1.0 2017-02-15 10:20:21 +05:30
Imesh Chandrasiri
67313882ed Device enrollment page changes for cloud 2017-02-14 22:39:17 +05:30
kamidu
71c93eec29 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0 2017-02-14 19:27:11 +05:30
kamidu
305df1c2bd enhansing the device cloud ui 2017-02-14 19:27:02 +05:30
kamidu
9d733d6cc1 Fixing android location issue 2017-02-14 12:58:13 +05:30
Susinda Perera
8a9affc4b8 Merge pull request #582 from ayyoob/210releasepatch 
added device management api to be default
 2017-02-14 12:06:48 +05:30
lakshani
f5d71d917e Added change device status feature to mobile plugings 2017-02-09 14:14:44 +05:30
ayyoob
a294c20a2a added device management api to be default 2017-02-09 09:59:24 +05:30
lakshani
edb8e71ac2 Added change device status feature to mobile plugings 2017-02-07 10:38:12 +05:30
ayyoob
dd3017578a added artefact deployment support for device types 2017-02-05 17:52:52 +05:30
Kamidu Sachith Punchihewa
68b36babe6 Merge pull request #575 from wso2/master 
UI fixes for device cloud
 2017-02-03 16:53:19 +05:30
kamidu
53840dcc37 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-02-03 13:01:21 +05:30
WSO2 Builder
d7e4580e77 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration 2017-02-02 16:06:06 +05:30
WSO2 Builder
1737eaaa79 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11 2017-02-02 16:05:58 +05:30
Hasunie
3b98e0f754 Merge pull request #572 from charithag/master-update-swagger-docs 
Update swagger docs
 2017-02-02 14:58:11 +05:30
charitha
9bf38af4f7 Fix issues in swagger docs 2017-02-01 15:03:10 +05:30
Milan Perera
99782e6360 Resolved conflicts and merged 2017-02-01 14:13:01 +05:30
Milan Perera
cc8066896b Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud 2017-02-01 11:31:42 +05:30
Milan Perera
e1a419425e Added cloud agent to the download page 2017-02-01 11:31:15 +05:30
ayyoob
73eb590a7c renamed grant type to default 2017-02-01 00:08:32 +05:30
Kamidu Sachith Punchihewa
64cb8b5223 Update load-map.js 2017-01-31 14:10:29 +05:30
kamidu
55489d5e52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-01-31 13:44:12 +05:30
kamidu
192e1c3edc adding missing classes in hbs 2017-01-31 13:41:01 +05:30
WSO2 Builder
7034dae2b5 [maven-release-plugin] prepare for next development iteration 2017-01-31 12:58:56 +05:30
WSO2 Builder
a2224f96ff [maven-release-plugin] prepare release v3.0.10 2017-01-31 12:58:45 +05:30
WSO2 Builder
4554d8929d [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration 2017-01-30 18:07:35 +05:30
WSO2 Builder
da7c040224 [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9 2017-01-30 18:07:24 +05:30
ayyoob
3021947f30 updated saml grant type config name 2017-01-25 14:03:57 +05:30
ayyoob
4f1f1a3e7e Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-24 19:46:39 +05:30
WSO2 Builder
e64fe695ab [maven-release-plugin] prepare for next development iteration 2017-01-20 13:36:50 +00:00
WSO2 Builder
5fbd40c579 [maven-release-plugin] prepare release v3.0.8 2017-01-20 13:31:44 +00:00
kamidu
0679aab11d adding missing classes in hbs 2017-01-20 18:26:15 +05:30
WSO2 Builder
9687362258 [maven-release-plugin] prepare for next development iteration 2017-01-20 02:04:54 +00:00
WSO2 Builder
ee063a1a43 [maven-release-plugin] prepare release v3.0.7 2017-01-20 02:03:09 +00:00
Chatura Dilan
57d6fb12ce updating android agent 2017-01-19 22:54:34 +05:30
kamidu
c6d0c4ba44 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-19 22:39:15 +05:30
kamidu
50a2c3d89a Enable opasity variation with time on location records 2017-01-19 22:38:52 +05:30
Chatura Dilan
b2ff6c4181 Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-19 21:33:16 +05:30
Chatura Dilan
57cdf8e1a5 updating android agent 2017-01-19 21:31:07 +05:30
kamidu
eb9c789b51 Enable opasity variation with time on location records 2017-01-19 21:30:29 +05:30
Rasika Perera
737d1da07b Changed webapps title [EMM] into [IoT Server] 2017-01-19 17:04:01 +05:30
Rasika Perera
3b7257c93f Fixing "process" not found issues 2017-01-19 07:41:13 +05:30
Rasika Perera
fe6c35ebca Cleaned android-web-agent config.json 2017-01-19 01:34:48 +05:30
Rasika Perera
0bc380c7d0 Merge pull request #538 from Kamidu/release-3.0.x 
Enable location history
 2017-01-19 01:23:55 +05:30
Rasika Perera
1d10dbee88 Now UI configs supports system parameters with eg. %iot.core.host% 2017-01-19 00:58:13 +05:30
kamidu
c522809bd5 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-18 22:41:48 +05:30
kamidu
234157b6f5 adding location history to map view 2017-01-18 22:41:11 +05:30
Megala
574a106977 Adding fixes to path 2017-01-18 21:46:37 +05:30
Chatura Dilan
6db0885eb9 remove cosu whitelisting apps 2017-01-18 15:19:05 +05:30
Rasika Perera
bf9d93476c Updated title [EMM] into [IoT Server] 2017-01-18 09:02:29 +05:30
Rasika Perera
d68f2607f2 Updated android APK 2017-01-18 09:02:29 +05:30
Rasika Perera
1d0753ab8d Merge pull request #529 from DimalChandrasiri/release-3.0.x 
Fixed android type view notification pane message inconsistancy issue
 2017-01-17 19:41:19 +05:30
Rasika Perera
c74e9de2f5 Merge pull request #527 from dunithd/release-3.0.x 
Formatting the anchor text after fixing 500 error
 2017-01-17 19:40:38 +05:30
Imesh Chandrasiri
62ba568e05 Fixed android type view notification pane message inconsistancy issue 2017-01-17 17:34:51 +05:30
Rasika Perera
05e2cb7bb8 Changed [EMM] title into [IoT Server] 2017-01-17 15:34:08 +05:30
Dunith Dhanushka
54b08f9b7a Adding the JSON formatted anchor text 2017-01-17 15:10:46 +05:30
Dunith Dhanushka
6634dded55 Building the anchor text 2017-01-17 15:09:05 +05:30
Rasika Perera
0b983855cf Merge pull request #522 from DimalChandrasiri/release-3.0.x 
Fix for multiple popup issue
 2017-01-17 11:49:59 +05:30
ayyoob
dad3a34a27 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 22:40:03 +05:30
Dunith Dhanushka
b4f876d961 Updating the label text for Geo fencing link 2017-01-16 18:57:45 +05:30
ayyoob
9d64fd0d4b fixed multi tenant login issue 2017-01-16 16:08:07 +05:30
Imesh Chandrasiri
8eb95c3695 Fix for multiple popup issue 2017-01-14 23:56:51 +05:30
Imesh Chandrasiri
d918e32d59 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-14 23:51:43 +05:30
Imesh Chandrasiri
e112371d8e Fix for multiple popup issue 2017-01-14 23:51:07 +05:30
WSO2 Builder
3f1b7a6005 [maven-release-plugin] prepare for next development iteration 2017-01-14 12:22:40 +00:00
WSO2 Builder
91a0edb0a0 [maven-release-plugin] prepare release v3.0.6 2017-01-14 12:17:46 +00:00
Rasika Perera
3ae9fba143 Updating IoTS doc links 2017-01-13 23:14:26 +05:30
Rasika Perera
a3e97b4356 Merge pull request #521 from dunithd/release-3.0.x 
Replacing the value of GLOBAL-STATE param with comma separated deviceId,deviceType
 2017-01-13 22:42:53 +05:30
Dunith Dhanushka
a097482b91 Passing deviceId and deviceType into view 2017-01-13 20:26:13 +05:30
Dunith Dhanushka
33e57efc3d Replacing JSON object with comma separated values 2017-01-13 20:25:03 +05:30
Chatura Dilan
d55e0f21b7 Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-13 20:21:33 +05:30
Chatura Dilan
809d292c95 Added Android scopes 2017-01-13 20:21:14 +05:30
Rasika Perera
f84e3526f5 changed [fw-ok] with [fw-success] 2017-01-13 17:50:19 +05:30
ayyoob
09f7fb3a5f moved the traffic through the gateway 2017-01-13 04:49:35 +05:30
ayyoob
466c2b1151 moved to gateway mode 2017-01-12 19:29:59 +05:30
Imesh Chandrasiri
fc3d15887e Updating font wso2 to version 1.2.1 2017-01-11 11:20:21 +05:30
Milan Perera
2eb18e304a Change scope of android configuration 2017-01-10 11:39:09 +05:30
charitha
b812b6af2e Fixed issue in showing android device location map 2017-01-09 12:36:06 +05:30
WSO2 Builder
b10579950b [maven-release-plugin] prepare for next development iteration 2017-01-07 11:25:51 +00:00
WSO2 Builder
b7a5454c2f [maven-release-plugin] prepare release v3.0.5 2017-01-07 11:22:33 +00:00
Rasika Perera
82a1839fe9 Merge pull request #508 from dunithd/release-3.0.x 
Adding Geo fencing link to Android device
 2017-01-06 19:42:51 +05:30
dunithd
8c36f31030 Adding Geo fencing link to Android device 2017-01-06 18:36:16 +05:30
Milan Perera
77d1e684f6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 16:48:02 +05:30
Rasika Perera
2c9c02dc00 Replaced [EMM] with [IoT Server] 2017-01-06 16:26:59 +05:30
Rasika Perera
81c62b3a13 Merge pull request #501 from ayyoob/release-3.0.x 
made policy manager to be part of device mgt service
 2017-01-06 14:15:23 +05:30
inoshperera
7da5ae239b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 11:38:41 +05:30
inoshperera
22a58121d2 changing the Andrid API tag to standerdise 2017-01-06 11:38:09 +05:30
Milan Perera
86aac810ce Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 10:11:16 +05:30
Milan Perera
d2d912fb6d Refactored scopes strings 2017-01-06 10:10:45 +05:30
ayyoob
f603f58fd1 moved compliance payload generation code to api impl 2017-01-05 22:06:37 +05:30
Maninda
0c7f1adcba Fixed some issues reported with FindBugs while security plugin is enabled. 2017-01-05 19:36:52 +05:30
ayyoob
54011d2197 removed provider tenant domain and user from the web.xml 2017-01-05 17:57:04 +05:30
ayyoob
55d200514b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-05 17:55:17 +05:30
ayyoob
3fa679a3e9 made policy manager to be part of device type mgt service 2017-01-05 14:37:27 +05:30
Madawa Soysa
1b56ebb831 Improving scope annotations in android plugin 2017-01-05 14:26:43 +05:30
Rasika Perera
f3588c7951 config.json [usernameLength] moved to [userValidationConfig][usernameLength] 2017-01-04 22:28:12 +05:30
Rasika Perera
838223c67a Removed unneccesary configs 2017-01-04 00:18:28 +05:30
WSO2 Builder
227d4685c9 [maven-release-plugin] prepare for next development iteration 2016-12-24 03:15:18 +00:00
WSO2 Builder
6c38ce6385 [maven-release-plugin] prepare release v3.0.4 2016-12-24 03:13:35 +00:00
Ace
c302d7b25a Coorecting version import ranges 2016-12-23 09:58:28 +05:30
Ruwan
dd9e04e75d Merge pull request #493 from charithag/release-3.0.x-email-invites 
Release 3.0.x email invites
 2016-12-22 18:38:51 +05:30
charitha
a4841d87ba Add custom email template for android 2016-12-22 18:31:05 +05:30
Rasika Perera
5465cea76d Fixing QR modal unit not found issue 2016-12-22 14:03:49 +05:30
Ace
34c4d00d4f Bumping identity dependencies 2016-12-22 12:34:28 +05:30
Ace
8ac0971a24 Updating identity dependencies to latest 2016-12-22 11:01:56 +05:30
Geeth
b8472666ad Merge pull request #488 from Supun94/release-3.0.x 
Support for Device Management Policy Merging
 2016-12-22 10:37:59 +05:30
Rasika Perera
27e066e92a IOTS-336: Fixing android and windows mobile agents title 2016-12-22 09:37:37 +05:30
charitha
0c2465d03e Add enrollment invitations API EP for android 2016-12-20 23:48:21 +05:30
charitha
2211ad2a59 Update device type detail pages and moved QR modal to device mgt core 2016-12-19 15:26:29 +05:30
Ace
488c2abafa removing slf4j from packing in the android devicemgt jaxrs 2016-12-19 15:24:02 +05:30
Imesh Chandrasiri
48461af2c3 Adding email sender changes 2016-12-19 11:27:43 +05:30
Imesh Chandrasiri
6464fcb615 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-19 11:12:49 +05:30
Supun94
57f0ea7ce4 Changing policy compliance view 2016-12-19 04:57:17 +05:30
Imesh Chandrasiri
da4eb14144 Device view changes for email invite and agent download 2016-12-16 14:56:15 +05:30
Rasika Perera
a08e58a574 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-16 12:43:55 +05:30
Imesh Chandrasiri
fe195ca8f7 UI Fixes 2016-12-14 14:03:41 +05:30
Megala
0b1acaa990 Updating the agent apk file 2016-12-14 10:56:03 +05:30
Megala
ec5936d013 Updating the apk file to switch between event enabling and disabling 2016-12-13 19:37:42 +05:30
Rasika Perera
b5e220799a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-09 18:39:59 +05:30
WSO2 Builder
a398686ec7 [maven-release-plugin] prepare for next development iteration 2016-12-09 05:46:04 +00:00
WSO2 Builder
3bafccc303 [maven-release-plugin] prepare release v3.0.3 2016-12-09 05:43:17 +00:00
Chatura Dilan
49d81766f6 fixed conflicts 2016-12-09 10:35:36 +05:30
Chatura Dilan
e22d4d3530 Fixed UI issues in the policy screen 2016-12-09 10:29:53 +05:30
charitha
5d7fd0d66d Merge branch 'harshanL-master' of https://github.com/harshanL/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 19:00:22 +05:30
Harshan Liyanage
ce5d907801 Added operation bar.json 2016-12-08 18:55:50 +05:30
Harshan Liyanage
26bbb55af5 Resolved conflicts with release-3.0.x 2016-12-08 18:07:14 +05:30
madhawap
6618b919d1 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:40:43 +05:30
Harshan Liyanage
559fa3fe38 Resolved conflicts 2016-12-08 16:40:18 +05:30
Madawa Soysa
548213d601 Fixing issue with COSU policy configuration 2016-12-08 14:22:23 +05:30
Madawa Soysa
0b8db53b91 IOTS-296: Moving android operation-mod to android plugin 
This commit moves the operation-mod functions to android plugin and refactor policy CRUD code to use plugin specific operation mod functions.
 2016-12-08 10:32:35 +05:30
Rasika Perera
c722dfa779 Adding ui permissions to the operations on android 2016-12-07 22:57:53 +05:30
sinthuja
f23fd9c85f Merge branch 'android-sense-agent-fixes' into release-3.0.x 2016-12-07 11:00:49 +05:30
Megala
6e23d498b8 Fixing the parent path problem 2016-12-06 21:35:44 +05:30
Charitha Goonetilleke
7fa0a4b11f Merge pull request #454 from madawas/IOTS-296 
IOTS-296: Genaralizing policy view UI for windows and android
 2016-12-06 19:11:24 +05:30
charitha
5fc3e82d35 Fix agent download issue 2016-12-06 19:00:56 +05:30
Megala
5a3809b493 Fixing the version problem 2016-12-06 17:40:27 +05:30
Megala
4bfd9a72b6 Adding siddhi extension and analytics for android-agent 2016-12-06 17:18:20 +05:30
Ace
3d21f84a76 merging with upstream 2016-12-06 13:34:28 +05:30
Ace
3dd59ed250 Adding changes to descriptor and ui changes 2016-12-06 13:31:41 +05:30
Madawa Soysa
cb44d9a824 IOTS-296: Genaralizing policy view UI for windows and android 
Moving device type specific UI components related to policy view. This commit includes modifications for both android and windows plugins.
 2016-12-06 12:22:25 +05:30
Imesh Chandrasiri
ba0eea6344 Fixing text overlapping and UX issues in device pages 2016-12-05 16:13:23 +05:30
Imesh Chandrasiri
b55c64d551 Layout changes for device enrollment views 2016-12-05 11:49:40 +05:30
Ace
749f680dad Adding missed configurations 2016-12-05 10:42:01 +05:30
Ace
8a96aa204c Adding generalizations to android-operations bar 2016-12-05 10:35:40 +05:30
Madawa Soysa
37f0bc396d IOTS-296: Moving policy profile generation to android plugin 
Policy profile generation part is removed from the CDMF core and moved to plugins as policy profile is dependent on the device type. In this commit, policy profile generation for android device type is implemnted in android plugin.
 2016-12-02 17:03:19 +05:30
WSO2 Builder
619dab548e [maven-release-plugin] prepare for next development iteration 2016-12-01 13:52:49 +00:00
WSO2 Builder
4a0aa3be8e [maven-release-plugin] prepare release v3.0.2 2016-12-01 13:50:48 +00:00
charitha
ee496d93fe removed unnecessary logs 2016-12-01 17:18:57 +05:30
madhawap
d7c3f5c18a refactored code 2016-12-01 16:34:49 +05:30
madhawap
d66292f933 refactored code 2016-12-01 16:11:01 +05:30
madhawap
429b52f037 resolve conflicts 2016-12-01 16:04:43 +05:30
madhawap
3249079965 Seperate out task operations 2016-12-01 15:41:07 +05:30
WSO2 Builder
4ae70fe1f1 [maven-release-plugin] prepare for next development iteration 2016-11-29 10:24:35 +00:00
WSO2 Builder
42c2b04c62 [maven-release-plugin] prepare release v2.2.7 2016-11-29 10:12:05 +00:00
WSO2 Builder
ab087bf934 [maven-release-plugin] prepare for next development iteration 2016-11-29 07:23:41 +00:00
WSO2 Builder
072dd089ef [maven-release-plugin] prepare release v2.2.6 2016-11-29 07:21:29 +00:00
WSO2 Builder
bfa2c5fa61 [maven-release-plugin] prepare for next development iteration 2016-11-25 09:14:26 +00:00
WSO2 Builder
09d434bda9 [maven-release-plugin] prepare release v3.0.1 2016-11-25 09:11:13 +00:00
Megala
6c9c4a15fd Removing the sender id 2016-11-25 09:44:23 +05:30
Imesh Chandrasiri
bc075dedf0 Changes for IoT build 2016-11-24 18:29:35 +05:30
inoshperera
18c0760ba5 Changing gcm endpoint to fcm 2016-11-24 16:08:48 +05:30
inoshperera
3b867a533d fixing http status code 2016-11-24 12:46:33 +05:30
inoshperera
d9a449dd26 adding modify enrollment capability to save chnages in enrollment such as GCM token update 2016-11-23 12:36:05 +05:30
GPrathap
3d971d2bb7 removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations 2016-11-20 19:04:11 +05:30
WSO2 Builder
61ca4c4900 [maven-release-plugin] prepare for next development iteration 2016-11-16 13:57:06 +00:00
WSO2 Builder
4746bf0c74 [maven-release-plugin] prepare release v3.0.0 2016-11-16 13:55:17 +00:00
Ace
ae33d236fa Adding android device-view changes 2016-11-16 15:43:23 +05:30
Ace
7e3df67548 Adding android-base-plugin 2016-11-16 15:07:44 +05:30
charitha
1170263139 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:45 +05:30
Ace
ea14e32337 Adding android-web-agent 2016-11-11 10:05:12 +05:30
Ace
3d32ad984c Adding fixes to android qr-gen code 2016-11-10 12:08:05 +05:30
Ace
cea96cc841 Merging with master 2016-11-09 12:54:33 +05:30
Chatura Dilan
9e78b87365 Fixed issue in device operation bar 2016-11-08 18:04:42 +05:30
Chatura Dilan
d6701ee04c Fixed issue in device view UI 2016-11-08 18:02:47 +05:30
Chatura Dilan
49dd83ed33 Adding CDMF operation bar to Android 2016-11-08 15:16:10 +05:30
Chatura Dilan
b207e5d624 Added missing units 2016-11-08 15:08:57 +05:30
Ace
7d14e23d00 merging with upstream 2016-11-04 20:09:13 +05:30
Ace
daf37338c6 merging changes with upstream 
partial
 2016-11-04 19:41:33 +05:30
Ace
e38941e81e restructuring iot-plugins 
removing mobile/iot base plugins and other restructuring
 2016-11-04 19:16:44 +05:30
Chatura Dilan
3227f3f650 Chages to device view for Android 2016-11-04 11:17:41 +05:30
Chatura Dilan
269376a135 Changes to Android operation bar 2016-11-03 15:22:17 +05:30
Chatura Dilan
76887c4277 Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-03 14:50:55 +05:30
Chatura Dilan
1e3d8021e9 Adding Android and Windows operation bars 2016-11-03 14:48:14 +05:30
ayyoob
bd05fb721a merged with origin IoTS-1.0.0 2016-11-02 07:47:48 +05:30
sinthuja
96e0ef92d7 Adding changes related to removing DAS components. 2016-11-01 18:35:09 +05:30
WSO2 Builder
c9861e9636 [maven-release-plugin] prepare for next development iteration 2016-10-31 11:57:15 +00:00
WSO2 Builder
3e664dc304 [maven-release-plugin] prepare release v2.2.5 2016-10-31 11:55:04 +00:00
kamidu
a9308c3f22 removing the unnessary ' ' from hbs files 2016-10-31 11:59:29 +05:30
Rasika Perera
a40ce98698 Make analytics and groups view disable for mobile plugins 2016-10-29 23:47:36 +05:30
Harshan Liyanage
242253b8f2 Merge pull request #391 from shavidissa/master 
Added swagger annotations and refined the messages
 2016-10-27 12:21:26 +05:30
Shavindri
f6c0aeecfc Added swagger annotations and refined the messages 2016-10-27 12:05:17 +05:30
Megala
e23ecc5b64 Fixing EMM-1779 2016-10-25 17:34:53 +05:30
WSO2 Builder
19e0d65db0 [maven-release-plugin] prepare for next development iteration 2016-10-21 11:27:51 +00:00
WSO2 Builder
537a99d05d [maven-release-plugin] prepare release v2.2.4 2016-10-21 11:25:53 +00:00
WSO2 Builder
b095196e65 [maven-release-plugin] prepare for next development iteration 2016-10-18 15:36:09 +00:00