3030 Commits

Author	SHA1	Message	Date
Imesh Chandrasiri	9d80fcfd54	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-14 22:38:27 +05:30
Imesh Chandrasiri	7bc5d35746	data table padding fix	2017-02-14 22:38:09 +05:30
Kamidu Sachith Punchihewa	4d02f9971e	Merge pull request #591 from Kamidu/cloud-3.1.0 ... enable cloud related configurations to the devicemgt application	2017-02-14 22:29:25 +05:30
Rasika Perera	d92c52b89b	Adding cloud error pages for jaggery.conf	2017-02-14 19:49:41 +05:30
Rasika Perera	8931478a55	Moving error into common logic page. If in cloud mode; change "default": "uuf.page.error" into "default": "cdmf.page.error" in config.json	2017-02-14 19:38:11 +05:30
kamidu	aba4ceaf76	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-14 19:28:22 +05:30
kamidu	587f847934	ui improvements to device cloud	2017-02-14 19:28:09 +05:30
Milan Perera	28606f1729	Merge pull request #598 from ayyoob/210releasepatch ... 210releasepatch	2017-02-14 15:52:05 +05:30
Imesh Chandrasiri	c26d7fd15d	Changed device loading icon for device loading page	2017-02-14 15:15:38 +05:30
Imesh Chandrasiri	dcb29b7792	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-14 14:48:48 +05:30
Imesh Chandrasiri	5a7fa99e0a	Fix data table icon padding issue	2017-02-14 14:48:38 +05:30
Rasika Perera	fbae181f07	Fixing footer getting cluttered on /devicemgt/devices/search page	2017-02-14 14:46:17 +05:30
Imesh Chandrasiri	b579870672	Data table icon cursor added	2017-02-14 13:21:59 +05:30
Imesh Chandrasiri	23edb1de7a	Model Popup title space issue fix	2017-02-14 10:23:58 +05:30
Imesh Chandrasiri	8bbb612de6	Fixing cloud header height issue and theme color	2017-02-13 16:06:28 +05:30
kamidu	8a07639d6b	Fix responsive issue in clud header	2017-02-10 03:25:01 +05:30
kamidu	6e19ec31e3	fix url issues in the config.json	2017-02-10 02:47:25 +05:30
kamidu	b946eeae74	fix url issues in the config.json	2017-02-09 23:24:15 +05:30
kamidu	f772b35769	enable cloud related configurations to the devicemgt application	2017-02-09 20:15:49 +05:30
kamidu	4eaf2b41c8	enable cloud related configurations to the devicemgt application	2017-02-09 20:02:28 +05:30
ayyoob	dac7d3c1ee	made device management to be default tag	2017-02-09 09:59:06 +05:30
ayyoob	67ae4c7c68	fixed api subscription issue	2017-02-09 09:11:22 +05:30
ayyoob	6c96d228ae	added subscription fix	2017-02-09 03:02:56 +05:30
ayyoob	018b230b5a	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-08 13:12:30 +05:30
ayyoob	87910bc92b	transferred mutual authenticator to jwt authenticator	2017-02-08 13:10:36 +05:30
kamidu	ddef86e226	stylish issues	2017-02-07 20:38:10 +05:30
kamidu	9cba33a6dc	Modification to the header panel	2017-02-07 15:28:19 +05:30
kamidu	fd3ff5496c	cloud relatd ui fixes	2017-02-06 17:23:28 +05:30
Kamidu Sachith Punchihewa	00b1f982c6	Update user-menu.hbs	2017-02-06 12:01:27 +05:30
ayyoob	ed7b67dd24	made it accept tenant domain as parameter	2017-02-06 03:47:27 +05:30
ayyoob	b7566f4e4a	added artifact deployment support through UI	2017-02-05 17:51:48 +05:30
ayyoob	0999bb70a0	exposed artefact deployment through api ... Merged Jasintha’s code	2017-02-05 17:51:15 +05:30
ayyoob	274d3e9aeb	used jwt grant type instead of saml	2017-02-04 20:51:56 +05:30
Kamidu Sachith Punchihewa	559fe98cc9	Merge pull request #585 from wso2/master ... Cloud ui fixes and the new master fixes	2017-02-03 17:24:49 +05:30
WSO2 Builder	54a278a1bc	[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration	2017-02-03 16:08:26 +05:30
WSO2 Builder	3bc46c4d2d	[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15	2017-02-03 16:08:12 +05:30
kamidu	befa75af9a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2017-02-03 12:44:09 +05:30
kamidu	6af09cdd31	Remove the defaut black color for icons	2017-02-03 12:44:01 +05:30
WSO2 Builder	1bc8f5c28d	[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration	2017-02-02 15:56:43 +05:30
WSO2 Builder	1483503790	[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14	2017-02-02 15:56:36 +05:30
Hasunie	54d0d7a5ee	Merge pull request #582 from charithag/master-update-swagger-docs ... Update swagger docs	2017-02-02 14:59:06 +05:30
kamidu	41fd402619	DIABLE CLOUD UI IN THE MASTER	2017-02-02 13:13:39 +05:30
kamidu	43b0d1f1ce	Enable appstore and app publisher	2017-02-02 13:07:41 +05:30
Milan Perera	701d6e4522	Updated the snapshot version of intergration client	2017-02-01 12:55:56 +05:30
Milan Perera	a5f41ef734	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud	2017-02-01 12:14:59 +05:30
ayyoob	1387d326ca	merged with origin	2017-02-01 00:08:14 +05:30
ayyoob	4ec7762a5c	made it use the default saml grant type	2017-01-31 23:06:19 +05:30
Milan Perera	41353f8014	Fixed issues in scope validation feature	2017-01-31 16:37:33 +05:30
kamidu	4b396cf321	enable location without das	2017-01-31 13:41:49 +05:30
ayyoob	38f61adf94	few changes after testing multi tenancy	2017-01-30 22:14:26 +05:30