Commit Graph

263 Commits

Author SHA1 Message Date
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
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
dilanua
01e32c86c8 Updating base ui app config reader 2016-07-25 05:54:32 +05:30
ayyoob
22f4a9e2af added mqtt and web socket authorisation 2016-07-21 20:40:32 +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
Ace
d802570be9 Adding app.conf for mobile base plugin 2016-07-15 12:01:31 +05:30
mharindu
2563098948 Fixed conflicts and merged 2016-07-11 22:12:54 +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
mharindu
f675468e44 Added scopes to APIS 2016-07-04 18:03:20 +05:30
Chatura Dilan
971185decf fixes for android sense client 2016-06-30 15:59:40 +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
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
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
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
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
Shabirmean
dca55d692c Changes following the hashCode of the deviceId being used as the certificate alias 2016-06-02 17:12:06 +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
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
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
ayyoob
6f6b5104d5 fixed https://wso2.org/jira/browse/IOTS-172 2016-05-26 16:23:42 +05:30
GPrathap
2e10d2ba2b added some bundles which required for this feature 2016-05-25 14:42:54 +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
ayyoob
b7748b0001 added UI output adapter 2016-05-24 19:28:47 +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
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
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
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