Commit Graph

969 Commits (252f2a06b64e0ad41f965abe8fe48c5e1bf505fd)

Author SHA1 Message Date
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 971185decf fixes for android sense client
9 years ago
Chatura Dilan e05906fed5 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins
9 years ago
Ruwan 1d12d8771d Merge pull request #306 from WarunaS/rapid_accelarations
9 years ago
Waruna Samarsinghe bc08e31c4c Android Sense iBeacon
9 years ago
Chatura Dilan f58abbe0db Added is_active field
9 years ago
Waruna Samarsinghe a8371e046e Scanning Beacon
9 years ago
Waruna Samarsinghe cd1cf2bf44 Beacon Scaning
9 years ago
Ruwan 8b6fe27cab Merge pull request #304 from ayyoob/transport
9 years ago
ayyoob 8a9ad21e74 few changes added to transport adapters after testing with the cluster
9 years ago
Waruna Samarsinghe 32c4a34283 Ranged iBeacons
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
ayyoob 6c24f44abc Added push notification support for device types
9 years ago
ayyoob 562ac197af added configurations for device types
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
Ruwan 208bf6a7ab Merge pull request #298 from WarunaS/rapid_accelarations
9 years ago
Waruna Samarsinghe f3f28c544f Fix Orientation Issue
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
Shabirmean 38c087ebc1 Added necessary changes to store CA_CERT and handle expired refresh-token scenario
9 years ago
Shabirmean f0206d7ed4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
ayyoob 28254e0da8 updated android sense
9 years ago
ayyoob 96638f88e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Ruwan a2c54eb91c Merge pull request #293 from WarunaS/rapid_accelarations
9 years ago
ayyoob d4b319c42a added weburl for https
9 years ago
GPrathap a3ff9fbdc5 adding sso configuration
9 years ago
Waruna Samarsinghe d44170e52e rapid acceleration and turns- android sense
9 years ago
Waruna Samarsinghe fec14a8509 rapid acceleration and turns- resolved
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
Shabirmean dca55d692c Changes following the hashCode of the deviceId being used as the certificate alias
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
Shabirmean fa454388ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Shabirmean a117ae37c7 Modifications to the Token Refresh Flow & the Enrolment flow in the VFAlarm
9 years ago
Anushka Samaranayake 1265a1dd34 Alert generation
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 4dbf699b66 Fixing issues in android sense plugin which were caused by refactoring done in cdm-f
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
Milan Perera 23c404260e Merge pull request #283 from ayyoob/transport
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
ayyoob 6f6b5104d5 fixed https://wso2.org/jira/browse/IOTS-172
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 9f33110e6f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
GPrathap 2e10d2ba2b added some bundles which required for this feature
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
Milan Perera 028a9b106a Merge pull request #280 from ayyoob/transport
9 years ago
ayyoob b7748b0001 added UI output adapter
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
Shabirmean 75914aee4e Changes to the VirtualFirealarm Agent + the API to enable token refresh upon expiration
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 862075bd2f Removed maven clean plugin
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
Rasika Perera 6696603ec5 Showing error when device name is less than 4 letters
9 years ago
Rasika Perera a46863b4ad Fixing incorrect deviceIdentifier
9 years ago
Shabirmean e656f383fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Shabirmean 10c49cfb4c Fixes to small bugs in the virtual firealarm
9 years ago
mharindu 6da020e5d5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim
9 years ago
sumedharubasinghe b8b0eda0bb Merge pull request #269 from ayyoob/transport
9 years ago
mharindu cbb1f44138 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim
9 years ago
ayyoob d7b423d694 fixed exponential backup logic
9 years ago
prabathabey f563f95c41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
prabathabey 5b0748489d Improving virtual fire alarm plugin to use newly introduced push notification framework
9 years ago
sumedharubasinghe fe89e8cac7 Merge pull request #268 from ayyoob/transport
9 years ago
mharindu 0fee083c4b Added a null check to virtualfire-alarm
9 years ago
ayyoob 4001dbf887 fixed exponential backup logic
9 years ago
mharindu cf9daf083d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim
9 years ago
Rasika Perera c51cdaacdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into IOTS-159
9 years ago
Rasika Perera 32a9ff18ac Fixing IOTS-159: Adding meaningfull messages
9 years ago
sumedharubasinghe 7fa598e646 Merge pull request #266 from ayyoob/transport
9 years ago
ayyoob 2d6caafa0c updated android sense apk
9 years ago
charitha b081f02594 Bug fixes
9 years ago
mharindu 29a1241ee9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Shabirmean 7f2fc73146 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Shabirmean eec796732e Correction to the RaspberryPi table from which the batch data to be pulled
9 years ago
mharindu 3db3e52657 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim
9 years ago
hasuniea 8eb53927a6 add swagger annotations to windows plugin
9 years ago
Shabirmean b4665f36bf Fixes to the RaspberryPi DeviceTypes to generate real-tome stats and send operations
9 years ago
charitha eb57d38507 Fix for https://wso2.org/jira/browse/IOTS-152
9 years ago
charitha a954de26f9 Moved api from device-mgt
9 years ago
mharindu d7b84cf9e4 Fixed conflicts
9 years ago
mharindu 36c88aee3c Fixed conflicts
9 years ago
mharindu 24e353698f Added permission annotations to virtual fire alarm API
9 years ago
Ruwan 7f9b7c4914 Merge pull request #258 from ayyoob/transport
9 years ago
ayyoob 67831883fb refactored apis
9 years ago
Sumedha Rubasinghe a1db2f1d08 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Sumedha Rubasinghe 6348ca31a3 removed unwanted text
9 years ago
charitha f3d7608cdc Add support to grouping and bug fixes
9 years ago
ayyoob b2a8b1b7c3 resolved xmpp stream conflict error
9 years ago
ayyoob bb0b10f14c resolved xmpp issues in virtual fire alarm
9 years ago
Ruwan f5442384d1 Merge pull request #256 from ayyoob/transport
9 years ago
ayyoob 64cdb33d67 few fixes after testing the device types with the refactoring
9 years ago
GPrathap b5fd68a6b4 fix typos
9 years ago
ayyoob bd1c0554a8 updated android sense agent
9 years ago
ayyoob bfbe790aa1 updated android sense topic
9 years ago
ayyoob aa9fe6006a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport
9 years ago
ayyoob 12ace9efe1 refactored analytics scripts
9 years ago
ayyoob 3974ec7753 refactored analytics scripts
9 years ago
ayyoob 3d583cd39b refactored analytic scripts
9 years ago
Waruna Samarsinghe 1fdb6fd54c fix bugs location and accelerometer
9 years ago
ayyoob e7ba11f709 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport
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
ayyoob da24c3fc1b removed method and type from feature
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
ayyoob 04566ec250 updated event receivers
9 years ago
Kasun Delgolla 34d4da7e66 Merge pull request #250 from charithag/master
9 years ago
Hasunie cb73e24036 Merge pull request #181 from hasuniea/master
9 years ago
hasuniea 3cdb490908 added swagger annotations
9 years ago
ayyoob a0c228f538 updated properties
9 years ago
ayyoob 303f6ad962 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport
9 years ago
ayyoob f880bda706 refactored device type after adapter changes
9 years ago
ayyoob 10f75d5f73 refactored topic structure
9 years ago
ayyoob d53942eeaa updated android sense and raspberry pi code
9 years ago
ayyoob 44fa7aa486 added input and output adapters as transport
9 years ago
charitha 70d47f96c1 Fix header title
9 years ago
charitha ffcbea8421 Fixed https://wso2.org/jira/browse/IOTS-104
9 years ago
hasuniea a47654e1f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
charitha 4aa376b98e Enable group analytics
9 years ago
ayyoob edaacd4989 device adapters updated
9 years ago
ayyoob 2b6816d7ed added xmpp, mqtt input/output adapters
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 feadc7d3ae Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
sumedharubasinghe 671a70d161 Merge pull request #245 from ayyoob/das-ext
9 years ago
sumedharubasinghe 7420ed4df6 Merge pull request #243 from rasika90/master
9 years ago
ayyoob 514c207495 changes on temperate event receiver
9 years ago
ayyoob 9e0fdca3ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext
9 years ago
Milan Perera eaa933bff3 Merge pull request #244 from Shabirmean/master
9 years ago
ayyoob 441815afb9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext
9 years ago
ayyoob cb939d6416 added template for host
9 years ago
mharindu b03105f50b Fixed issues in arduino temperature sensor
9 years ago
Rasika Perera 7a5acb6f58 Adding group permission checking
9 years ago
Shabirmean 259405995a Modifications to the RPi Agent to publish to the DAS MQTT Receiver for temperature
9 years ago
Shabirmean 07bc52e86c Changes to enable MQTT Support for RPi DeviceType
9 years ago
Rasika Perera 0914b94dfc Adding policy update
9 years ago
Rasika Perera b82fd2562d Adding permissions checking for isAuthorized
9 years ago
Shabirmean 4e51ca9ac4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Shabirmean 39a1020ef4 Fixes on the RPi API and modifications for MQTT Communication for RPi
9 years ago
hasuniea 81471f3a49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
ayyoob dbf82a3aa0 added recivers for temperature and few code changes after testing
9 years ago
gayank 893c535fb3 Android feature for Updating an application
9 years ago
hasuniea b33023a770 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
ayyoob bbc2850509 few changes after testing
9 years ago
ayyoob 308ac40277 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext
9 years ago
ayyoob 2d57f252f0 few changes added to permissions IoT device type plugins
9 years ago
Shabirmean c436a555bc Changes to use keystones provided by default and subsequent modifications to the agent enrolment code
9 years ago
ayyoob 14aac9f4f6 few changes after testing raspberry, arduino and refactored the jot plugins implementation
9 years ago
ayyoob 3b75a2e9a4 fixed issues in android sense
9 years ago
ayyoob e775c8ebe0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext
9 years ago
ayyoob 315177b787 Few changes to support multi tenancy for virtual fire alarm and android sense
9 years ago
hasuniea 8d039551fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
mharindu 7e4aaed2ee Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
hasuniea 0e8c8c7eb6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
ayyoob 012fc028cf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext
9 years ago
ayyoob 06bb551842 added android sense batch graphs
9 years ago
ayyoob 32958b2076 few changes in android agent and added android sense realtime graphs
9 years ago
charithag 4ef3f8d461 Fix timing issue
9 years ago
charithag fb71f5743c Remove obsolete units and update analytics components
9 years ago
charithag 03c4768e7d Update new analytics components.
9 years ago