762 Commits

Author	SHA1	Message	Date
charitha	5ff3ba3fcc	Fix issue in showing dynamic icons	2017-03-21 11:14:27 +05:30
Susinda	5d10575de8	Merge remote-tracking branch 'upstream/master'	2017-03-16 18:04:52 +05:30
Susinda	dc0606f207	Fixing typo in above commit	2017-03-16 17:24:19 +05:30
Susinda	96d45d006d	Fixing #645 , when password is changed redirect to logout	2017-03-16 17:21:48 +05:30
Amal Gunatilake	f93bac489f	Merge pull request #654 from susinda/master ... Fixing #644	2017-03-16 15:37:56 +05:30
Susinda	226db9a230	Fixing #644	2017-03-16 15:28:45 +05:30
Amal Gunatilake	5ef2d9d121	Merge pull request #653 from susinda/master ... Typo Fxed	2017-03-16 15:06:52 +05:30
Susinda	b3295ca2ef	Typo Fxed	2017-03-16 15:03:48 +05:30
Amal Gunatilake	dbf657fae8	Merge pull request #640 from susinda/master ... Fixing: https://github.com/wso2/carbon-device-mgt/issues/639	2017-03-16 10:48:26 +05:30
Kamidu Sachith Punchihewa	14d517e89d	Merge pull request #641 from wso2/cloud-3.1.0 ... Cloud related fixes	2017-03-15 17:47:26 +05:30
Susinda	cd4902f8ab	phoneNumber -> PhoneNumber	2017-03-15 16:04:06 +05:30
Susinda	a539775583	Fixing carbon-device-mgt/issues/639	2017-03-14 17:41:35 +05:30
amalhub	2c0ac79dce	Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/637	2017-03-14 17:07:16 +05:30
kamidu	6fe7470af5	re enabling device renaming	2017-03-14 14:29:36 +05:30
kamidu	3ff2c9894f	role filtering for device cloud is enabled	2017-03-14 14:06:22 +05:30
Kamidu Punchihewa	e063fd0da9	code cleanup results	2017-03-13 17:11:07 +05:30
Kamidu Punchihewa	e6333438b9	ading role filtering and ui fixes	2017-03-13 17:01:54 +05:30
Susinda	e23aaa6647	Adding Hasunie's fix on initialOperations implementation	2017-03-10 11:54:43 +05:30
Susinda Perera	7c9659ed29	Merge pull request #1 from susinda/cloud-3.1.0 ... Cloud 3.1.0	2017-03-09 12:44:36 +05:30
kamidu	0fade6aa9f	remove the cloud related config from config.jason	2017-03-08 15:54:08 +05:30
kamidu	dd26f366df	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-03-08 12:50:07 +05:30
kamidu	f9a03133fa	device cloude related ui improvements	2017-03-08 12:49:52 +05:30
ayyoob	5e4b0564b7	added permission fix for operation and synchronised application creation to avoid duplicate subscription	2017-03-03 17:02:36 +05:30
ayyoob	6a0c0cb299	added default permissions	2017-03-02 20:27:32 +05:30
ayyoob	d66e439f49	added carbon local ip as config	2017-03-02 14:05:57 +05:30
ayyoob	c088a9bc93	fixed api subscribe issue for device specific app creation	2017-03-01 23:26:17 +05:30
Kamidu Sachith Punchihewa	8e530b0523	adding the removed tenant based token handlers	2017-02-28 21:16:21 +05:30
lakshani	9e5574dccc	Adding commit 'added change device status to device view page'	2017-02-28 21:09:05 +05:30
lakshani	3f90b403c0	Adding lakshani's commit 'updated device status button'	2017-02-28 21:03:53 +05:30
charitha	7374a0825d	Fix https://wso2.org/jira/browse/IOTS-436	2017-02-28 20:56:32 +05:30
kamidu	b7e3b28722	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-20 18:20:14 +05:30
kamidu	4e16e29b1c	removing group sharing	2017-02-20 18:20:04 +05:30
Imesh Chandrasiri	3c90f8ad49	temporary removal of view analytics	2017-02-20 17:19:20 +05:30
Imesh Chandrasiri	8cf92e8a5b	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-20 15:11:08 +05:30
Imesh Chandrasiri	a938d57a65	Removing analytics link from groups listing	2017-02-20 15:11:00 +05:30
Kamidu Sachith Punchihewa	587c798f09	Merge pull request #613 from Kamidu/cloud-3.1.0 ... remove tennent related token handlers	2017-02-19 21:49:58 +05:30
Kamidu Sachith Punchihewa	4a5c99af78	remove tennent related token handlers	2017-02-19 21:49:19 +05:30
Imesh Chandrasiri	5097416d69	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-19 19:34:35 +05:30
Imesh Chandrasiri	368647f176	Temporary advance search removal commit	2017-02-19 19:34:28 +05:30
Kamidu Sachith Punchihewa	112efda8d5	Merge pull request #611 from Kamidu/cloud-3.1.0 ... removing device edit option	2017-02-19 18:45:07 +05:30
Kamidu Sachith Punchihewa	0da8847787	removing device edit option	2017-02-19 18:44:39 +05:30
Imesh Chandrasiri	f5e5dce872	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-19 18:25:07 +05:30
Imesh Chandrasiri	ee209064e3	Tooltip css fix	2017-02-19 18:24:59 +05:30
Kamidu Sachith Punchihewa	367dc1a30b	resolving return type issue in group mgt	2017-02-19 17:48:11 +05:30
Kamidu Sachith Punchihewa	527b844ee3	Error handled on the user session invalidation	2017-02-19 16:03:49 +05:30
Kamidu Sachith Punchihewa	318fbf9215	role loading issues	2017-02-19 15:54:53 +05:30
Kamidu Sachith Punchihewa	282801c814	updating cloud dashboard	2017-02-19 15:32:28 +05:30
kamidu	7480ccaa15	fixing datatable issues	2017-02-17 17:56:29 +05:30
kamidu	3e061f6e8b	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0	2017-02-17 16:29:22 +05:30
kamidu	6a67f251ac	cloud related ui fixs	2017-02-17 16:29:11 +05:30