1369 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Ace	77bdbb5a57	Fixing QR code issue	2016-07-26 20:58:21 +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
dilanua	0ef0a06d10	Updating emm config.json	2016-07-22 16:58:55 +05:30
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
ayyoob	22f4a9e2af	added mqtt and web socket authorisation	2016-07-21 20:40:32 +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	5e697311d2	fixed dependancy issue	2016-07-11 15:37:10 +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
Chatura Dilan	07b6b6a033	remove snapshots	2016-07-08 20:11:05 +05:30
Chatura Dilan	7a023c0fab	Merge pull request #307 from madhawap/master ... fix to permissions.xml	2016-07-08 16:12:22 +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
Dulitha Wijewantha (Chan)	9341faf021	Fixed minor bug on db script for postgreSQL	2016-07-06 19:47:44 -07:00
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