Commit Graph

964 Commits (4ebce9687deeb3a3376c1b6a6f247fb3528b63ad)

Author SHA1 Message Date
dilanua bd5ef4158b Adding emm policy edit UI
8 years ago
dilanua 935b429198 Adding emm policy view UI
8 years ago
dilanua aada09de10 Adding policy create UI updates
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
hasuniea 9cde2d815a refactoring windowsapi
8 years ago
Rasika Perera 5ea262947b Added emm specific policy creation unit extending cdmf.unit.policy.create
8 years ago
Rasika Perera 4c11157d4e Enrollment url by default same VM
8 years ago
mharindu d253dd4552 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
mharindu 141a7d0959 Added scopes to the config.json
8 years ago
hasuniea a62544c68b refactoring windowsapi
8 years ago
Ace a37d5dbfd9 Fixing user,device,role listing pages
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
inoshperera 0197ea964f Merge pull request #313 from charithag/master
8 years ago
mharindu ece7cb04ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
dilanua a71537b7bb Updating emm app name
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 fedd717561 Added validations to firmware upgrade date
8 years ago
Chatura Dilan Perera 4dfa9ed732 Added validations to firmware upgrade date
8 years ago
hasuniea 16e306268f fixing javax cache issue
8 years ago
hasuniea 86056df434 fixing windows plugin relalted slf4j issue
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
Rasika Perera 97eac5064e Fixed Requested resource /app/conf/reader/main.js not found
8 years ago
kamidu 8d151120df enabling policy wizard for android
8 years ago
kamidu 1f247e7faf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
inoshperera a09defebfe Merge pull request #312 from charithag/master
8 years ago
Rasika Perera 3d25102d30 Adding enrollment url into view model
8 years ago
charitha d186a48ed8 Removed invalid property insertion.
8 years ago
kamidu bbbaac4d28 Fix for the 'Requested resource /app/conf/reader/main.js cannot be found' exception on startup
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
kamidu e0d9e1659c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
dilanua 42cfd92575 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
dilanua 6fe83cd0ac Updating path changes to business-controllers
8 years ago
mharindu 57fb75a04b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
kamidu ea89c6685e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
kamidu 6db9fc426e Fix the addd buttton 404 issue
9 years ago
hasuniea a8102b8c42 fixing VERIFONEEMMPROF-26
9 years ago
mharindu 576bfb8236 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
dilanua 18a9ad4b8a Updating EMM UI conf.json
9 years ago
kamidu a38d38a86e Addting new nav bar without group management ui
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 1fa5bdba44 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins
9 years ago
Chatura Dilan 338d804dba Added validations for invalid device Ids
9 years ago
Ace 77bdbb5a57 Fixing QR code issue
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
dilanua 01e32c86c8 Updating base ui app config reader
9 years ago
dilanua 0ef0a06d10 Updating emm config.json
9 years ago
mharindu d2f02d128c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
dilanua f85dcc3f25 Updating emm config.json
9 years ago
Ace c004824b81 removing console.log
9 years ago
mharindu 98d291fcd0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
9 years ago
Ace 24624131a7 Adding EMM dashboard to mobile base UI
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
Ace bff34e5030 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Ace d802570be9 Adding app.conf for mobile base plugin
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 eb025c42f7 Fixing issues encountered while deploying the agent webapp of windows
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
Kasun Delgolla bd65e8b2a7 Committing missing android features
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
hasuniea cc8190b541 add windows feature
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
hasuniea d4bce21f75 windows plugin
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 8620eb912f Removing redundant implementations of android and windows plugins
9 years ago
prabathabey 8f3a2eec5d Merging the latest changes introduced to master
9 years ago
prabathabey 98a8a09813 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
prabathabey 6f7f706428 Renaming TenantConfiguration as PlatformCongfiguration
9 years ago
Rasika Perera 07984e4b6e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Rasika Perera 91cc0baaf5 Moved CSS into separate file
9 years ago
Rasika Perera 0862e95f4c Moved CSS into separate file
9 years ago
prabathabey fd1d62454a Improving Android JAX-RS API definitions
9 years ago
Kasun Delgolla 86327ab870 Committing android service improvements + integration
9 years ago
prabathabey 03a21752e2 Adding maven-compiler-plugin to the build profile
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
Ruwan 9e8e479d63 Merge pull request #281 from rasika90/master
9 years ago
geethkokila 57a9834145 Changing apis to return activity when an operation is added
9 years ago
Rasika Perera f0b5ad32c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Rasika Perera c49e19a3c6 Adding licence headers for handlebar templates
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
charitha b081f02594 Bug fixes
9 years ago
hasuniea 8eb53927a6 add swagger annotations to windows plugin
9 years ago
charitha eb57d38507 Fix for https://wso2.org/jira/browse/IOTS-152
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
Kasun Delgolla 34d4da7e66 Merge pull request #250 from charithag/master
9 years ago
hasuniea 3cdb490908 added swagger annotations
9 years ago
charitha ffcbea8421 Fixed https://wso2.org/jira/browse/IOTS-104
9 years ago
hasuniea 5846f693e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
ayyoob 6f000cbc64 refactoring version tags
9 years ago
hasuniea 81471f3a49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
gayank 893c535fb3 Android feature for Updating an application
9 years ago
hasuniea 0e8c8c7eb6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
prabathabey cfbc36ff2d Making the plug-in implementations compatible with the changes introduced to DeviceManagementService SPI
9 years ago
prabathabey ac407a6a1a Removing obsolete dependencies to ApplicationManagert interface from plug-in specific device management service implementations
9 years ago
hasuniea 05d252e61d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Kasun Delgolla a6a0fc2a57 Adding VPN feature for android
9 years ago
charithag 7fb167b7fa Moved devicemgt_admin jax-rs to carbon-device-mgt
9 years ago
hasuniea 339deef5c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
charithag 6daa5c43c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
charithag 29486fedd5 Refactoring admin jax-rs to comply with restructured cdm
9 years ago
mharindu 918302475b Fixed incorrect location coordinate issue (EMM-1313)
9 years ago
hasuniea b41cac80db Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
mharindu 2548a1dd18 Fix for EMM-1297
9 years ago
ayyoob c05191dac5 Added IoT plugins feature and refactored IoT base.
9 years ago
inosh-perera 657cf05ef5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
charithag 8c6690a597 Update MDM admin content from product-emm
9 years ago
charithag 6e981fb2c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
charithag f74a8ddf0d Add device type plugins and features related to emm with IoTS base feature.
9 years ago
charithag f6d04fba4b Fix module locations
9 years ago
prabathabey 39d2ce12dc merging resturctured iot and mobile plugins
9 years ago