Commit Graph

473 Commits (5a6a736c220e765e6b9544d6e72caa72cc0d6484)

Author SHA1 Message Date
Milan Perera 77d1e684f6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
Rasika Perera 81c62b3a13 Merge pull request #501 from ayyoob/release-3.0.x
8 years ago
inoshperera 7da5ae239b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
8 years ago
inoshperera 22a58121d2 changing the Andrid API tag to standerdise
8 years ago
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 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
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
charitha a4841d87ba Add custom email template for android
8 years ago
charitha 0c2465d03e Add enrollment invitations API EP for android
8 years ago
Ace 488c2abafa removing slf4j from packing in the android devicemgt jaxrs
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
Harshan Liyanage 559fa3fe38 Resolved conflicts
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
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
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
Harshan Liyanage 242253b8f2 Merge pull request #391 from shavidissa/master
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
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
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
8 years ago
charitha ba2acb5e75 Refactor code
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
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
8 years ago
charitha 07c7f2b6ff Add validation to APK type
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
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
Ace 0ee28c91d2 Adding date validations when updating device enrollment
8 years ago
Ruwan c32d9e3125 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
8 years ago
mharindu 9b43f83520 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
mharindu 6e8f3f5db2 Modified scopes
8 years ago
hasuniea 1078b8b686 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
hasuniea 4562b4d318 adding security fixes
8 years ago
mharindu ece7cb04ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
charitha 8aa4f8b526 Add missing BadRequestException to global exception wrapper
8 years ago
Chatura Dilan Perera defa494626 changed date format to ISO 8601
8 years ago
mharindu 0cf85c986a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
mharindu 8ddee3b217 Refactored scopes
8 years ago
Chatura Dilan Perera 4dfa9ed732 Added validations to firmware upgrade date
8 years ago
ayyoob d70c576ff0 refactored android configuration
8 years ago
mharindu 5f917e51f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
inoshperera a09defebfe Merge pull request #312 from charithag/master
8 years ago
charitha d186a48ed8 Removed invalid property insertion.
8 years ago
mharindu a254d9efc4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
mharindu 34ce9108a2 Added configuration modifcation permission
8 years ago
mharindu 57fb75a04b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
hasuniea a8102b8c42 fixing VERIFONEEMMPROF-26
8 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
mharindu be73e9a659 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
hasuniea e4bfb6b6ef fixing deviceIdentifier validation issue
9 years ago
mharindu 965402a7ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
mharindu 302f71b6d1 Fixed webapp name resolving issue and changed API context
9 years ago
Milan Perera c1cc6f08d9 Removed device name regex pattern from bean validation
9 years ago
mharindu 1b006bc155 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
Chatura Dilan b9bc076036 Fixed issues in android permisson.xml
9 years ago
hasuniea 672d90472b adding validation
9 years ago
hasuniea 3836d393fa removing Device type from AndroidDevice bean
9 years ago
mharindu 6b939714d8 Changed context paths
9 years ago
mharindu 2563098948 Fixed conflicts and merged
9 years ago
hasuniea ad8bbf8863 removing notnull constraint from android device type
9 years ago
hasuniea e84a868069 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
hasuniea 53063284d0 fixing validation issue
9 years ago
Chatura Dilan 0818ae6860 [maven-release-plugin] prepare for next development iteration
9 years ago
Chatura Dilan 62c16e07ce [maven-release-plugin] prepare release v2.1.1
9 years ago
madhawap 3851be8742 fix to permissions.xml
9 years ago
hasuniea b30aadc438 fix code conflicts
9 years ago
hasuniea 4ccf018bb3 adding validations
9 years ago
mharindu ba4065265d Refactored permission.xml of android webapp
9 years ago
Kasun Delgolla 79b1d51643 Committing VPN operation fixes + logcat operation
9 years ago
mharindu 48613018ab Fixed issues in scope based autorization implementation
9 years ago
mharindu f675468e44 Added scopes to APIS
9 years ago
Chatura Dilan bedb171eb7 Added OS build date
9 years ago
Chatura Dilan f58abbe0db Added is_active field
9 years ago
prabathabey 1205d26463 Merging rest-api-improvements branch with master
9 years ago
Chatura Dilan 6a702adaa3 Change emm_admin to admin
9 years ago
Chatura Dilan 529c828b81 Fixed paths in Android related permissions.xml
9 years ago
inoshperera bb0ea53909 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
inoshperera c45400afd0 fixing error messages not thrown properly.
9 years ago
Kasun Delgolla ef281e1524 Fixing operation response ERROR state exception
9 years ago
inoshperera 90747a5579 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
inoshperera 486e2f48ed adding validation
9 years ago
dilanua c9a07df91a Fixing wrong device id shown for OTA-UPGRADE operation
9 years ago
dilanua 741bb0ac16 Updating Responces in pending-operations api
9 years ago
dilanua bcba6216c0 Update UpgradeFirmware operation with server properties
9 years ago
dilanua 9ac7ffe828 Update UpgradeFirmware operation with server properties
9 years ago
mharindu 4a8ab39dec Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Ace 6425d6ab1a Adding null check for operations response
9 years ago
mharindu 9237fed74e Added notification title
9 years ago
prabathabey 55aa1c8113 Fixing compilation issues
9 years ago
mharindu 62a116ba71 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
mharindu c5d1eaa21b Fixed issue in location service
9 years ago
hasuniea 2b89b692a4 adding event configuration refference
9 years ago
hasuniea c170373ace fix responce code
9 years ago
hasuniea ec91b0a539 fixing eventReceiver
9 years ago
hasuniea 198b3c67dc add entry in permission xml
9 years ago
hasuniea 0bcbab7071 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Chatura Dilan d3a0fc3f12 Added install application permissions
9 years ago
hasuniea daee6109cc fixing code issues
9 years ago
Chatura Dilan 7c59e391de Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Chatura Dilan ba1f3bbbcc fixed issue in unlock devices permissions
9 years ago
hasuniea 786c6859bd Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
hasuniea d01e176933 add eventreceiver fix
9 years ago
prabathabey 640cf95528 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
prabathabey d7b4b83424 Fixing path of license resource
9 years ago
mharindu 56a2ca0aa0 Added missing HTTP method attribute in permissions.xml in android webapp
9 years ago
Chatura Dilan 9086a130c4 Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Chatura Dilan 3fd56b56c4 Fix cxf servelt issues
9 years ago
prabathabey 212c11750c Added http schem supported by the API
9 years ago
inoshperera 763854ef9a Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
ayyoob 61d88f77b6 removed device Id from notification bean
9 years ago
inoshperera 6d14133bab fixing the mismatch of swagger annotation and implementation
9 years ago
Chatura Dilan bf1e00f472 Fixed the host name of Android API
9 years ago
prabathabey 18257b8729 Changing the name of the android API webapp
9 years ago
prabathabey 63bb616e9c Improving swagger annotations
9 years ago
prabathabey 631d57e70d Improving swagger annotations
9 years ago
Kasun Delgolla a01fe5e4f9 Adding missing parameters
9 years ago
prabathabey 44aa3a93a9 Adding more improvements to swagger annotations
9 years ago
inoshperera 9f8ca3ea9a Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
inoshperera 4dbf1bdc2f adding swagger annotation and making APIs standerdize
9 years ago
Chatura Dilan b8cfcf4413 Fixed Enrollment issue
9 years ago
Chatura Dilan 91003fdee1 Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
Chatura Dilan d25e1b2421 Fixed Android APIs
9 years ago
inoshperera f346c7c528 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements
9 years ago
prabathabey 479acf3b45 Improving swagger annotations of device management admin API
9 years ago
hasuniea d7527e95f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
prabathabey ba9d85b065 Adding swagger related dependencies to android agent webapp
9 years ago
inoshperera aa4a4889a5 adding API header
9 years ago
prabathabey 9a01df5d55 Renaming android agent webapp
9 years ago
prabathabey 23343eb765 Fixing the name of android agent webapp
9 years ago
prabathabey 8f3a2eec5d Merging the latest changes introduced to master
9 years ago
prabathabey 6f7f706428 Renaming TenantConfiguration as PlatformCongfiguration
9 years ago
prabathabey fd1d62454a Improving Android JAX-RS API definitions
9 years ago
hasuniea ab70703da8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
hasuniea 2eb5aebb60 fixed code issues in EventService
9 years ago
geethkokila 57a9834145 Changing apis to return activity when an operation is added
9 years ago
Kasun Delgolla 4f33789d38 Committing MDM android APIs responses standardization
9 years ago
Hasunie df6f420d6e Merge pull request #279 from hasuniea/master
9 years ago
hasuniea 4757ac797c fixed code issues
9 years ago
ayyoob dc32a8f8d3 Merge branch 'release-2.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into transport
9 years ago
mharindu f3730c64ae [maven-release-plugin] prepare for next development iteration
9 years ago
mharindu 7a982093a1 [maven-release-plugin] prepare release v2.1.0
9 years ago
mharindu be4078cf38 [maven-release-plugin] rollback the release of v2.1.0
9 years ago
mharindu a2d2f26123 [maven-release-plugin] prepare for next development iteration
9 years ago
mharindu 3af112898d [maven-release-plugin] prepare release v2.1.0
9 years ago
hasuniea a48529be59 fix code conflicts
9 years ago
hasuniea 5c29ac8c4f fix code conflicts
9 years ago
hasuniea a7665033b4 refactored events
9 years ago
prabathabey 5b0748489d Improving virtual fire alarm plugin to use newly introduced push notification framework
9 years ago
hasuniea 8eb53927a6 add swagger annotations to windows plugin
9 years ago
inosh-perera bf7975c5d4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
dilanua bc1dfb86f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
dilanua 2dabfa02fa Adding swagger annotations
9 years ago
inosh-perera 0787aa2ac1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
inosh-perera afc7be590e adding swagger annotations for Android APIs
9 years ago
Madhawa Perera f25cb51679 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Madhawa Perera 0d8010c25a Adding swagger annotations to beans
9 years ago
dilanua f66aad9e0e Adding swagger annotations
9 years ago
hasuniea 3cdb490908 added swagger annotations
9 years ago
charithag f74a8ddf0d Add device type plugins and features related to emm with IoTS base feature.
9 years ago