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 |
|
WSO2 Builder
|
d455b13e62
|
[maven-release-plugin] prepare release v2.2.3
|
2016-10-18 15:33:59 +00:00 |
|
kamidu
|
22ec7aa695
|
Fixes for the ui isuess in EMM 2.2.0-beta
|
2016-10-05 12:25:37 +05:30 |
|
hasuniea
|
2ad390b877
|
removing duplicate event related classes
|
2016-09-30 13:40:17 +05:30 |
|
Chatura Dilan Perera
|
0b66649841
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-29 21:47:43 +05:30 |
|
Chatura Dilan Perera
|
362003c9ab
|
[maven-release-plugin] prepare release v2.2.2
|
2016-09-29 21:47:34 +05:30 |
|
harshanl
|
fd82cfcddd
|
Added new agent with policy fix
|
2016-09-29 18:51:31 +05:30 |
|
Rasika Perera
|
9d92b71bab
|
Merge pull request #1 from warunalakshitha/master
Upgrade iot product to latest carbon versions
|
2016-09-29 11:24:25 +05:30 |
|
charitha
|
975fb078b5
|
(cherry picked from commit d68c4c8)
|
2016-09-27 15:24:18 +05:30 |
|
charitha
|
9886e2e75f
|
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3
# Conflicts:
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java
(cherry picked from commit 257d6cd)
|
2016-09-26 18:01:46 +05:30 |
|
charitha
|
ba2acb5e75
|
Refactor code
(cherry picked from commit 01f2a91)
|
2016-09-26 18:01:12 +05:30 |
|
Rasika Perera
|
17dd96aa10
|
Returning correct representation of the device to template.
|
2016-09-26 17:15:12 +05:30 |
|
Rasika Perera
|
52dfcecb62
|
Updating devicemgt_admin into /api/device-mgt/v1.0.
|
2016-09-26 15:58:00 +05:30 |
|
Ace
|
0cb99be949
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
|
2016-09-22 19:09:26 +05:30 |
|
harshanl
|
212dcae8e7
|
Added scheduled time to App-install operation
|
2016-09-22 18:26:13 +05:30 |
|
dilanua
|
215093b9a8
|
Updating android operation failure notification message format
|
2016-09-22 13:00:31 +05:30 |
|
Chatura Dilan Perera
|
7174945f21
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-21 13:51:44 +05:30 |
|
Chatura Dilan Perera
|
ae99d189e7
|
Fixed logcat and events get APIs
|
2016-09-21 13:51:29 +05:30 |
|
dilanua
|
b99529d9d0
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1588
|
2016-09-21 11:21:35 +05:30 |
|
dilanua
|
ab14f9516c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-09-20 19:04:36 +05:30 |
|
dilanua
|
13d784009c
|
Updating android operation failure notification message
|
2016-09-20 19:04:15 +05:30 |
|
Ace
|
6c3ba5e688
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
|
2016-09-20 18:02:42 +05:30 |
|
Chatura Dilan Perera
|
bf72d212f7
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-19 19:53:27 +05:30 |
|
Chatura Dilan Perera
|
18780e5274
|
[maven-release-plugin] prepare release v2.2.1
|
2016-09-19 19:52:58 +05:30 |
|
dilanua
|
4a78cd6ece
|
Updating android permissions
|
2016-09-19 14:09:39 +05:30 |
|
Ace
|
a05dad6f4d
|
Merging with master
|
2016-09-19 12:22:11 +05:30 |
|
dilanua
|
19b6a334ad
|
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
|
2016-09-18 07:34:44 +05:30 |
|
dilanua
|
8d338a584b
|
Changing permissions - /devices/owning to /devices/owning-device
|
2016-09-17 17:23:21 +05:30 |
|
Ace
|
2a0b500935
|
Updating to latest appm/apim/identity dependencies
|
2016-09-14 17:23:33 +05:30 |
|
charitha
|
4cdf98b1db
|
Update agent apk to latest
|
2016-09-13 17:24:57 +05:30 |
|
Chatura Dilan Perera
|
89621ddfcb
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-09 21:48:18 +05:30 |
|
Chatura Dilan Perera
|
28898a85e9
|
[maven-release-plugin] prepare release v2.2.0
|
2016-09-09 21:48:05 +05:30 |
|
kamidu
|
05f540abf1
|
permission modifications
|
2016-09-09 17:48:26 +05:30 |
|
mharindu
|
cbae4e207d
|
Implemented permission based authorization
|
2016-09-09 03:00:11 +05:30 |
|
charitha
|
bfba008218
|
Removed url from application uninstall
(cherry picked from commit 45a582e)
|
2016-09-08 10:21:44 +05:30 |
|
charitha
|
07c7f2b6ff
|
Add validation to APK type
(cherry picked from commit 9da85ad)
|
2016-09-07 08:11:50 +05:30 |
|
harshanl
|
479deb8a49
|
Added logic to switch between GCM & LOCAL notification provider in Android
|
2016-09-05 17:46:08 +05:30 |
|
harshanl
|
814dcf9c8f
|
Refactored Android APIs
|
2016-09-05 11:57:03 +05:30 |
|
charitha
|
2974447362
|
Add validation to APK download url
|
2016-08-31 20:35:11 +05:30 |
|
inoshperera
|
532f66ebc5
|
fixing the operations not getting applied to multiple devices 80, 73
|
2016-08-25 14:20:44 +05:30 |
|
dilanua
|
fb30118aa2
|
Adding supported feature: DEVICE_UNLOCK entry to db
|
2016-08-22 16:30:32 +05:30 |
|
hasuniea
|
3a25572fda
|
fixing EMM-1509 issue
|
2016-08-22 10:51:35 +05:30 |
|
hasuniea
|
d5297cf36e
|
fixing empty device enrollment body exception
|
2016-08-19 19:40:23 +05:30 |
|
Chatura Dilan Perera
|
ca2e631076
|
Fix conflicts
|
2016-08-19 15:25:51 +05:30 |
|
Chatura Dilan Perera
|
7ff9204646
|
[maven-release-plugin] prepare for next development iteration
|
2016-08-18 22:52:56 +05:30 |
|
Chatura Dilan Perera
|
5e43c5bef9
|
[maven-release-plugin] prepare release v2.1.2
|
2016-08-18 22:52:47 +05:30 |
|
harshanl
|
d0512f93b7
|
Fixed EMM-1282
|
2016-08-18 11:06:43 +05:30 |
|
hasuniea
|
5e2a42d798
|
fixing app-install issue
|
2016-08-17 15:31:18 +05:30 |
|
hasuniea
|
0504f34e22
|
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3
|
2016-08-15 21:03:26 +05:30 |
|
mharindu
|
caf73209b9
|
Removed unrelevant changes
|
2016-08-15 15:58:58 +05:30 |
|
mharindu
|
695fdc1cad
|
Fixed confusing error messages issue
|
2016-08-15 15:54:04 +05:30 |
|
mharindu
|
150f569d05
|
Fixed json parsing issue in android agent
|
2016-08-15 15:48:31 +05:30 |
|
hasuniea
|
8a9114dd88
|
removing vpn validatiion property
|
2016-08-15 12:36:32 +05:30 |
|
hasuniea
|
72dd424c09
|
fixing jira issue related blacklisted application
|
2016-08-15 12:33:04 +05:30 |
|
hasuniea
|
71e64ae672
|
fixing put configuration
|
2016-08-15 12:32:19 +05:30 |
|
ayyoob
|
9978452cca
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com
|
2016-08-13 10:50:06 +05:30 |
|
hasuniea
|
33bcfc62c5
|
removing vpn validatiion property
|
2016-08-12 16:30:34 +05:30 |
|
hasuniea
|
22ec736841
|
fixing log throwing issue for internal server error(500)
|
2016-08-12 16:14:40 +05:30 |
|
hasuniea
|
66813f7d40
|
fixing jira issue related blacklisted application
|
2016-08-12 16:01:49 +05:30 |
|
ayyoob
|
2555a91b4d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com
|
2016-08-12 14:01:09 +05:30 |
|
hasuniea
|
13e317e201
|
resolving android get config issue
|
2016-08-12 12:24:38 +05:30 |
|
ayyoob
|
38b9f017c3
|
merged with origin
|
2016-08-12 10:55:25 +05:30 |
|
ayyoob
|
d72297f214
|
resolved UI issues
|
2016-08-11 23:41:19 +05:30 |
|
Ace
|
0ee28c91d2
|
Adding date validations when updating device enrollment
|
2016-08-10 14:26:39 +05:30 |
|
Ruwan
|
c32d9e3125
|
Bug fix
Adding bug fix
|
2016-08-10 12:59:29 +05:30 |
|
Ace
|
d997654011
|
Adding date validations when updating device enrollment
|
2016-08-10 12:47:02 +05:30 |
|
mharindu
|
352574d2fe
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-08-08 19:29:36 +05:30 |
|
mharindu
|
9b43f83520
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-08-08 18:49:49 +05:30 |
|
mharindu
|
6e8f3f5db2
|
Modified scopes
|
2016-08-08 18:25:00 +05:30 |
|
hasuniea
|
1078b8b686
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-08-08 18:06:22 +05:30 |
|
hasuniea
|
4562b4d318
|
adding security fixes
|
2016-08-08 18:06:14 +05:30 |
|
mharindu
|
ece7cb04ab
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-08-08 10:40:45 +05:30 |
|
charitha
|
8aa4f8b526
|
Add missing BadRequestException to global exception wrapper
|
2016-08-05 21:48:28 +05:30 |
|
Chatura Dilan Perera
|
defa494626
|
changed date format to ISO 8601
|
2016-08-05 09:06:13 +05:30 |
|
mharindu
|
0cf85c986a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-08-04 17:50:13 +05:30 |
|
mharindu
|
8ddee3b217
|
Refactored scopes
|
2016-08-04 17:47:26 +05:30 |
|
Chatura Dilan Perera
|
fedd717561
|
Added validations to firmware upgrade date
|
2016-08-04 16:53:17 +05:30 |
|
Chatura Dilan Perera
|
4dfa9ed732
|
Added validations to firmware upgrade date
|
2016-08-04 16:51:59 +05:30 |
|
ayyoob
|
d70c576ff0
|
refactored android configuration
|
2016-08-03 17:23:09 +05:30 |
|
mharindu
|
5f917e51f1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-08-03 12:53:36 +05:30 |
|
kamidu
|
8d151120df
|
enabling policy wizard for android
|
2016-08-02 18:50:23 +05:30 |
|
kamidu
|
1f247e7faf
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-08-02 18:26:51 +05:30 |
|
inoshperera
|
a09defebfe
|
Merge pull request #312 from charithag/master
Removed invalid property insertion.
|
2016-08-02 15:52:37 +05:30 |
|
charitha
|
d186a48ed8
|
Removed invalid property insertion.
|
2016-08-02 15:47:46 +05:30 |
|
kamidu
|
bbbaac4d28
|
Fix for the 'Requested resource /app/conf/reader/main.js cannot be found' exception on startup
|
2016-08-02 15:43:44 +05:30 |
|
mharindu
|
a254d9efc4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-08-02 14:57:29 +05:30 |
|
mharindu
|
34ce9108a2
|
Added configuration modifcation permission
|
2016-08-02 14:57:00 +05:30 |
|
dilanua
|
42cfd92575
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2016-08-02 14:04:13 +05:30 |
|
dilanua
|
6fe83cd0ac
|
Updating path changes to business-controllers
|
2016-08-02 14:03:50 +05:30 |
|
mharindu
|
57fb75a04b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-08-02 11:03:33 +05:30 |
|
hasuniea
|
a8102b8c42
|
fixing VERIFONEEMMPROF-26
|
2016-08-01 14:28:52 +05:30 |
|
mharindu
|
2b3dfa0ce2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-07-29 12:40:50 +05:30 |
|
Chatura Dilan
|
338d804dba
|
Added validations for invalid device Ids
|
2016-07-28 15:25:29 +05:30 |
|
mharindu
|
be73e9a659
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-07-26 14:16:09 +05:30 |
|
hasuniea
|
e4bfb6b6ef
|
fixing deviceIdentifier validation issue
|
2016-07-26 09:47:37 +05:30 |
|
dilanua
|
01e32c86c8
|
Updating base ui app config reader
|
2016-07-25 05:54:32 +05:30 |
|
mharindu
|
965402a7ac
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-07-18 20:18:55 +05:30 |
|
mharindu
|
302f71b6d1
|
Fixed webapp name resolving issue and changed API context
|
2016-07-18 20:17:31 +05:30 |
|
Milan Perera
|
c1cc6f08d9
|
Removed device name regex pattern from bean validation
|
2016-07-15 19:55:40 +05:30 |
|
mharindu
|
1b006bc155
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
|
2016-07-13 11:05:56 +05:30 |
|
Chatura Dilan
|
b9bc076036
|
Fixed issues in android permisson.xml
|
2016-07-12 15:14:18 +05:30 |
|
hasuniea
|
672d90472b
|
adding validation
|
2016-07-12 12:48:09 +05:30 |
|
hasuniea
|
3836d393fa
|
removing Device type from AndroidDevice bean
|
2016-07-12 11:58:23 +05:30 |
|
mharindu
|
6b939714d8
|
Changed context paths
|
2016-07-12 01:32:15 +05:30 |
|
mharindu
|
2563098948
|
Fixed conflicts and merged
|
2016-07-11 22:12:54 +05:30 |
|