147 Commits

Author	SHA1	Message	Date
mharindu	6e8f3f5db2	Modified scopes	2016-08-08 18:25:00 +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
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
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
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
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
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
hasuniea	a8102b8c42	fixing VERIFONEEMMPROF-26	2016-08-01 14:28:52 +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
Chatura Dilan	338d804dba	Added validations for invalid device Ids	2016-07-28 15:25:29 +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
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
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	f58abbe0db	Added is_active field	2016-06-29 17:41:09 +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