236 Commits

Author	SHA1	Message	Date
Chatura Dilan Perera	ca2e631076	Fix conflicts	2016-08-19 15:25:51 +05:30
Chatura Dilan Perera	7ff9204646	[maven-release-plugin] prepare for next development iteration	2016-08-18 22:52:56 +05:30
Chatura Dilan Perera	5e43c5bef9	[maven-release-plugin] prepare release v2.1.2	2016-08-18 22:52:47 +05:30
hasuniea	97ff014b1b	fixing log info message issue	2016-08-17 15:53:38 +05:30
hasuniea	5e2a42d798	fixing app-install issue	2016-08-17 15:31:18 +05:30
ayyoob	55107aaae5	fixing commit issues	2016-08-15 15:04:26 +05:30
ayyoob	38b9f017c3	merged with origin	2016-08-12 10:55:25 +05:30
harshanl	b207554bba	Refacotered IOT plugins to use own keystore.	2016-08-11 12:38:11 +05:30
harshanl	e1e7bccd57	Temporary removed VirtualFireAlarm module to fix the build issue	2016-08-10 14:19:37 +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
hasuniea	4562b4d318	adding security fixes	2016-08-08 18:06:14 +05:30
mharindu	8ddee3b217	Refactored scopes	2016-08-04 17:47:26 +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	7b62aa3361	Fixing: Requested resource /app/conf/reader/main.js cannot be found	2016-08-02 22:23:23 +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	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
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
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