Commit Graph

1160 Commits

Author SHA1 Message Date
geethkokila
f00c50af2a Fixing the conflict 2018-01-22 17:46:42 +05:30
geethkokila
40484b5d6b Updating the carbon-device-mgt version
This upgrade has api changes due to fixes to the policy monitoring
2018-01-22 17:29:44 +05:30
WSO2 Builder
3053441c60 [WSO2 Release] [Jenkins #3096] [Release 4.0.113] prepare for next development iteration 2018-01-19 14:21:00 +00:00
WSO2 Builder
b26efb94e6 [WSO2 Release] [Jenkins #3096] [Release 4.0.113] prepare release v4.0.113 2018-01-19 14:20:44 +00:00
WSO2 Builder
424db1236e [WSO2 Release] [Jenkins #3094] [Release 4.0.112] prepare for next development iteration 2018-01-19 09:03:13 +00:00
WSO2 Builder
afd06b8a79 [WSO2 Release] [Jenkins #3094] [Release 4.0.112] prepare release v4.0.112 2018-01-19 09:02:58 +00:00
inoshperera
cf0d38d43e changing the used space to free space 2018-01-19 14:19:00 +05:30
inoshperera
89c4ab3fbd fixing https://github.com/wso2/product-iots/issues/1605 2018-01-19 10:56:51 +05:30
inoshperera
ab2332d34c fixing https://github.com/wso2/product-iots/issues/1604 2018-01-19 10:55:04 +05:30
Rasika Perera
5c293f83fb Fixing https://github.com/wso2/product-iots/issues/1142 2018-01-17 13:51:18 +05:30
WSO2 Builder
ce9ae0016b [WSO2 Release] [Jenkins #3092] [Release 4.0.111] prepare for next development iteration 2018-01-11 07:41:52 +00:00
WSO2 Builder
29c470650b [WSO2 Release] [Jenkins #3092] [Release 4.0.111] prepare release v4.0.111 2018-01-11 07:41:36 +00:00
Ace
7b2120359b adding latest android agent version : v3.1.27 2018-01-11 12:53:29 +05:30
WSO2 Builder
d06a149262 [WSO2 Release] [Jenkins #3090] [Release 4.0.110] prepare for next development iteration 2018-01-11 04:58:39 +00:00
WSO2 Builder
82a010bef6 [WSO2 Release] [Jenkins #3090] [Release 4.0.110] prepare release v4.0.110 2018-01-11 04:58:23 +00:00
charitha
11091c6484 Removed unnecessary uuf-template-app 2018-01-11 10:02:31 +05:30
WSO2 Builder
936f641826 [WSO2 Release] [Jenkins #3088] [Release 4.0.109] prepare for next development iteration 2018-01-10 05:58:33 +00:00
WSO2 Builder
9a24c5bc59 [WSO2 Release] [Jenkins #3088] [Release 4.0.109] prepare release v4.0.109 2018-01-10 05:58:20 +00:00
WSO2 Builder
f26b0521f4 [WSO2 Release] [Jenkins #3086] [Release 4.0.108] prepare for next development iteration 2018-01-10 02:17:15 +00:00
WSO2 Builder
a479d6b4b2 [WSO2 Release] [Jenkins #3086] [Release 4.0.108] prepare release v4.0.108 2018-01-10 02:17:00 +00:00
Rasika Perera
80de89c8c1 https://github.com/wso2/product-iots/issues/1573 Removed android-web-agent, Fixed download URL 2018-01-09 20:06:50 +05:30
WSO2 Builder
f39c63f3ea [WSO2 Release] [Jenkins #3084] [Release 4.0.107] prepare for next development iteration 2017-12-24 17:28:29 +00:00
WSO2 Builder
6fa7efbec7 [WSO2 Release] [Jenkins #3084] [Release 4.0.107] prepare release v4.0.107 2017-12-24 17:28:12 +00:00
lasantha
48fdda4e38 adding latest android agent and fixing test failures 2017-12-24 21:44:04 +05:30
WSO2 Builder
2195aa81c2 [WSO2 Release] [Jenkins #3081] [Release 4.0.106] prepare for next development iteration 2017-12-15 16:06:54 +00:00
WSO2 Builder
2e52fa02f5 [WSO2 Release] [Jenkins #3081] [Release 4.0.106] prepare release v4.0.106 2017-12-15 16:06:38 +00:00
kamidu
c540cce8e0 Fixing https://github.com/wso2/product-iots/issues/1538 2017-12-15 21:07:03 +05:30
WSO2 Builder
e0e858b37f [WSO2 Release] [Jenkins #3079] [Release 4.0.105] prepare for next development iteration 2017-12-15 13:48:28 +00:00
WSO2 Builder
6332daf57e [WSO2 Release] [Jenkins #3079] [Release 4.0.105] prepare release v4.0.105 2017-12-15 13:48:13 +00:00
lasantha
8865c80ed5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-12-15 18:43:49 +05:30
Madawa Soysa
8f635c9e7c
Merge pull request #859 from milanperera/release-320
Fixed policy UI issue
2017-12-15 18:40:56 +05:30
Milan Perera
46e76f53c2 Fixed policy UI issue
Accordian view did not work properly due to a missing div
2017-12-15 18:37:24 +05:30
lasantha
2d52e07c04 fixing version conflicts 2017-12-15 17:16:59 +05:30
Madawa Soysa
2c38b2e939
Merge pull request #857 from lasanthaDLPDS/vf-dev-api
Adding New API version (v0.9) for Android device management
2017-12-15 14:46:30 +05:30
lasantha
aa7eec8a55 made newly added android-mgt API as nondefault one 2017-12-15 10:32:47 +05:30
WSO2 Builder
73679e4822 [WSO2 Release] [Jenkins #3076] [Release 4.0.104] prepare for next development iteration 2017-12-14 09:25:13 +00:00
WSO2 Builder
4dee81b731 [WSO2 Release] [Jenkins #3076] [Release 4.0.104] prepare release v4.0.104 2017-12-14 09:24:58 +00:00
Milan Perera
446c71bb59 Fixed wso2/product-iots#1528 2017-12-14 13:06:31 +05:30
WSO2 Builder
fa7f1b59d8 [WSO2 Release] [Jenkins #3074] [Release 4.0.103] prepare for next development iteration 2017-12-13 07:06:33 +00:00
WSO2 Builder
186d008f34 [WSO2 Release] [Jenkins #3074] [Release 4.0.103] prepare release v4.0.103 2017-12-13 07:06:19 +00:00
charitha
0f6a06a2a3 Fixed https://github.com/wso2/product-iots/issues/1452 2017-12-13 12:08:14 +05:30
WSO2 Builder
2bd608f185 [WSO2 Release] [Jenkins #3072] [Release 4.0.102] prepare for next development iteration 2017-12-13 03:58:20 +00:00
WSO2 Builder
3b765b390c [WSO2 Release] [Jenkins #3072] [Release 4.0.102] prepare release v4.0.102 2017-12-13 03:58:06 +00:00
Milan Perera
873505dc17 Modified policy edit page 2017-12-13 08:54:06 +05:30
Milan Perera
e09a524c30 Fixed wso2/product-iots#1427 2017-12-13 08:21:03 +05:30
lasantha
4a62a05cb9 Adding new API version for backward compatibility 2017-12-12 18:20:36 +05:30
WSO2 Builder
ae827b5fef [WSO2 Release] [Jenkins #3070] [Release 4.0.101] prepare for next development iteration 2017-11-30 06:01:33 +00:00
WSO2 Builder
05fba1d664 [WSO2 Release] [Jenkins #3070] [Release 4.0.101] prepare release v4.0.101 2017-11-30 06:01:18 +00:00
Ace
d57cb4a3a1 Bumping cdmf version and updating unit tests 2017-11-30 10:52:30 +05:30
WSO2 Builder
a40e9585ea [WSO2 Release] [Jenkins #3068] [Release 4.0.100] prepare for next development iteration 2017-11-29 16:30:44 +00:00
WSO2 Builder
1fb05f65f1 [WSO2 Release] [Jenkins #3068] [Release 4.0.100] prepare release v4.0.100 2017-11-29 16:30:29 +00:00
WSO2 Builder
09ad904d9f [WSO2 Release] [Jenkins #3066] [Release 4.0.99] prepare for next development iteration 2017-11-23 14:37:47 +00:00
WSO2 Builder
8251e37ea9 [WSO2 Release] [Jenkins #3066] [Release 4.0.99] prepare release v4.0.99 2017-11-23 14:37:32 +00:00
charitha
097d4cee95 Add latest android agent (3.1.22)
https://github.com/wso2/product-iots/issues/1497
2017-11-23 19:24:38 +05:30
WSO2 Builder
1d8e5f7c91 [WSO2 Release] [Jenkins #3064] [Release 4.0.98] prepare for next development iteration 2017-11-23 12:30:19 +00:00
WSO2 Builder
f74146378a [WSO2 Release] [Jenkins #3064] [Release 4.0.98] prepare release v4.0.98 2017-11-23 12:30:02 +00:00
Gathika94
6b6b82e639 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-11-23 14:43:13 +05:30
charitha
82c7eefd2e Fix for https://github.com/wso2/product-iots/issues/1496 2017-11-23 14:39:08 +05:30
Gathika94
6bcbf4e5dd minor changes 2017-11-22 21:44:51 +05:30
WSO2 Builder
b964faf3e1 [WSO2 Release] [Jenkins #3060] [Release 4.0.97] prepare for next development iteration 2017-11-17 13:02:58 +00:00
WSO2 Builder
cf182427fb [WSO2 Release] [Jenkins #3060] [Release 4.0.97] prepare release v4.0.97 2017-11-17 13:02:44 +00:00
charitha
49758fe5fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-11-17 17:22:42 +05:30
charitha
671a36e849 Merge branch 'remote-control' of https://github.com/warunalakshitha/carbon-device-mgt-plugins 2017-11-17 17:21:31 +05:30
WSO2 Builder
54ba529410 [WSO2 Release] [Jenkins #3058] [Release 4.0.96] prepare for next development iteration 2017-11-17 10:55:56 +00:00
WSO2 Builder
8775bb8ef0 [WSO2 Release] [Jenkins #3058] [Release 4.0.96] prepare release v4.0.96 2017-11-17 10:55:43 +00:00
WSO2 Builder
a78086f002 [WSO2 Release] [Jenkins #3056] [Release 4.0.95] prepare for next development iteration 2017-11-17 09:44:11 +00:00
WSO2 Builder
02aa1191ee [WSO2 Release] [Jenkins #3056] [Release 4.0.95] prepare release v4.0.95 2017-11-17 09:43:56 +00:00
WSO2 Builder
7373737730 [WSO2 Release] [Jenkins #3055] [Release 4.0.94] prepare for next development iteration 2017-11-17 09:07:21 +00:00
WSO2 Builder
8acea1f50e [WSO2 Release] [Jenkins #3055] [Release 4.0.94] prepare release v4.0.94 2017-11-17 09:07:04 +00:00
WSO2 Builder
92565a4aa4 [WSO2 Release] [Jenkins #3053] [Release 4.0.93] prepare for next development iteration 2017-11-16 15:59:16 +00:00
WSO2 Builder
4639708db5 [WSO2 Release] [Jenkins #3053] [Release 4.0.93] prepare release v4.0.93 2017-11-16 15:59:00 +00:00
WSO2 Builder
2f18ecef0a [WSO2 Release] [Jenkins #3051] [Release 4.0.92] prepare for next development iteration 2017-11-02 11:56:51 +00:00
WSO2 Builder
fcbf997078 [WSO2 Release] [Jenkins #3051] [Release 4.0.92] prepare release v4.0.92 2017-11-02 11:56:35 +00:00
WSO2 Builder
344dba991a [WSO2 Release] [Jenkins #3049] [Release 4.0.91] prepare for next development iteration 2017-10-31 07:46:40 +00:00
WSO2 Builder
a572cf6fe1 [WSO2 Release] [Jenkins #3049] [Release 4.0.91] prepare release v4.0.91 2017-10-31 07:46:26 +00:00
charitha
6828d0ae41 Bumping device-mgt-core to latest release 2017-10-30 15:50:45 +05:30
charitha
94097dd0c0 Merge branch 'master' into add-emm-analytics
# Conflicts:
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/EventReceiverServiceImpl.java
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java
#	pom.xml
2017-10-30 10:20:16 +05:30
WSO2 Builder
4e8090ae5c [WSO2 Release] [Jenkins #3039] [Release 4.0.90] prepare for next development iteration 2017-10-18 11:37:05 +00:00
WSO2 Builder
952d6ba91c [WSO2 Release] [Jenkins #3039] [Release 4.0.90] prepare release v4.0.90 2017-10-18 11:36:51 +00:00
Charitha Goonetilleke
3b18779775 Merge pull request #837 from Nirothipan/fileTransfer
Minor change in display dialog.
2017-10-18 16:41:25 +05:30
Nirothipan
673d47191e removing unecessary + 2017-10-18 16:15:49 +05:30
WSO2 Builder
90f3717544 [WSO2 Release] [Jenkins #3037] [Release 4.0.89] prepare for next development iteration 2017-10-18 09:35:08 +00:00
WSO2 Builder
0bfd80c63e [WSO2 Release] [Jenkins #3037] [Release 4.0.89] prepare release v4.0.89 2017-10-18 09:34:54 +00:00
Nirothipan
1f484e6a53 resolving conflicts 2017-10-18 14:31:12 +05:30
Nirothipan
5b86f692c1 resolving conflicts 2017-10-18 14:30:39 +05:30
Nirothipan
d428901b22 ui-improvements 2017-10-18 11:54:03 +05:30
WSO2 Builder
0e9df6405e [WSO2 Release] [Jenkins #3035] [Release 4.0.88] prepare for next development iteration 2017-10-13 15:54:42 +00:00
WSO2 Builder
3e30878e4a [WSO2 Release] [Jenkins #3035] [Release 4.0.88] prepare release v4.0.88 2017-10-13 15:54:28 +00:00
charitha
b48c337d06 Refactoring the code 2017-10-13 17:37:08 +05:30
charitha
cbd90feb68 Add few more tests 2017-10-13 14:57:58 +05:30
charitha
baa30d39a3 Add more test cases 2017-10-13 12:54:52 +05:30
charitha
cafdeaef48 Refactor code to be optimized 2017-10-13 12:54:11 +05:30
charitha
9532c69874 Add test cases for Android Device Management Admin Service. 2017-10-12 06:36:09 +05:30
charitha
e37e722ac6 Refactored Util methods 2017-10-12 06:32:12 +05:30
warunalakshitha
5f2fc025c3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into remote-control 2017-10-11 18:06:02 +05:30
charitha
1da9ce9187 Add oauth based event publisher 2017-10-09 17:53:33 +05:30
charitha
2891f4c8da Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into add-emm-analytics 2017-10-06 13:40:52 +05:30
charitha
269f2e8b7f Finalized device group extension for siddhi 2017-10-06 13:40:27 +05:30
WSO2 Builder
4cbcb5d2e6 [WSO2 Release] [Jenkins #3032] [Release 4.0.87] prepare for next development iteration 2017-10-04 13:15:15 +05:30
WSO2 Builder
189a0b9d6b [WSO2 Release] [Jenkins #3032] [Release 4.0.87] prepare release v4.0.87 2017-10-04 13:14:58 +05:30
Nirothipan
ca2cf5382f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into fileTransfer 2017-10-03 14:26:59 +05:30
Nirothipan
d217a72851 adding userName parameter to API 2017-10-03 13:53:01 +05:30
warunalakshitha
dde525dd91 Ui fix 2017-10-01 11:00:58 +05:30
warunalakshitha
33b615a1df add remote inject input ui changes 2017-10-01 10:59:18 +05:30
warunalakshitha
f0faba1b34 fix conflicts 2017-10-01 10:56:15 +05:30
WSO2 Builder
0c2fce76cf [WSO2 Release] [Jenkins #3028] [Release 4.0.86] prepare for next development iteration 2017-09-29 12:53:39 +00:00
WSO2 Builder
dbee3f98e5 [WSO2 Release] [Jenkins #3028] [Release 4.0.86] prepare release v4.0.86 2017-09-29 12:53:25 +00:00
WSO2 Builder
1338e82408 [WSO2 Release] [Jenkins #3025] [Release 4.0.85] prepare for next development iteration 2017-09-26 05:11:29 +00:00
WSO2 Builder
98bb86ff53 [WSO2 Release] [Jenkins #3025] [Release 4.0.85] prepare release v4.0.85 2017-09-26 05:11:14 +00:00
WSO2 Builder
52bd9ce06e [WSO2 Release] [Jenkins #3023] [Release 4.0.84] prepare for next development iteration 2017-09-25 04:01:48 +00:00
WSO2 Builder
4e77260fa7 [WSO2 Release] [Jenkins #3023] [Release 4.0.84] prepare release v4.0.84 2017-09-25 04:01:32 +00:00
megala21
0c7419f2eb Adding jacoco plugins for unit coverage 2017-09-25 00:41:01 +05:30
WSO2 Builder
5b4a1727ec [WSO2 Release] [Jenkins #3021] [Release 4.0.83] prepare for next development iteration 2017-09-22 06:11:59 +00:00
WSO2 Builder
06f110d390 [WSO2 Release] [Jenkins #3021] [Release 4.0.83] prepare release v4.0.83 2017-09-22 06:11:46 +00:00
charitha
d2ffcbc4f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-09-22 11:02:03 +05:30
charitha
609857f624 Fix for https://github.com/wso2/product-iots/issues/1423 2017-09-22 10:53:57 +05:30
Nirothipan
cff69459be code formatting and updating comments, descriptions 2017-09-21 17:18:57 +05:30
WSO2 Builder
5f6e4e55fe [WSO2 Release] [Jenkins #3019] [Release 4.0.82] prepare for next development iteration 2017-09-21 10:51:23 +00:00
WSO2 Builder
fca60df1b5 [WSO2 Release] [Jenkins #3019] [Release 4.0.82] prepare release v4.0.82 2017-09-21 10:51:08 +00:00
Nirothipan
2ddfbed6db changing variable names 2017-09-21 14:05:30 +05:30
Nirothipan
a79580b8ac code formatting 2017-09-19 18:59:51 +05:30
WSO2 Builder
58d6611076 [WSO2 Release] [Jenkins #3017] [Release 4.0.81] prepare for next development iteration 2017-09-19 09:00:33 +00:00
WSO2 Builder
639341c545 [WSO2 Release] [Jenkins #3017] [Release 4.0.81] prepare release v4.0.81 2017-09-19 09:00:19 +00:00
WSO2 Builder
c1832fcbbd [WSO2 Release] [Jenkins #3015] [Release 4.0.80] prepare for next development iteration 2017-09-15 12:20:04 +00:00
WSO2 Builder
9a18b37429 [WSO2 Release] [Jenkins #3015] [Release 4.0.80] prepare release v4.0.80 2017-09-15 12:19:50 +00:00
megala21
c73d1da8f2 Fixing https://github.com/wso2/product-iots/issues/1388 2017-09-15 14:59:38 +05:30
WSO2 Builder
fdb9192f74 [WSO2 Release] [Jenkins #3013] [Release 4.0.79] prepare for next development iteration 2017-09-14 10:24:44 +00:00
WSO2 Builder
d85339f3c6 [WSO2 Release] [Jenkins #3013] [Release 4.0.79] prepare release v4.0.79 2017-09-14 10:24:29 +00:00
Sameera Wickramasekara
9dfcd757ad Fixes for wso2/product-iots#1403 2017-09-14 15:15:51 +05:30
WSO2 Builder
9c0fac0889 [WSO2 Release] [Jenkins #3011] [Release 4.0.78] prepare for next development iteration 2017-09-14 07:21:05 +00:00
WSO2 Builder
0932953862 [WSO2 Release] [Jenkins #3011] [Release 4.0.78] prepare release v4.0.78 2017-09-14 07:20:51 +00:00
Harshan Liyanage
2e6ba042b8 Fixes related to wso2/product-iots#1348 2017-09-13 14:23:47 +05:30
Nirothipan
79447cbaf7 changing operation names 2017-09-12 17:05:08 +05:30
WSO2 Builder
c62df267f7 [WSO2 Release] [Jenkins #3009] [Release 4.0.77] prepare for next development iteration 2017-09-11 09:17:08 +00:00
WSO2 Builder
b08b7f83b3 [WSO2 Release] [Jenkins #3009] [Release 4.0.77] prepare release v4.0.77 2017-09-11 09:16:54 +00:00
Nirothipan
c9bac2c860 fileTransferfeature, uploading files from device to ftp server 2017-09-11 13:10:42 +05:30
WSO2 Builder
af8ea6ca2c [WSO2 Release] [Jenkins #3007] [Release 4.0.76] prepare for next development iteration 2017-09-08 12:38:30 +00:00
WSO2 Builder
05f2d2f04e [WSO2 Release] [Jenkins #3007] [Release 4.0.76] prepare release v4.0.76 2017-09-08 12:38:16 +00:00
WSO2 Builder
66a5e1a150 [WSO2 Release] [Jenkins #3005] [Release 4.0.75] prepare for next development iteration 2017-09-08 11:01:50 +00:00
WSO2 Builder
953d086559 [WSO2 Release] [Jenkins #3005] [Release 4.0.75] prepare release v4.0.75 2017-09-08 11:01:36 +00:00
WSO2 Builder
707733c8e5 [WSO2 Release] [Jenkins #3002] [Release 4.0.74] prepare for next development iteration 2017-09-07 13:01:41 +00:00
WSO2 Builder
df2e3aad84 [WSO2 Release] [Jenkins #3002] [Release 4.0.74] prepare release v4.0.74 2017-09-07 13:01:27 +00:00
WSO2 Builder
d8ffb5d30f [WSO2 Release] [Jenkins #3001] [Release 4.0.73] prepare for next development iteration 2017-09-07 12:21:32 +00:00
WSO2 Builder
7d9e67ec67 [WSO2 Release] [Jenkins #3001] [Release 4.0.73] prepare release v4.0.73 2017-09-07 12:21:19 +00:00
Nirothipan
80941b8d2b making error messages more meaningful 2017-09-07 12:29:59 +05:30
Nirothipan
85752584bb modifying messages 2017-09-07 12:09:54 +05:30
Nirothipan
118587ae6e file transfer feature 2017-09-06 13:39:51 +05:30
WSO2 Builder
c7d5043248 [WSO2 Release] [Jenkins #2993] [Release 4.0.72] prepare for next development iteration 2017-09-01 08:01:13 +00:00
WSO2 Builder
6dc27b549e [WSO2 Release] [Jenkins #2993] [Release 4.0.72] prepare release v4.0.72 2017-09-01 08:00:57 +00:00
sameera910409
07cb99fed7 fixes https://github.com/wso2/product-iots/issues/1346 2017-09-01 12:23:30 +05:30