Commit Graph

1160 Commits

Author SHA1 Message Date
dilanua
ca4cb37d58 Adding emm policy listing UI 2016-08-11 11:05:25 +05:30
dilanua
bd5ef4158b Adding emm policy edit UI 2016-08-10 18:52:39 +05:30
dilanua
935b429198 Adding emm policy view UI 2016-08-10 18:34:35 +05:30
dilanua
aada09de10 Adding policy create UI updates 2016-08-10 18:06:26 +05:30
Ace
0ee28c91d2 Adding date validations when updating device enrollment 2016-08-10 14:26:39 +05:30
harshanl
e1e7bccd57 Temporary removed VirtualFireAlarm module to fix the build issue 2016-08-10 14:19:37 +05:30
Ruwan
c32d9e3125 Bug fix
Adding bug fix
2016-08-10 12:59:29 +05:30
Ace
d997654011 Adding date validations when updating device enrollment 2016-08-10 12:47:02 +05:30
hasuniea
9cde2d815a refactoring windowsapi 2016-08-10 10:51:42 +05:30
hasuniea
8a4b97ebf9 refactoring windowsapi 2016-08-10 10:39:30 +05:30
Rasika Perera
5ea262947b Added emm specific policy creation unit extending cdmf.unit.policy.create 2016-08-10 08:43:00 +05:30
Rasika Perera
4c11157d4e Enrollment url by default same VM 2016-08-10 08:33:43 +05:30
mharindu
d253dd4552 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-09 19:16:20 +05:30
mharindu
141a7d0959 Added scopes to the config.json 2016-08-09 19:09:22 +05:30
hasuniea
a62544c68b refactoring windowsapi 2016-08-09 18:00:49 +05:30
Ace
a37d5dbfd9 Fixing user,device,role listing pages 2016-08-09 07:57:30 +05:30
mharindu
352574d2fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 19:29:36 +05:30
mharindu
9b43f83520 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 18:49:49 +05:30
mharindu
6e8f3f5db2 Modified scopes 2016-08-08 18:25:00 +05:30
hasuniea
1078b8b686 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-08-08 18:06:22 +05:30
hasuniea
4562b4d318 adding security fixes 2016-08-08 18:06:14 +05:30
inoshperera
0197ea964f Merge pull request #313 from charithag/master
Add missing BadRequestException to global exception wrapper
2016-08-08 10:42:36 +05:30
mharindu
ece7cb04ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl 2016-08-08 10:40:45 +05:30
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
prabathabey
4dbf699b66 Fixing issues in android sense plugin which were caused by refactoring done in cdm-f 2016-05-30 08:33:55 +05:30
prabathabey
63bb616e9c Improving swagger annotations 2016-05-28 08:12:10 +05:30
prabathabey
631d57e70d Improving swagger annotations 2016-05-28 06:03:06 +05:30
Kasun Delgolla
a01fe5e4f9 Adding missing parameters 2016-05-28 02:14:56 +05:30
prabathabey
44aa3a93a9 Adding more improvements to swagger annotations 2016-05-28 02:07:17 +05:30
inoshperera
9f8ca3ea9a Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-28 01:50:20 +05:30
inoshperera
4dbf1bdc2f adding swagger annotation and making APIs standerdize 2016-05-28 01:50:14 +05:30
Kasun Delgolla
bd65e8b2a7 Committing missing android features 2016-05-28 01:38:03 +05:30
Chatura Dilan
b8cfcf4413 Fixed Enrollment issue 2016-05-27 23:18:11 +05:30
Chatura Dilan
91003fdee1 Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-27 22:44:22 +05:30
Chatura Dilan
d25e1b2421 Fixed Android APIs 2016-05-27 22:43:03 +05:30
hasuniea
cc8190b541 add windows feature 2016-05-27 20:03:25 +05:30
inoshperera
f346c7c528 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements 2016-05-27 19:38:41 +05:30
prabathabey
479acf3b45 Improving swagger annotations of device management admin API 2016-05-27 19:38:12 +05:30
hasuniea
d7527e95f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 18:45:49 +05:30
hasuniea
d4bce21f75 windows plugin 2016-05-27 18:45:20 +05:30
prabathabey
ba9d85b065 Adding swagger related dependencies to android agent webapp 2016-05-27 18:26:34 +05:30
inoshperera
aa4a4889a5 adding API header 2016-05-27 15:36:22 +05:30
prabathabey
9a01df5d55 Renaming android agent webapp 2016-05-27 14:58:19 +05:30
prabathabey
23343eb765 Fixing the name of android agent webapp 2016-05-27 12:50:29 +05:30
prabathabey
8620eb912f Removing redundant implementations of android and windows plugins 2016-05-27 11:59:28 +05:30
prabathabey
8f3a2eec5d Merging the latest changes introduced to master 2016-05-27 11:47:28 +05:30
prabathabey
98a8a09813 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 11:23:34 +05:30
prabathabey
6f7f706428 Renaming TenantConfiguration as PlatformCongfiguration 2016-05-27 11:23:19 +05:30
Milan Perera
23c404260e Merge pull request #283 from ayyoob/transport
fixed db related jiras
2016-05-26 21:23:05 +05:30
Rasika Perera
07984e4b6e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-26 18:34:58 +05:30
Rasika Perera
91cc0baaf5 Moved CSS into separate file 2016-05-26 18:34:07 +05:30
Rasika Perera
0862e95f4c Moved CSS into separate file 2016-05-26 18:22:32 +05:30
prabathabey
fd1d62454a Improving Android JAX-RS API definitions 2016-05-26 18:01:14 +05:30
ayyoob
6f6b5104d5 fixed https://wso2.org/jira/browse/IOTS-172 2016-05-26 16:23:42 +05:30
Kasun Delgolla
86327ab870 Committing android service improvements + integration 2016-05-26 15:35:26 +05:30
prabathabey
03a21752e2 Adding maven-compiler-plugin to the build profile 2016-05-26 11:14:31 +05:30
hasuniea
9f33110e6f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 18:16:11 +05:30
GPrathap
2e10d2ba2b added some bundles which required for this feature 2016-05-25 14:42:54 +05:30
hasuniea
ab70703da8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 13:54:12 +05:30
hasuniea
2eb5aebb60 fixed code issues in EventService 2016-05-25 13:53:39 +05:30
Ruwan
9e8e479d63 Merge pull request #281 from rasika90/master
Adding licence headers for server-side handlebar templates
2016-05-25 11:45:16 +05:30
geethkokila
57a9834145 Changing apis to return activity when an operation is added 2016-05-25 11:43:19 +05:30
Rasika Perera
f0b5ad32c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 11:35:27 +05:30
Rasika Perera
c49e19a3c6 Adding licence headers for handlebar templates 2016-05-25 11:34:22 +05:30
Milan Perera
028a9b106a Merge pull request #280 from ayyoob/transport
added UI output adapter
2016-05-24 19:35:24 +05:30
ayyoob
b7748b0001 added UI output adapter 2016-05-24 19:28:47 +05:30
Kasun Delgolla
4f33789d38 Committing MDM android APIs responses standardization 2016-05-24 15:34:43 +05:30
Hasunie
df6f420d6e Merge pull request #279 from hasuniea/master
fixed code issues
2016-05-23 15:11:15 +05:30
hasuniea
4757ac797c fixed code issues 2016-05-23 15:09:33 +05:30
ayyoob
dc32a8f8d3 Merge branch 'release-2.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-23 10:18:46 +05:30
Shabirmean
75914aee4e Changes to the VirtualFirealarm Agent + the API to enable token refresh upon expiration 2016-05-21 01:46:34 +05:30
mharindu
f3730c64ae [maven-release-plugin] prepare for next development iteration 2016-05-20 17:49:18 +05:30
mharindu
7a982093a1 [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:49:08 +05:30
mharindu
862075bd2f Removed maven clean plugin 2016-05-20 17:45:40 +05:30
mharindu
be4078cf38 [maven-release-plugin] rollback the release of v2.1.0 2016-05-20 17:35:17 +05:30
mharindu
a2d2f26123 [maven-release-plugin] prepare for next development iteration 2016-05-20 17:26:28 +05:30
mharindu
3af112898d [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:26:19 +05:30
hasuniea
a48529be59 fix code conflicts 2016-05-20 16:38:33 +05:30
hasuniea
5c29ac8c4f fix code conflicts 2016-05-20 16:29:24 +05:30
hasuniea
a7665033b4 refactored events 2016-05-20 16:18:24 +05:30
Rasika Perera
6696603ec5 Showing error when device name is less than 4 letters 2016-05-19 15:55:05 +05:30
Rasika Perera
a46863b4ad Fixing incorrect deviceIdentifier 2016-05-19 11:22:42 +05:30
Shabirmean
e656f383fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-19 01:35:01 +05:30
Shabirmean
10c49cfb4c Fixes to small bugs in the virtual firealarm 2016-05-19 01:34:49 +05:30
mharindu
6da020e5d5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-19 00:42:44 +05:30
sumedharubasinghe
b8b0eda0bb Merge pull request #269 from ayyoob/transport
fixed exponential backup logic
2016-05-19 00:40:07 +05:30
mharindu
cbb1f44138 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-19 00:33:31 +05:30
ayyoob
d7b423d694 fixed exponential backup logic 2016-05-19 00:28:08 +05:30
prabathabey
f563f95c41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-19 00:22:18 +05:30
prabathabey
5b0748489d Improving virtual fire alarm plugin to use newly introduced push notification framework 2016-05-19 00:22:01 +05:30
sumedharubasinghe
fe89e8cac7 Merge pull request #268 from ayyoob/transport
fixed exponential backup logic
2016-05-18 23:18:11 +05:30
mharindu
0fee083c4b Added a null check to virtualfire-alarm 2016-05-18 22:03:16 +05:30
ayyoob
4001dbf887 fixed exponential backup logic 2016-05-18 19:32:39 +05:30
mharindu
cf9daf083d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-18 11:49:59 +05:30
Rasika Perera
c51cdaacdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into IOTS-159 2016-05-18 10:52:17 +05:30
Rasika Perera
32a9ff18ac Fixing IOTS-159: Adding meaningfull messages 2016-05-18 10:48:52 +05:30
sumedharubasinghe
7fa598e646 Merge pull request #266 from ayyoob/transport
updated android sense apk
2016-05-18 02:19:12 +05:30
ayyoob
2d6caafa0c updated android sense apk 2016-05-18 02:09:27 +05:30
charitha
b081f02594 Bug fixes 2016-05-17 23:33:55 +05:30
mharindu
29a1241ee9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-17 20:34:00 +05:30
Shabirmean
7f2fc73146 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-17 17:40:14 +05:30
Shabirmean
eec796732e Correction to the RaspberryPi table from which the batch data to be pulled 2016-05-17 17:40:03 +05:30
mharindu
3db3e52657 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-17 12:26:39 +05:30
hasuniea
8eb53927a6 add swagger annotations to windows plugin 2016-05-17 10:20:31 +05:30
Shabirmean
b4665f36bf Fixes to the RaspberryPi DeviceTypes to generate real-tome stats and send operations 2016-05-17 00:39:26 +05:30
charitha
eb57d38507 Fix for https://wso2.org/jira/browse/IOTS-152 2016-05-16 17:51:19 +05:30
charitha
a954de26f9 Moved api from device-mgt 2016-05-16 17:04:47 +05:30
mharindu
d7b84cf9e4 Fixed conflicts 2016-05-16 14:14:39 +05:30
mharindu
36c88aee3c Fixed conflicts 2016-05-16 12:24:14 +05:30
mharindu
24e353698f Added permission annotations to virtual fire alarm API 2016-05-16 12:12:47 +05:30
Ruwan
7f9b7c4914 Merge pull request #258 from ayyoob/transport
refactored apis and resolved xmpp issues
2016-05-15 20:07:28 +05:30
ayyoob
67831883fb refactored apis 2016-05-15 17:45:53 +05:30
Sumedha Rubasinghe
a1db2f1d08 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-15 13:20:15 +05:30
Sumedha Rubasinghe
6348ca31a3 removed unwanted text 2016-05-15 13:19:38 +05:30
charitha
f3d7608cdc Add support to grouping and bug fixes 2016-05-15 13:12:50 +05:30
ayyoob
b2a8b1b7c3 resolved xmpp stream conflict error 2016-05-15 12:39:34 +05:30
ayyoob
bb0b10f14c resolved xmpp issues in virtual fire alarm 2016-05-15 11:59:10 +05:30
Ruwan
f5442384d1 Merge pull request #256 from ayyoob/transport
few fixes after testing the device types with the refactoring
2016-05-14 21:01:31 +05:30
ayyoob
64cdb33d67 few fixes after testing the device types with the refactoring 2016-05-14 20:43:15 +05:30
GPrathap
b5fd68a6b4 fix typos 2016-05-14 18:31:22 +05:30
ayyoob
bd1c0554a8 updated android sense agent 2016-05-14 01:02:03 +05:30
ayyoob
bfbe790aa1 updated android sense topic 2016-05-14 00:43:50 +05:30
ayyoob
aa9fe6006a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-14 00:35:54 +05:30
ayyoob
12ace9efe1 refactored analytics scripts 2016-05-14 00:35:20 +05:30
ayyoob
3974ec7753 refactored analytics scripts 2016-05-14 00:34:36 +05:30
ayyoob
3d583cd39b refactored analytic scripts 2016-05-14 00:33:27 +05:30
Waruna Samarsinghe
1fdb6fd54c fix bugs location and accelerometer 2016-05-13 14:15:39 +05:30
ayyoob
e7ba11f709 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-13 05:27:41 +05:30
inosh-perera
bf7975c5d4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:59:27 +05:30
dilanua
bc1dfb86f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:56:34 +05:30
dilanua
2dabfa02fa Adding swagger annotations 2016-05-13 02:56:15 +05:30
ayyoob
da24c3fc1b removed method and type from feature 2016-05-13 02:53:30 +05:30
inosh-perera
0787aa2ac1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:51:54 +05:30
inosh-perera
afc7be590e adding swagger annotations for Android APIs 2016-05-13 02:50:17 +05:30
Madhawa Perera
f25cb51679 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
Adding swagger annotations to beans
2016-05-13 02:43:43 +05:30
Madhawa Perera
0d8010c25a Adding swagger annotations to beans 2016-05-13 02:43:23 +05:30
dilanua
f66aad9e0e Adding swagger annotations 2016-05-13 02:39:30 +05:30
ayyoob
04566ec250 updated event receivers 2016-05-12 21:59:35 +05:30
Kasun Delgolla
34d4da7e66 Merge pull request #250 from charithag/master
Fixed https://wso2.org/jira/browse/IOTS-104
2016-05-12 21:49:51 +05:30
Hasunie
cb73e24036 Merge pull request #181 from hasuniea/master
Refactored code issues
2016-05-12 21:49:45 +05:30
hasuniea
3cdb490908 added swagger annotations 2016-05-12 21:41:49 +05:30
ayyoob
a0c228f538 updated properties 2016-05-12 19:17:54 +05:30
ayyoob
303f6ad962 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-12 13:43:40 +05:30
ayyoob
f880bda706 refactored device type after adapter changes 2016-05-12 13:39:57 +05:30
ayyoob
10f75d5f73 refactored topic structure 2016-05-12 09:06:11 +05:30
ayyoob
d53942eeaa updated android sense and raspberry pi code 2016-05-12 03:09:51 +05:30
ayyoob
44fa7aa486 added input and output adapters as transport 2016-05-12 02:44:43 +05:30
charitha
70d47f96c1 Fix header title 2016-05-11 19:59:01 +05:30
charitha
ffcbea8421 Fixed https://wso2.org/jira/browse/IOTS-104 2016-05-11 16:00:05 +05:30
hasuniea
a47654e1f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-11 11:36:31 +05:30
charitha
4aa376b98e Enable group analytics 2016-05-10 21:32:09 +05:30
ayyoob
edaacd4989 device adapters updated 2016-05-09 01:05:34 +05:30
ayyoob
2b6816d7ed added xmpp, mqtt input/output adapters 2016-05-08 02:45:07 +05:30
hasuniea
5846f693e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-06 12:54:49 +05:30
ayyoob
6f000cbc64 refactoring version tags 2016-05-05 14:34:49 +05:30
hasuniea
feadc7d3ae Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-05 10:27:53 +05:30
sumedharubasinghe
671a70d161 Merge pull request #245 from ayyoob/das-ext
added template for host
2016-05-04 03:15:20 +05:30
sumedharubasinghe
7420ed4df6 Merge pull request #243 from rasika90/master
Adding permissions checking for isAuthorized
2016-05-04 03:01:40 +05:30
ayyoob
514c207495 changes on temperate event receiver 2016-05-04 03:01:06 +05:30
ayyoob
9e0fdca3ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-05-04 01:36:02 +05:30
Milan Perera
eaa933bff3 Merge pull request #244 from Shabirmean/master
Changes in include RPi to use MQTT Communication
2016-05-04 01:31:36 +05:30
ayyoob
441815afb9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-05-04 01:20:36 +05:30
ayyoob
cb939d6416 added template for host 2016-05-04 01:18:38 +05:30
mharindu
b03105f50b Fixed issues in arduino temperature sensor 2016-05-04 01:15:31 +05:30
Rasika Perera
7a5acb6f58 Adding group permission checking 2016-05-04 00:49:07 +05:30
Shabirmean
259405995a Modifications to the RPi Agent to publish to the DAS MQTT Receiver for temperature 2016-05-04 00:47:52 +05:30
Shabirmean
07bc52e86c Changes to enable MQTT Support for RPi DeviceType 2016-05-03 23:24:19 +05:30
Rasika Perera
0914b94dfc Adding policy update 2016-05-03 20:56:59 +05:30
Rasika Perera
b82fd2562d Adding permissions checking for isAuthorized 2016-05-03 19:28:42 +05:30
Shabirmean
4e51ca9ac4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-03 17:55:07 +05:30
Shabirmean
39a1020ef4 Fixes on the RPi API and modifications for MQTT Communication for RPi 2016-05-03 17:54:56 +05:30
hasuniea
81471f3a49 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-03 16:03:23 +05:30
ayyoob
dbf82a3aa0 added recivers for temperature and few code changes after testing 2016-05-03 13:37:09 +05:30
gayank
893c535fb3 Android feature for Updating an application 2016-04-29 20:01:19 +05:30
hasuniea
b33023a770 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-29 19:31:07 +05:30
ayyoob
bbc2850509 few changes after testing 2016-04-29 17:41:22 +05:30
ayyoob
308ac40277 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-29 17:04:54 +05:30
ayyoob
2d57f252f0 few changes added to permissions IoT device type plugins 2016-04-29 17:04:19 +05:30
Shabirmean
c436a555bc Changes to use keystones provided by default and subsequent modifications to the agent enrolment code 2016-04-29 16:41:19 +05:30
ayyoob
14aac9f4f6 few changes after testing raspberry, arduino and refactored the jot plugins implementation 2016-04-29 16:41:18 +05:30
ayyoob
3b75a2e9a4 fixed issues in android sense 2016-04-29 00:35:52 +05:30
ayyoob
e775c8ebe0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-28 22:21:22 +05:30
ayyoob
315177b787 Few changes to support multi tenancy for virtual fire alarm and android sense 2016-04-28 22:21:08 +05:30
hasuniea
8d039551fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-28 17:50:57 +05:30
mharindu
7e4aaed2ee Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-28 12:04:18 +05:30
hasuniea
0e8c8c7eb6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-28 10:55:42 +05:30
ayyoob
012fc028cf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-28 03:10:01 +05:30
ayyoob
06bb551842 added android sense batch graphs 2016-04-28 03:05:27 +05:30
ayyoob
32958b2076 few changes in android agent and added android sense realtime graphs 2016-04-28 01:52:12 +05:30
charithag
4ef3f8d461 Fix timing issue 2016-04-27 17:45:29 +05:30
charithag
fb71f5743c Remove obsolete units and update analytics components 2016-04-27 15:41:27 +05:30
charithag
03c4768e7d Update new analytics components. 2016-04-27 13:44:38 +05:30
mharindu
e63afcec48 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-27 12:28:51 +05:30
mharindu
f6d75bb880 Added permissions to firealarm API 2016-04-27 12:28:43 +05:30
prabathabey
cfbc36ff2d Making the plug-in implementations compatible with the changes introduced to DeviceManagementService SPI 2016-04-26 17:17:37 +05:30
ayyoob
313b48f01d added virtual firealarm graphs 2016-04-26 15:58:54 +05:30
Rasika Perera
0e3ed08de4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-26 11:36:32 +05:30
Rasika Perera
cb7f7a6cd9 Autocompleting API params for Operations Implemented 2016-04-26 11:35:35 +05:30
prabathabey
ac407a6a1a Removing obsolete dependencies to ApplicationManagert interface from plug-in specific device management service implementations 2016-04-25 20:30:10 +05:30
ayyoob
f0c17184f8 few changes on while creating a role for android sense and virtual firelaarm 2016-04-23 23:39:11 +05:30
Ruwan
525fc5f5e9 Merge pull request #233 from ayyoob/das-ext
Few changes in android sense and virtual firealarm
2016-04-23 21:42:03 +05:30