Commit Graph

937 Commits

Author SHA1 Message Date
dilanua
a71537b7bb Updating emm app name 2016-08-06 17:17:24 +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
hasuniea
16e306268f fixing javax cache issue 2016-08-04 16:35:31 +05:30
hasuniea
86056df434 fixing windows plugin relalted slf4j issue 2016-08-04 15:29:25 +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
Rasika Perera
97eac5064e Fixed Requested resource /app/conf/reader/main.js not found 2016-08-02 23:11:42 +05:30
Rasika Perera
7b62aa3361 Fixing: Requested resource /app/conf/reader/main.js cannot be found 2016-08-02 22:23:23 +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
Rasika Perera
3d25102d30 Adding enrollment url into view model 2016-08-02 15:49:46 +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
kamidu
e0d9e1659c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 14:14:54 +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
kamidu
ea89c6685e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-02 10:32:44 +05:30
kamidu
6db9fc426e Fix the addd buttton 404 issue 2016-08-01 14:34:48 +05:30
hasuniea
a8102b8c42 fixing VERIFONEEMMPROF-26 2016-08-01 14:28:52 +05:30
mharindu
576bfb8236 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-01 12:27:30 +05:30
Chatura Dilan Perera
fb4d8ae990 refactor files 2016-08-01 11:52:03 +05:30
dilanua
18a9ad4b8a Updating EMM UI conf.json 2016-07-29 18:02:44 +05:30
kamidu
a38d38a86e Addting new nav bar without group management ui 2016-07-29 15:31:20 +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
Dilan U. Ariyaratne
cd7ca448a0 Merge pull request #311 from ayyoob/com
Added missing license headers
2016-07-28 17:54:10 +05:30
ayyoob
04b1a22a00 Added missing license headers 2016-07-28 17:52:06 +05:30
ayyoob
618230e121 remove new line 2016-07-28 17:48:28 +05:30
Dilan U. Ariyaratne
4f07a42a95 Merge pull request #310 from ayyoob/com
removed error message variable
2016-07-28 17:39:26 +05:30
ayyoob
b60487304f removed error message variable 2016-07-28 17:37:18 +05:30
Milan Perera
2998c1e4ac Merge pull request #309 from ayyoob/com
Fix issues raised in the comments
2016-07-28 16:58:17 +05:30
ayyoob
20cf418394 Fixed Issues raised in the comments 2016-07-28 16:16:06 +05:30
ayyoob
95ca419d17 avoided null check when comparing 2016-07-28 15:46:23 +05:30
ayyoob
9eec100535 fixed formatting issues 2016-07-28 15:46:06 +05:30
ayyoob
4ffa47f0b4 removed redundant brackets 2016-07-28 15:42:47 +05:30
Chatura Dilan
1fa5bdba44 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins 2016-07-28 15:26:04 +05:30
Chatura Dilan
338d804dba Added validations for invalid device Ids 2016-07-28 15:25:29 +05:30
Ruwan
5356ee920c Merge pull request #308 from ayyoob/transport
changes in realtime analytics
2016-07-28 12:38:42 +05:30
ayyoob
d650e86e00 few changes in real time analytics 2016-07-27 14:45:31 +05:30
Ace
77bdbb5a57 Fixing QR code issue 2016-07-26 20:58:21 +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
dilanua
0ef0a06d10 Updating emm config.json 2016-07-22 16:58:55 +05:30
mharindu
d2f02d128c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-22 16:50:37 +05:30
dilanua
f85dcc3f25 Updating emm config.json 2016-07-22 16:43:12 +05:30
ayyoob
22f4a9e2af added mqtt and web socket authorisation 2016-07-21 20:40:32 +05:30
Ace
c004824b81 removing console.log 2016-07-21 15:02:15 +05:30
mharindu
98d291fcd0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-07-21 14:32:43 +05:30
Ace
24624131a7 Adding EMM dashboard to mobile base UI 2016-07-21 07:43:41 +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
Ace
bff34e5030 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-07-15 12:01:42 +05:30
Ace
d802570be9 Adding app.conf for mobile base plugin 2016-07-15 12:01:31 +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
hasuniea
ad8bbf8863 removing notnull constraint from android device type 2016-07-11 19:07:13 +05:30
hasuniea
e84a868069 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-07-11 17:52:55 +05:30
hasuniea
53063284d0 fixing validation issue 2016-07-11 17:50:56 +05:30
Chatura Dilan
0818ae6860 [maven-release-plugin] prepare for next development iteration 2016-07-08 20:18:00 +05:30
Chatura Dilan
62c16e07ce [maven-release-plugin] prepare release v2.1.1 2016-07-08 20:17:52 +05:30
madhawap
3851be8742 fix to permissions.xml 2016-07-08 16:10:49 +05:30
hasuniea
b30aadc438 fix code conflicts 2016-07-08 15:28:01 +05:30
hasuniea
4ccf018bb3 adding validations 2016-07-08 15:26:20 +05:30
mharindu
ba4065265d Refactored permission.xml of android webapp 2016-07-08 13:57:50 +05:30
Kasun Delgolla
79b1d51643 Committing VPN operation fixes + logcat operation 2016-07-07 17:46:33 +05:30
mharindu
48613018ab Fixed issues in scope based autorization implementation 2016-07-04 19:27:46 +05:30
mharindu
f675468e44 Added scopes to APIS 2016-07-04 18:03:20 +05:30
Chatura Dilan
bedb171eb7 Added OS build date 2016-07-01 15:47:26 +05:30
Chatura Dilan
971185decf fixes for android sense client 2016-06-30 15:59:40 +05:30
Chatura Dilan
e05906fed5 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins 2016-06-30 07:34:31 +05:30
Ruwan
1d12d8771d Merge pull request #306 from WarunaS/rapid_accelarations
Rapid accelarations
2016-06-29 20:22:25 +05:30
Waruna Samarsinghe
bc08e31c4c Android Sense iBeacon 2016-06-29 17:50:22 +05:30
Chatura Dilan
f58abbe0db Added is_active field 2016-06-29 17:41:09 +05:30
Waruna Samarsinghe
a8371e046e Scanning Beacon 2016-06-28 16:18:13 +05:30
Waruna Samarsinghe
cd1cf2bf44 Beacon Scaning 2016-06-28 16:04:59 +05:30
Ruwan
8b6fe27cab Merge pull request #304 from ayyoob/transport
few changes added to transport adapters after testing with the cluster
2016-06-27 05:51:31 +05:30
ayyoob
8a9ad21e74 few changes added to transport adapters after testing with the cluster 2016-06-27 00:13:15 +05:30
Waruna Samarsinghe
32c4a34283 Ranged iBeacons 2016-06-26 14:36:06 +05:30
prabathabey
1205d26463 Merging rest-api-improvements branch with master 2016-06-21 16:05:27 +05:30
Chatura Dilan
6a702adaa3 Change emm_admin to admin 2016-06-21 15:51:35 +05:30
Chatura Dilan
529c828b81 Fixed paths in Android related permissions.xml 2016-06-21 11:32:01 +05:30
ayyoob
6c24f44abc Added push notification support for device types 2016-06-20 02:34:44 +05:30
ayyoob
562ac197af added configurations for device types 2016-06-17 17:21:13 +05:30
inoshperera
bb0ea53909 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-16 07:57:46 +05:30
inoshperera
c45400afd0 fixing error messages not thrown properly. 2016-06-16 07:57:40 +05:30
Kasun Delgolla
ef281e1524 Fixing operation response ERROR state exception 2016-06-15 13:51:08 -07:00
Ruwan
208bf6a7ab Merge pull request #298 from WarunaS/rapid_accelarations
Fix Orientation Issue
2016-06-13 16:47:38 +05:30
Waruna Samarsinghe
f3f28c544f Fix Orientation Issue 2016-06-13 16:30:39 +05:30
inoshperera
90747a5579 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-08 16:56:14 +05:30
inoshperera
486e2f48ed adding validation 2016-06-08 16:55:42 +05:30
Shabirmean
38c087ebc1 Added necessary changes to store CA_CERT and handle expired refresh-token scenario 2016-06-08 12:00:32 +05:30
Shabirmean
f0206d7ed4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-06-06 19:14:24 +05:30
ayyoob
28254e0da8 updated android sense 2016-06-06 16:52:48 +05:30
ayyoob
96638f88e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-06-06 13:20:00 +05:30
Ruwan
a2c54eb91c Merge pull request #293 from WarunaS/rapid_accelarations
rapid acceleration and turns- android sense
2016-06-06 13:18:14 +05:30
ayyoob
d4b319c42a added weburl for https 2016-06-06 13:14:04 +05:30
GPrathap
a3ff9fbdc5 adding sso configuration 2016-06-05 23:36:38 +05:30
Waruna Samarsinghe
d44170e52e rapid acceleration and turns- android sense 2016-06-05 22:58:38 +05:30
Waruna Samarsinghe
fec14a8509 rapid acceleration and turns- resolved 2016-06-05 00:06:50 +05:30
dilanua
c9a07df91a Fixing wrong device id shown for OTA-UPGRADE operation 2016-06-04 00:27:19 +05:30
dilanua
741bb0ac16 Updating Responces in pending-operations api 2016-06-03 23:49:19 +05:30
dilanua
bcba6216c0 Update UpgradeFirmware operation with server properties 2016-06-03 20:51:54 +05:30
dilanua
9ac7ffe828 Update UpgradeFirmware operation with server properties 2016-06-03 20:47:44 +05:30
mharindu
4a8ab39dec Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-03 19:49:00 +05:30
Ace
6425d6ab1a Adding null check for operations response 2016-06-03 19:27:20 +05:30
mharindu
9237fed74e Added notification title 2016-06-03 19:22:44 +05:30
prabathabey
55aa1c8113 Fixing compilation issues 2016-06-02 21:07:33 +05:30
mharindu
62a116ba71 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-06-02 17:12:09 +05:30
Shabirmean
dca55d692c Changes following the hashCode of the deviceId being used as the certificate alias 2016-06-02 17:12:06 +05:30
mharindu
c5d1eaa21b Fixed issue in location service 2016-06-02 17:11:05 +05:30
hasuniea
2b89b692a4 adding event configuration refference 2016-06-02 16:37:50 +05:30
hasuniea
c170373ace fix responce code 2016-06-02 15:57:00 +05:30
hasuniea
ec91b0a539 fixing eventReceiver 2016-06-02 15:30:09 +05:30
Shabirmean
fa454388ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-06-02 14:20:05 +05:30
Shabirmean
a117ae37c7 Modifications to the Token Refresh Flow & the Enrolment flow in the VFAlarm 2016-06-02 14:19:48 +05:30
Anushka Samaranayake
1265a1dd34 Alert generation 2016-06-01 20:22:29 +05:30
hasuniea
198b3c67dc add entry in permission xml 2016-05-31 19:16:52 +05:30
hasuniea
0bcbab7071 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:54:27 +05:30
Chatura Dilan
d3a0fc3f12 Added install application permissions 2016-05-31 18:50:26 +05:30
hasuniea
daee6109cc fixing code issues 2016-05-31 18:48:49 +05:30
Chatura Dilan
7c59e391de Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:42:54 +05:30
Chatura Dilan
ba1f3bbbcc fixed issue in unlock devices permissions 2016-05-31 18:42:37 +05:30
hasuniea
786c6859bd Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:15:11 +05:30
hasuniea
d01e176933 add eventreceiver fix 2016-05-31 18:08:16 +05:30
prabathabey
640cf95528 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 18:02:15 +05:30
prabathabey
d7b4b83424 Fixing path of license resource 2016-05-31 18:02:04 +05:30
mharindu
56a2ca0aa0 Added missing HTTP method attribute in permissions.xml in android webapp 2016-05-31 17:21:31 +05:30
Chatura Dilan
9086a130c4 Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 16:21:54 +05:30
Chatura Dilan
3fd56b56c4 Fix cxf servelt issues 2016-05-31 16:21:42 +05:30
prabathabey
212c11750c Added http schem supported by the API 2016-05-31 16:13:20 +05:30
inoshperera
763854ef9a Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-31 14:51:07 +05:30
ayyoob
61d88f77b6 removed device Id from notification bean 2016-05-31 14:48:23 +05:30
inoshperera
6d14133bab fixing the mismatch of swagger annotation and implementation 2016-05-31 14:45:05 +05:30
Chatura Dilan
bf1e00f472 Fixed the host name of Android API 2016-05-30 17:07:04 +05:30
prabathabey
eb025c42f7 Fixing issues encountered while deploying the agent webapp of windows 2016-05-30 12:30:12 +05:30
prabathabey
18257b8729 Changing the name of the android API webapp 2016-05-30 12:08:44 +05:30