Commit Graph

1034 Commits

Author SHA1 Message Date
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
ayyoob
d128804b04 added real time analytics for virtual fire alarm 2016-04-23 20:30:37 +05:30
ayyoob
e3f117e8fe few changes in virtual firealarm stats api 2016-04-23 00:07:54 +05:30
ayyoob
16fb54d463 Changes after testing with virtual firealarm and android sense 2016-04-22 20:58:13 +05:30
NuwanSameera
eb0069381d Remove digital display and drone analyzer from plugins 2016-04-22 15:51:32 +05:30
NuwanSameera
59ea70e761 Remove digital display and drone analyzer from plugins 2016-04-22 15:35:12 +05:30
NuwanSameera
fda0e9fb5d Add uninstall feature to mobile application features 2016-04-22 14:33:47 +05:30
hasuniea
05d252e61d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-22 09:33:38 +05:30
ayyoob
5f43cc47e8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-20 17:39:44 +05:30
Rasika Perera
8e8b2a69c1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-20 15:09:58 +05:30
ayyoob
a3c7208cea Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt-plugins into das-ext 2016-04-20 15:03:20 +05:30
ayyoob
6101d2dc09 few changes on android sense 2016-04-20 14:59:14 +05:30
Rasika Perera
0a060d9a73 Fixing android-sense to support auto-generated operations 2016-04-20 14:04:06 +05:30
Rasika Perera
506a48569b Now operations are auto generated and supports query params, path params and form params. 2016-04-20 13:38:37 +05:30
ayyoob
d2f59f50bb few changes to resolve start up issues 2016-04-20 00:11:59 +05:30
ayyoob
087be385c4 merged with upstream 2016-04-19 23:58:38 +05:30
ayyoob
f5fc978b5b refactored analytics scripts 2016-04-19 23:43:27 +05:30
Ruwan
c609ef1c9b Merge pull request #229 from NuwanSameera/master
Remove monitor operations from controller APIs.
2016-04-19 18:35:40 +05:30
NuwanSameera
4ad62b1dc1 Remove monitor operations from controller api. 2016-04-19 17:16:58 +05:30
Kasun Delgolla
a6a0fc2a57 Adding VPN feature for android 2016-04-19 16:25:19 +05:30
NuwanSameera
1606c365e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-19 15:13:04 +05:30
charithag
4a2b28cd9f Fix UI issues occured after merge with emm ui 2016-04-19 14:57:16 +05:30
NuwanSameera
f3cbe67cad \Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-19 13:38:25 +05:30
Prabath Abeysekara
ec983337a9 Merge pull request #226 from charithag/master
Moved devicemgt_admin jax-rs to carbon-device-mgt
2016-04-19 13:36:46 +05:30
NuwanSameera
f8c4b6413c Resolve conflicts 2016-04-19 11:46:27 +05:30
NuwanSameera
2d4f07fc55 Add REST Api annotations to Api implementations. 2016-04-19 11:33:31 +05:30
hasuniea
61353730ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-18 18:02:34 +05:30
charithag
c8b55ea2c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-18 18:00:27 +05:30
ayyoob
2567c812f2 removed das extension feature 2016-04-18 17:13:51 +05:30
charithag
7fb167b7fa Moved devicemgt_admin jax-rs to carbon-device-mgt 2016-04-18 16:41:04 +05:30
ayyoob
30578a9161 added android sense code after testing 2016-04-18 02:59:43 +05:30
ayyoob
0b67c0f74a added android sense agent code 2016-04-17 12:18:25 +05:30
ayyoob
3e1b0c54e9 made content validator to process batch events 2016-04-16 01:10:58 +05:30
ayyoob
cdb1f62ba9 Made device plugins to connect securely with the MQTT broker 2016-04-15 23:10:48 +05:30
ayyoob
d3a769776b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-14 20:04:41 +05:30
ayyoob
6709360249 adding das receivers and publisher with OAUTH 2016-04-14 19:56:33 +05:30
NuwanSameera
50f8716527 Resolve conflicts. 2016-04-11 16:09:23 +05:30
hasuniea
34cf1abf80 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-11 09:42:38 +05:30
charithag
73d3321154 Fix issues in virtual fire alarm jax-rs api 2016-04-08 16:13:37 +05:30
hasuniea
339deef5c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-08 11:03:34 +05:30
charithag
6daa5c43c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-07 20:47:37 +05:30
charithag
29486fedd5 Refactoring admin jax-rs to comply with restructured cdm 2016-04-07 20:42:56 +05:30
mharindu
918302475b Fixed incorrect location coordinate issue (EMM-1313) 2016-04-07 17:28:27 +05:30
hasuniea
b41cac80db Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-04 14:50:46 +05:30
mharindu
2548a1dd18 Fix for EMM-1297 2016-04-04 14:21:11 +05:30
charithag
d09aa13497 Refactor group management service 2016-04-01 13:31:07 +05:30
charithag
ecc63f0f0e Refactor group management service 2016-03-31 17:53:53 +05:30
NuwanSameera
d637325590 Add db scripts to mssql, oracle, postgresql databases. 2016-03-31 17:06:25 +05:30
ayyoob
3488d9d79d refactored device type implemenation 2016-03-31 04:24:45 +05:30
ayyoob
2778e1c1ef Merge branch 'master' of https://github.com/NuwanSameera/carbon-device-mgt-plugins into merge-latest 2016-03-30 22:53:48 +05:30
ayyoob
c05191dac5 Added IoT plugins feature and refactored IoT base. 2016-03-30 22:49:20 +05:30
ayyoob
0bf219c93a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 20:25:26 +05:30
ayyoob
71d2897f20 Added jot plugins features 2016-03-30 20:25:02 +05:30
NuwanSameera
1f0f449385 Modify permissions.xml files in device type. 2016-03-30 17:55:33 +05:30
NuwanSameera
8656f84ac6 Move device type plugins to iot-plugins 2016-03-30 16:14:43 +05:30
inosh-perera
45512be823 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 16:09:04 +05:30
charithag
53eb49d5ae Fix bundle imports for java 8 2016-03-30 10:00:25 +05:30
inosh-perera
657cf05ef5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 09:21:50 +05:30
inosh-perera
56a96cf2c3 addning new features for user restrictions 2016-03-30 09:21:42 +05:30
charithag
8c6690a597 Update MDM admin content from product-emm 2016-03-30 02:10:31 +05:30
charithag
6e981fb2c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 01:59:17 +05:30
charithag
f74a8ddf0d Add device type plugins and features related to emm with IoTS base feature. 2016-03-30 01:57:32 +05:30
charithag
4f5b5188ea Updated with core changes 2016-03-29 18:32:12 +05:30
mharindu
b74f26975e Fixed conflicts and merged 2016-03-29 17:29:21 +05:30
charithag
887af1a9f6 Enable IoT base plugin component back and fix isses 2016-03-29 14:22:48 +05:30
charithag
f6d04fba4b Fix module locations 2016-03-29 12:59:10 +05:30
mharindu
cb9ab9fb0a Added unlock feature 2016-03-29 11:10:50 +05:30
prabathabey
39d2ce12dc merging resturctured iot and mobile plugins 2016-03-27 03:02:20 +05:30
gayank
c0a25f08bd Fixing EMM-1289 2016-03-24 15:31:21 +05:30
geethkokila
64c1772f5b Changing the plugins snapshit versions to 2.1.0 from 2.0.4 2016-03-24 11:45:41 +05:30
hasuniea
79e143d236 refactored code comments 2016-02-19 06:44:08 +05:30
hasuniea
5690dec4b7 refactored code issues 2016-02-17 18:00:28 +05:30
hasuniea
9ff91085c8 refactored code issue 2016-02-17 17:54:52 +05:30
hasuniea
77dc0f257c refactored code issues 2016-02-17 12:05:58 +05:30
hasuniea
e8a47a5239 refactored code issues 2016-02-15 10:46:29 +05:30
hasuniea
9c1b34b891 fixed code line issue 2016-02-13 18:24:03 +05:30
hasuniea
d5ec50c4e6 fixed code issue 2016-02-12 13:53:32 +05:30
hasuniea
7aeecf7345 refactored code issues 2016-02-10 18:10:00 +05:30
hasuniea
f32bdf4021 fixed code issues 2016-02-02 18:24:27 +05:30
hasuniea
4205ad18dd fixed issue in windowsUtil 2016-02-02 18:10:54 +05:30
hasuniea
69299b69e8 fixed code issues 2016-02-02 18:00:01 +05:30
Kamidu Sachith
512bf6c514 Preventing Infromation leakage 2016-01-25 14:42:59 +05:30
WSO2
2a46d2ed98 [maven-release-plugin] prepare for next development iteration 2016-01-07 17:33:06 +05:30
WSO2
e5d15f6616 [maven-release-plugin] prepare release v2.0.3 2016-01-07 17:32:57 +05:30
Kasun Delgolla
99286922dc Fixing character encoding issues in default licenses. 2016-01-07 15:52:33 +05:30
geethkokila
4eb78d8353 [maven-release-plugin] prepare for next development iteration 2015-12-30 14:39:40 +05:30
geethkokila
937e9af0d8 [maven-release-plugin] prepare release v2.0.2 2015-12-30 14:39:32 +05:30
geethkokila
e0233e9337 [maven-release-plugin] prepare for next development iteration 2015-12-23 23:00:55 +05:30
geethkokila
a3993b09e1 [maven-release-plugin] prepare release v2.0.1 2015-12-23 23:00:46 +05:30
geethkokila
9957ec1022 [maven-release-plugin] rollback the release of carbon-device-mgt-plugins-parent-2.0.1 2015-12-23 22:53:34 +05:30
geethkokila
bf73c3b81d [maven-release-plugin] prepare for next development iteration 2015-12-23 22:51:14 +05:30
geethkokila
a6788da596 [maven-release-plugin] prepare release carbon-device-mgt-plugins-parent-2.0.1 2015-12-23 22:51:06 +05:30
Prabath Abeysekara
820bd75223 Merge pull request #102 from hasuniea/master
fixed device enrollment modification
2015-12-23 15:57:33 +05:30
harshanl
618cd1b8fd Added null checks to GCM service. 2015-12-23 15:30:42 +05:30
hasuniea
9c77c6ae46 fixed device enrollment modification 2015-12-23 15:27:16 +05:30
geethkokila
81e3f53311 [maven-release-plugin] prepare for next development iteration 2015-12-22 08:42:03 +05:30
geethkokila
ab0aa475cc [maven-release-plugin] prepare release v2.0.0 2015-12-22 08:41:55 +05:30
Kamidu Sachith
9e99e2ec7a Improve performance of the core 2015-12-21 17:55:04 +05:30
harshanl
fc7776d736 Added null checks for empty regid scenarios as a fix for MDM-396 2015-12-21 17:13:07 +05:30
harshanl
889598c3b3 Removed deleting device data from disenrolment function. 2015-12-18 22:18:10 +05:30
harshanl
2397abaa6c Fixed NPE issue 2015-12-17 10:33:29 +05:30
harshanl
cb1c0c0439 Fixed DAO connection close issue. 2015-12-16 15:28:51 +05:30
Kasun Delgolla
f0669887fb Committing policy compliance monitoring issue 2015-12-16 14:40:44 +05:30
inosh-perera
330930ade7 fixes related to location in iOS - EMM-1048 2015-12-11 10:02:55 +05:30
hasuniea
665a46a65a add Language type constant 2015-12-04 15:32:43 +05:30
hasuniea
75d35dadca fixed default license issue 2015-12-04 11:02:40 +05:30
Kasun Delgolla
be37d3aeb5 Committing app context name change from mdm to emm 2015-11-30 20:18:11 +05:30
harshanl
b2d344bad7 Added a method to reset the tenant config cache. 2015-11-30 16:55:45 +05:30
manoj
be6d0647a6 Add notify to plugin for ios operations 2015-11-20 22:20:33 +05:30
manoj
aa19dc7261 APP manager integration 2015-11-19 10:58:43 +05:30
harshanl
92317260d3 Added GCM support to android 2015-11-18 20:14:36 +05:30
harshanl
9d807400ce Added GCM failure handling logic 2015-11-18 14:38:18 +05:30
harshanl
cfb6464cbe Fixed policy monitoring empty device list issue 2015-11-18 12:51:54 +05:30
harshanl
b401d7f61e added GCM support to android 2015-11-17 23:05:21 +05:30
harshanl
5a797d4de1 Updated DeviceManager service to latest DMService 2015-11-13 21:59:47 +05:30
Kamidu Sachith
3dceccc8c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-11-03 11:10:05 +05:30
harshanl
b33be7d49d Fixed EMM-897 issue. 2015-11-02 14:42:25 +05:30
Kamidu Sachith
bbcfe309f9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2015-11-02 10:50:41 +05:30
Kamidu Sachith
b699e7744f Fixing Jira for repeat log 2015-11-02 10:49:58 +05:30
hasuniea
7701015ea0 refactored code conflicts 2015-10-30 20:12:26 +05:30
hasuniea
20fd4c1eff refactored code issues 2015-10-30 20:04:24 +05:30
hasuniea
728cf39853 refactored code issues 2015-10-30 20:00:59 +05:30
hasuniea
c257a7a5ab refactored code issues 2015-10-30 19:53:16 +05:30
hasuniea
85fdb3c930 refactored code issues 2015-10-30 19:48:45 +05:30
hasuniea
16b6c527ef refactored windowsFeatureManager 2015-10-29 14:47:59 +05:30
hasuniea
a437bda6af fixed code issues 2015-10-29 14:21:34 +05:30
hasuniea
8a97c3d612 Fixed code issues 2015-10-29 14:13:37 +05:30