Commit Graph

1109 Commits

Author SHA1 Message Date
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
WSO2 Builder
55a2a0884d [WSO2 Release] [Jenkins #2990] [Release 4.0.71] prepare for next development iteration 2017-08-31 13:38:23 +00:00
WSO2 Builder
8df563997b [WSO2 Release] [Jenkins #2990] [Release 4.0.71] prepare release v4.0.71 2017-08-31 13:38:10 +00:00
WSO2 Builder
e92e188592 [WSO2 Release] [Jenkins #2989] [Release 4.0.70] prepare for next development iteration 2017-08-31 13:01:15 +00:00
WSO2 Builder
213c159c6d [WSO2 Release] [Jenkins #2989] [Release 4.0.70] prepare release v4.0.70 2017-08-31 13:01:02 +00:00
WSO2 Builder
4a2cc1e6e1 Merge commit '82b6a03d5f2eda336ff4db8781a565c762b4d948' into 26c1617c-7923-44f1-97f8-0bd4b1d9ab2f 2017-08-31 12:13:25 +00:00
Harshan Liyanage
dde64e6065 Added new config param to fetch hostname. 2017-08-31 17:02:13 +05:30
WSO2 Builder
82b6a03d5f [WSO2 Release] [Jenkins #2988] [Release 4.0.69] prepare for next development iteration 2017-08-31 11:28:49 +00:00
WSO2 Builder
87736dbbdb [WSO2 Release] [Jenkins #2988] [Release 4.0.69] prepare release v4.0.69 2017-08-31 11:28:36 +00:00
WSO2 Builder
b1250f9334 [WSO2 Release] [Jenkins #2987] [Release 4.0.68] prepare for next development iteration 2017-08-31 10:44:25 +00:00
WSO2 Builder
6d787ddb46 [WSO2 Release] [Jenkins #2987] [Release 4.0.68] prepare release v4.0.68 2017-08-31 10:44:11 +00:00
WSO2 Builder
c89dc1480c [WSO2 Release] [Jenkins #2986] [Release 4.0.67] prepare for next development iteration 2017-08-31 10:07:07 +00:00
WSO2 Builder
c08a1b01bc [WSO2 Release] [Jenkins #2986] [Release 4.0.67] prepare release v4.0.67 2017-08-31 10:06:54 +00:00
Milan Perera
4f125c23db Merge pull request #809 from menakaj/master
Added tooltips for Android Policy restrictions.
2017-08-31 15:03:04 +05:30
WSO2 Builder
0883f46bfb Merge commit '64ad9937aae1ffb303add10e722f402afda1150c' into bf8f0ad8-5def-4e1e-8580-acf33f8fb32a 2017-08-31 09:32:04 +00:00
Menaka Jayawardena
4023afe656 Added tooltips for Android Policy restrictions. 2017-08-31 14:56:58 +05:30
amalhub
198175b965 Resolves: https://github.com/wso2/product-iots/issues/1202 2017-08-31 14:48:56 +05:30
WSO2 Builder
64ad9937aa [WSO2 Release] [Jenkins #2985] [Release 4.0.66] prepare for next development iteration 2017-08-31 08:49:50 +00:00
WSO2 Builder
4e55bde904 [WSO2 Release] [Jenkins #2985] [Release 4.0.66] prepare release v4.0.66 2017-08-31 08:49:32 +00:00
Madawa Soysa
15616dc77c Truncating longer versions in Application Listing view
This commit truncates the version attribute of the application if the version is longer to fit the application view container.

fixes /wso2/product-iots#1311
2017-08-31 12:07:12 +05:30
warunalakshitha
808b0d2e5d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into remote-control 2017-08-31 11:57:43 +05:30
WSO2 Builder
49567426fa [WSO2 Release] [Jenkins #2982] [Release 4.0.65] prepare for next development iteration 2017-08-30 06:07:16 +00:00
WSO2 Builder
6e26519c24 [WSO2 Release] [Jenkins #2982] [Release 4.0.65] prepare release v4.0.65 2017-08-30 06:07:01 +00:00
sameera910409
b275f5aead fixes https://github.com/wso2/product-iots/issues/364 2017-08-30 09:35:46 +05:30
WSO2 Builder
6492a9418c [WSO2 Release] [Jenkins #2979] [Release 4.0.64] prepare for next development iteration 2017-08-29 10:42:45 +00:00
WSO2 Builder
9d22721ef4 [WSO2 Release] [Jenkins #2979] [Release 4.0.64] prepare release v4.0.64 2017-08-29 10:42:31 +00:00
Harshan Liyanage
77daecefa3 Resolved wso2/product-iots#1221 2017-08-29 15:28:15 +05:30
WSO2 Builder
62451cab93 [WSO2 Release] [Jenkins #2977] [Release 4.0.63] prepare for next development iteration 2017-08-29 09:22:33 +00:00
WSO2 Builder
72b8da1795 [WSO2 Release] [Jenkins #2977] [Release 4.0.63] prepare release v4.0.63 2017-08-29 09:22:17 +00:00
Harshan Liyanage
d19349db49 Changed device enrolment message resolves wso2/product-iots#989 2017-08-29 14:19:31 +05:30
WSO2 Builder
b9d2e522c7 [WSO2 Release] [Jenkins #2975] [Release 4.0.62] prepare for next development iteration 2017-08-29 07:17:18 +00:00
WSO2 Builder
4df2c34b77 [WSO2 Release] [Jenkins #2975] [Release 4.0.62] prepare release v4.0.62 2017-08-29 07:17:03 +00:00
Harshan Liyanage
61362c16e6 This includes fixes for wso2/product-iots#1293 2017-08-29 12:03:05 +05:30
WSO2 Builder
a9992c6f69 [WSO2 Release] [Jenkins #2972] [Release 4.0.61] prepare for next development iteration 2017-08-28 08:56:56 +00:00
WSO2 Builder
47480f7afb [WSO2 Release] [Jenkins #2972] [Release 4.0.61] prepare release v4.0.61 2017-08-28 08:56:42 +00:00
Nirothipan
5049f17b6d androif file transfer feature 2017-08-28 13:33:10 +05:30
Nirothipan
95f25ad9cb changinh variable name more meaningful 2017-08-24 15:57:58 +05:30
Nirothipan
939a770c29 replacing with single imports 2017-08-24 15:57:32 +05:30
Nirothipan
a90658b5e7 code formatting 2017-08-24 15:47:54 +05:30
Nirothipan
8ce3b6a8c3 code formatting 2017-08-24 15:47:46 +05:30
Nirothipan
4234bcf482 addinf file transfer operation UI 2017-08-24 15:47:38 +05:30
Nirothipan
e15df60d52 addinf file transfer operation UI 2017-08-24 15:47:31 +05:30
Nirothipan
d1c4a1be12 addinf file transfer operation UI 2017-08-24 15:47:24 +05:30
Nirothipan
989248e711 adding file Name parameter 2017-08-24 15:47:14 +05:30
Nirothipan
9432e498e9 adding file Name parameter 2017-08-24 15:46:58 +05:30
Nirothipan
ac834fbe59 adding file Name parameter 2017-08-24 15:46:49 +05:30
Nirothipan
56384bcc53 modifying form parameters 2017-08-24 15:46:37 +05:30
Nirothipan
7ed6552a57 adding form parameters 2017-08-24 15:46:18 +05:30
Nirothipan
704f511964 Adding initial file transfer feature 2017-08-24 15:44:19 +05:30
WSO2 Builder
c528714936 [WSO2 Release] [Jenkins #2966] [Release 4.0.60] prepare for next development iteration 2017-08-24 10:05:06 +00:00
WSO2 Builder
83ed42c5cc [WSO2 Release] [Jenkins #2966] [Release 4.0.60] prepare release v4.0.60 2017-08-24 10:04:52 +00:00
WSO2 Builder
f9243f87b6 [WSO2 Release] [Jenkins #2963] [Release 4.0.59] prepare for next development iteration 2017-08-23 12:13:02 +00:00