784 Commits

Author	SHA1	Message	Date
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
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