Milan Perera
86aac810ce
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Milan Perera
d2d912fb6d
Refactored scopes strings
8 years ago
ayyoob
f603f58fd1
moved compliance payload generation code to api impl
8 years ago
Maninda
0c7f1adcba
Fixed some issues reported with FindBugs while security plugin is enabled.
8 years ago
ayyoob
54011d2197
removed provider tenant domain and user from the web.xml
8 years ago
ayyoob
55d200514b
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
ayyoob
3fa679a3e9
made policy manager to be part of device type mgt service
8 years ago
Madawa Soysa
1b56ebb831
Improving scope annotations in android plugin
8 years ago
Rasika Perera
f3588c7951
config.json [usernameLength] moved to [userValidationConfig][usernameLength]
8 years ago
Rasika Perera
838223c67a
Removed unneccesary configs
8 years ago
WSO2 Builder
227d4685c9
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
6c38ce6385
[maven-release-plugin] prepare release v3.0.4
8 years ago
Ace
c302d7b25a
Coorecting version import ranges
8 years ago
Ruwan
dd9e04e75d
Merge pull request #493 from charithag/release-3.0.x-email-invites
...
Release 3.0.x email invites
8 years ago
charitha
a4841d87ba
Add custom email template for android
8 years ago
Rasika Perera
5465cea76d
Fixing QR modal unit not found issue
8 years ago
Ace
34c4d00d4f
Bumping identity dependencies
8 years ago
Ace
8ac0971a24
Updating identity dependencies to latest
8 years ago
Geeth
b8472666ad
Merge pull request #488 from Supun94/release-3.0.x
...
Support for Device Management Policy Merging
8 years ago
Rasika Perera
27e066e92a
IOTS-336: Fixing android and windows mobile agents title
8 years ago
charitha
0c2465d03e
Add enrollment invitations API EP for android
8 years ago
charitha
2211ad2a59
Update device type detail pages and moved QR modal to device mgt core
8 years ago
Ace
488c2abafa
removing slf4j from packing in the android devicemgt jaxrs
8 years ago
Imesh Chandrasiri
48461af2c3
Adding email sender changes
8 years ago
Imesh Chandrasiri
6464fcb615
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Supun94
57f0ea7ce4
Changing policy compliance view
8 years ago
Imesh Chandrasiri
da4eb14144
Device view changes for email invite and agent download
8 years ago
Rasika Perera
a08e58a574
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Imesh Chandrasiri
fe195ca8f7
UI Fixes
8 years ago
Megala
0b1acaa990
Updating the agent apk file
8 years ago
Megala
ec5936d013
Updating the apk file to switch between event enabling and disabling
8 years ago
Rasika Perera
b5e220799a
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
WSO2 Builder
a398686ec7
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
3bafccc303
[maven-release-plugin] prepare release v3.0.3
8 years ago
Chatura Dilan
49d81766f6
fixed conflicts
8 years ago
Chatura Dilan
e22d4d3530
Fixed UI issues in the policy screen
8 years ago
charitha
5d7fd0d66d
Merge branch 'harshanL-master' of https://github.com/harshanL/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Harshan Liyanage
ce5d907801
Added operation bar.json
8 years ago
Harshan Liyanage
26bbb55af5
Resolved conflicts with release-3.0.x
8 years ago
madhawap
6618b919d1
Adding separate tasks to carry out device monitoring for each device type
8 years ago
Harshan Liyanage
559fa3fe38
Resolved conflicts
8 years ago
Madawa Soysa
548213d601
Fixing issue with COSU policy configuration
8 years ago
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.
8 years ago
Rasika Perera
c722dfa779
Adding ui permissions to the operations on android
8 years ago
sinthuja
f23fd9c85f
Merge branch 'android-sense-agent-fixes' into release-3.0.x
8 years ago
Megala
6e23d498b8
Fixing the parent path problem
8 years ago
Charitha Goonetilleke
7fa0a4b11f
Merge pull request #454 from madawas/IOTS-296
...
IOTS-296: Genaralizing policy view UI for windows and android
8 years ago
charitha
5fc3e82d35
Fix agent download issue
8 years ago
Megala
5a3809b493
Fixing the version problem
8 years ago
Megala
4bfd9a72b6
Adding siddhi extension and analytics for android-agent
8 years ago
Ace
3d21f84a76
merging with upstream
8 years ago
Ace
3dd59ed250
Adding changes to descriptor and ui changes
8 years ago
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.
8 years ago
Imesh Chandrasiri
ba0eea6344
Fixing text overlapping and UX issues in device pages
8 years ago
Imesh Chandrasiri
b55c64d551
Layout changes for device enrollment views
8 years ago
Ace
749f680dad
Adding missed configurations
8 years ago
Ace
8a96aa204c
Adding generalizations to android-operations bar
8 years ago
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.
8 years ago
WSO2 Builder
619dab548e
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
4a0aa3be8e
[maven-release-plugin] prepare release v3.0.2
8 years ago
charitha
ee496d93fe
removed unnecessary logs
8 years ago
madhawap
d7c3f5c18a
refactored code
8 years ago
madhawap
d66292f933
refactored code
8 years ago
madhawap
429b52f037
resolve conflicts
8 years ago
madhawap
3249079965
Seperate out task operations
8 years ago
WSO2 Builder
4ae70fe1f1
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
42c2b04c62
[maven-release-plugin] prepare release v2.2.7
8 years ago
WSO2 Builder
ab087bf934
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
072dd089ef
[maven-release-plugin] prepare release v2.2.6
8 years ago
WSO2 Builder
bfa2c5fa61
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
09d434bda9
[maven-release-plugin] prepare release v3.0.1
8 years ago
Megala
6c9c4a15fd
Removing the sender id
8 years ago
Imesh Chandrasiri
bc075dedf0
Changes for IoT build
8 years ago
inoshperera
18c0760ba5
Changing gcm endpoint to fcm
8 years ago
inoshperera
3b867a533d
fixing http status code
8 years ago
inoshperera
d9a449dd26
adding modify enrollment capability to save chnages in enrollment such as GCM token update
8 years ago
GPrathap
3d971d2bb7
removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations
8 years ago
WSO2 Builder
61ca4c4900
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
4746bf0c74
[maven-release-plugin] prepare release v3.0.0
8 years ago
Ace
ae33d236fa
Adding android device-view changes
8 years ago
Ace
7e3df67548
Adding android-base-plugin
8 years ago
charitha
1170263139
Update component versions for IoTS-1.0.0 release
8 years ago
Ace
ea14e32337
Adding android-web-agent
8 years ago
Ace
3d32ad984c
Adding fixes to android qr-gen code
8 years ago
Ace
cea96cc841
Merging with master
8 years ago
Chatura Dilan
9e78b87365
Fixed issue in device operation bar
8 years ago
Chatura Dilan
d6701ee04c
Fixed issue in device view UI
8 years ago
Chatura Dilan
49dd83ed33
Adding CDMF operation bar to Android
8 years ago
Chatura Dilan
b207e5d624
Added missing units
8 years ago
Ace
7d14e23d00
merging with upstream
8 years ago
Ace
daf37338c6
merging changes with upstream
...
partial
8 years ago
Ace
e38941e81e
restructuring iot-plugins
...
removing mobile/iot base plugins and other restructuring
8 years ago
Chatura Dilan
3227f3f650
Chages to device view for Android
8 years ago
Chatura Dilan
269376a135
Changes to Android operation bar
8 years ago
Chatura Dilan
76887c4277
Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0
8 years ago
Chatura Dilan
1e3d8021e9
Adding Android and Windows operation bars
8 years ago
ayyoob
bd05fb721a
merged with origin IoTS-1.0.0
8 years ago
sinthuja
96e0ef92d7
Adding changes related to removing DAS components.
8 years ago
WSO2 Builder
c9861e9636
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
3e664dc304
[maven-release-plugin] prepare release v2.2.5
8 years ago
kamidu
a9308c3f22
removing the unnessary ' ' from hbs files
8 years ago
Rasika Perera
a40ce98698
Make analytics and groups view disable for mobile plugins
8 years ago
Harshan Liyanage
242253b8f2
Merge pull request #391 from shavidissa/master
...
Added swagger annotations and refined the messages
8 years ago
Shavindri
f6c0aeecfc
Added swagger annotations and refined the messages
8 years ago
Megala
e23ecc5b64
Fixing EMM-1779
8 years ago
WSO2 Builder
19e0d65db0
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
537a99d05d
[maven-release-plugin] prepare release v2.2.4
8 years ago
WSO2 Builder
b095196e65
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
d455b13e62
[maven-release-plugin] prepare release v2.2.3
8 years ago
kamidu
22ec7aa695
Fixes for the ui isuess in EMM 2.2.0-beta
8 years ago
hasuniea
2ad390b877
removing duplicate event related classes
8 years ago
Chatura Dilan Perera
0b66649841
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
362003c9ab
[maven-release-plugin] prepare release v2.2.2
8 years ago
harshanl
fd82cfcddd
Added new agent with policy fix
8 years ago
Rasika Perera
9d92b71bab
Merge pull request #1 from warunalakshitha/master
...
Upgrade iot product to latest carbon versions
8 years ago
charitha
975fb078b5
(cherry picked from commit d68c4c8)
8 years ago
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)
8 years ago
charitha
ba2acb5e75
Refactor code
...
(cherry picked from commit 01f2a91)
8 years ago
Rasika Perera
17dd96aa10
Returning correct representation of the device to template.
8 years ago
Rasika Perera
52dfcecb62
Updating devicemgt_admin into /api/device-mgt/v1.0.
8 years ago
Ace
0cb99be949
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
harshanl
212dcae8e7
Added scheduled time to App-install operation
8 years ago
dilanua
215093b9a8
Updating android operation failure notification message format
8 years ago
Chatura Dilan Perera
7174945f21
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
Chatura Dilan Perera
ae99d189e7
Fixed logcat and events get APIs
8 years ago
dilanua
b99529d9d0
Fixing JIRA: https://wso2.org/jira/browse/EMM-1588
8 years ago
dilanua
ab14f9516c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
dilanua
13d784009c
Updating android operation failure notification message
8 years ago
Ace
6c3ba5e688
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
Chatura Dilan Perera
bf72d212f7
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
18780e5274
[maven-release-plugin] prepare release v2.2.1
8 years ago
dilanua
4a78cd6ece
Updating android permissions
8 years ago
Ace
a05dad6f4d
Merging with master
8 years ago
dilanua
19b6a334ad
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
8 years ago
dilanua
8d338a584b
Changing permissions - /devices/owning to /devices/owning-device
8 years ago
Ace
2a0b500935
Updating to latest appm/apim/identity dependencies
8 years ago
charitha
4cdf98b1db
Update agent apk to latest
8 years ago
Chatura Dilan Perera
89621ddfcb
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
28898a85e9
[maven-release-plugin] prepare release v2.2.0
8 years ago
kamidu
05f540abf1
permission modifications
8 years ago
mharindu
cbae4e207d
Implemented permission based authorization
8 years ago
charitha
bfba008218
Removed url from application uninstall
...
(cherry picked from commit 45a582e)
8 years ago
charitha
07c7f2b6ff
Add validation to APK type
...
(cherry picked from commit 9da85ad)
8 years ago
harshanl
479deb8a49
Added logic to switch between GCM & LOCAL notification provider in Android
8 years ago
harshanl
814dcf9c8f
Refactored Android APIs
8 years ago
charitha
2974447362
Add validation to APK download url
8 years ago
inoshperera
532f66ebc5
fixing the operations not getting applied to multiple devices 80, 73
8 years ago
dilanua
fb30118aa2
Adding supported feature: DEVICE_UNLOCK entry to db
8 years ago
hasuniea
3a25572fda
fixing EMM-1509 issue
8 years ago
hasuniea
d5297cf36e
fixing empty device enrollment body exception
8 years ago
Chatura Dilan Perera
ca2e631076
Fix conflicts
8 years ago
Chatura Dilan Perera
7ff9204646
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
5e43c5bef9
[maven-release-plugin] prepare release v2.1.2
8 years ago
harshanl
d0512f93b7
Fixed EMM-1282
8 years ago
hasuniea
5e2a42d798
fixing app-install issue
8 years ago
hasuniea
0504f34e22
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3
8 years ago
mharindu
caf73209b9
Removed unrelevant changes
8 years ago
mharindu
695fdc1cad
Fixed confusing error messages issue
8 years ago
mharindu
150f569d05
Fixed json parsing issue in android agent
8 years ago
hasuniea
8a9114dd88
removing vpn validatiion property
8 years ago
hasuniea
72dd424c09
fixing jira issue related blacklisted application
8 years ago
hasuniea
71e64ae672
fixing put configuration
8 years ago
ayyoob
9978452cca
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com
8 years ago
hasuniea
33bcfc62c5
removing vpn validatiion property
8 years ago
hasuniea
22ec736841
fixing log throwing issue for internal server error(500)
8 years ago
hasuniea
66813f7d40
fixing jira issue related blacklisted application
8 years ago
ayyoob
2555a91b4d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com
8 years ago
hasuniea
13e317e201
resolving android get config issue
8 years ago
ayyoob
38b9f017c3
merged with origin
8 years ago
ayyoob
d72297f214
resolved UI issues
8 years ago
Ace
0ee28c91d2
Adding date validations when updating device enrollment
8 years ago
Ruwan
c32d9e3125
Bug fix
...
Adding bug fix
8 years ago
Ace
d997654011
Adding date validations when updating device enrollment
8 years ago
mharindu
352574d2fe
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
mharindu
9b43f83520
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
mharindu
6e8f3f5db2
Modified scopes
9 years ago
hasuniea
1078b8b686
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
hasuniea
4562b4d318
adding security fixes
9 years ago
mharindu
ece7cb04ab
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
charitha
8aa4f8b526
Add missing BadRequestException to global exception wrapper
9 years ago
Chatura Dilan Perera
defa494626
changed date format to ISO 8601
9 years ago
mharindu
0cf85c986a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
mharindu
8ddee3b217
Refactored scopes
9 years ago
Chatura Dilan Perera
fedd717561
Added validations to firmware upgrade date
9 years ago
Chatura Dilan Perera
4dfa9ed732
Added validations to firmware upgrade date
9 years ago
ayyoob
d70c576ff0
refactored android configuration
9 years ago
mharindu
5f917e51f1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
kamidu
8d151120df
enabling policy wizard for android
9 years ago
kamidu
1f247e7faf
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
inoshperera
a09defebfe
Merge pull request #312 from charithag/master
...
Removed invalid property insertion.
9 years ago
charitha
d186a48ed8
Removed invalid property insertion.
9 years ago
kamidu
bbbaac4d28
Fix for the 'Requested resource /app/conf/reader/main.js cannot be found' exception on startup
9 years ago
mharindu
a254d9efc4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
mharindu
34ce9108a2
Added configuration modifcation permission
9 years ago
dilanua
42cfd92575
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
dilanua
6fe83cd0ac
Updating path changes to business-controllers
9 years ago
mharindu
57fb75a04b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
hasuniea
a8102b8c42
fixing VERIFONEEMMPROF-26
9 years ago
mharindu
2b3dfa0ce2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
Chatura Dilan
338d804dba
Added validations for invalid device Ids
9 years ago