1284 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
mharindu	34ce9108a2	Added configuration modifcation permission	2016-08-02 14:57:00 +05:30
kamidu	e0d9e1659c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-08-02 14:14:54 +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
kamidu	ea89c6685e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-08-02 10:32:44 +05:30
kamidu	6db9fc426e	Fix the addd buttton 404 issue	2016-08-01 14:34:48 +05:30
hasuniea	a8102b8c42	fixing VERIFONEEMMPROF-26	2016-08-01 14:28:52 +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
dilanua	18a9ad4b8a	Updating EMM UI conf.json	2016-07-29 18:02:44 +05:30
kamidu	a38d38a86e	Addting new nav bar without group management ui	2016-07-29 15:31:20 +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
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