3698 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kamidu	fb89476e16	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-18 22:39:07 +05:30
kamidu	5f5d19fc1e	Enable location history	2017-01-18 22:38:37 +05:30
Rasika Perera	27e953cda3	API subscription permission added to [devicemgt-user] role	2017-01-18 21:29:54 +05:30
Rasika Perera	144368323f	Merge pull request #555 from inoshperera/release-2.0.x ... adding permissions necessery for UI to config.json	2017-01-18 21:00:33 +05:30
inoshperera	346fd28814	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-18 20:50:55 +05:30
inoshperera	0bb04789a6	adding permissions necessery for iOS to config.json	2017-01-18 20:48:39 +05:30
Rasika Perera	75bc56b8ee	Merge pull request #554 from milanperera/release-2.0.x ... Fixed token expiration issue in devicemgt jaggery app	2017-01-18 18:20:56 +05:30
Milan Perera	f8de4869d9	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-18 18:15:09 +05:30
Milan Perera	e9c3a0c3e8	Fixed token expiration issue	2017-01-18 18:14:55 +05:30
Rasika Perera	152ff2965a	Merge pull request #552 from Jasintha/release-2.0.x ... Fixing firearm policy push notification issue	2017-01-18 17:29:00 +05:30
Malintha	537a466884	Merge pull request #553 from sameeragunarathne/release-2.0.x ... fixed user password reset failure issue in iot console	2017-01-18 15:09:05 +05:30
sameera910409	1bec5e5186	fixed user password reset failure issue in iot console	2017-01-18 14:53:44 +05:30
Jasintha	e8ffe60e8c	Fixing firealam policy push notification issue	2017-01-18 14:27:05 +05:30
Maninda	1f5448c2a0	Corrected the caching filter pattern	2017-01-18 12:36:11 +05:30
Rasika Perera	37bef0ae62	Merge pull request #551 from DimalChandrasiri/release-2.0.x ... Fix for issue where list item operations getting fired even after cancelling list item selection	2017-01-18 11:47:13 +05:30
Imesh Chandrasiri	bdfb816ffc	Fix for issue where list item operations getting fired even after cancelling list item selection	2017-01-18 11:43:49 +05:30
Rasika Perera	3d8a18da15	Merge pull request #550 from Kamidu/release-2.0.x ... Recomended security fixes	2017-01-18 10:28:35 +05:30
kamidu	bb8985781e	removing duplicate methoads	2017-01-18 10:22:11 +05:30
kamidu	7698c12d80	removing duplicate methoads	2017-01-18 10:07:59 +05:30
kamidu	7b3db2bdd6	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-18 09:59:53 +05:30
Rasika Perera	51bd2b5bb6	UI improvement: Fixing buttons styles	2017-01-18 08:29:21 +05:30
Rasika Perera	60ac0522d8	Fixes for XSS attacks	2017-01-18 08:14:17 +05:30
kamidu	5de2a233d7	Recomended security fixes for data tables	2017-01-18 00:16:18 +05:30
Rasika Perera	2b46691405	Fixing user menu not showing issue	2017-01-17 20:17:40 +05:30
Rasika Perera	10774655b1	Merge pull request #548 from DimalChandrasiri/release-2.0.x ... Fix for sidebar trigger hide and scroll issue	2017-01-17 19:43:00 +05:30
Imesh Chandrasiri	ba506183b1	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-17 15:09:52 +05:30
Imesh Chandrasiri	34aac48071	Notification bar scroll and trigger issue fix	2017-01-17 15:09:40 +05:30
Rasika Perera	68ad05fde2	Merge pull request #546 from DimalChandrasiri/release-2.0.x ... Fix for multiple popup issue and modal js improvement	2017-01-17 11:49:05 +05:30
Maninda	8aed7c67a9	Added devicemgt web app configs to secure web app	2017-01-16 15:00:03 +05:30
Maninda	4fbab80782	Added security filters to jaggery.conf	2017-01-16 14:40:33 +05:30
Ayyoob Hamza	810bd1d2ad	Merge pull request #547 from Vishanth/release-2.0.x ... fixing sql scripts to support multi tenancy	2017-01-16 13:20:23 +05:30
Vishanth	f45528147c	fixing sql scripts to support multi tenancy	2017-01-16 13:13:58 +05:30
Rasika Perera	2206e258d1	Fixing permissions for [devicemgt-user] and [devicemgt-admin] roles	2017-01-16 09:37:52 +05:30
Imesh Chandrasiri	153e3bb719	Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x	2017-01-14 23:53:04 +05:30
Imesh Chandrasiri	6e1e801ea0	Fix for multiple popup issue	2017-01-14 23:50:34 +05:30
Rasika Perera	857df46edf	Merge pull request #545 from wso2/release-2.0.7 ... Release 2.0.7	2017-01-14 17:52:33 +05:30
WSO2 Builder	585b9bde4d	[maven-release-plugin] prepare for next development iteration	2017-01-14 01:50:45 +00:00
WSO2 Builder	d206148841	[maven-release-plugin] prepare release v2.0.7	2017-01-14 01:46:41 +00:00
Rasika Perera	b9c1141f79	Added missing utility module import	2017-01-14 07:11:26 +05:30
Rasika Perera	24a7179c4b	Merge pull request #544 from geethkokila/release-2.0.x ... Adding support for identifying the device type from the url	2017-01-13 22:41:07 +05:30
Rasika Perera	0227d5ccbb	Fixing https://wso2.org/jira/browse/IOTS-381	2017-01-13 18:00:36 +05:30
Rasika Perera	4549a34083	changed [fw-ok] with [fw-success]	2017-01-13 17:50:18 +05:30
geethkokila	bf8ab0da11	Adding support for identifying the device type from the url	2017-01-13 16:23:47 +05:30
Rasika Perera	625124da38	Merge pull request #543 from ayyoob/release-2.0.x ... Moved the traffic through the gateway and fixed cluster issues	2017-01-13 08:49:57 +05:30
ayyoob	44d09e09ea	few changes after testing the gateway	2017-01-13 04:49:17 +05:30
ayyoob	671d931d3e	merged with origin after resolving conflicts	2017-01-12 23:24:35 +05:30
ayyoob	5b3a8091ec	fixed Null pointer exception	2017-01-12 23:18:54 +05:30
Rasika Perera	864020f20e	Adding ability to add deviceType level scopes	2017-01-12 22:42:44 +05:30
Rasika Perera	f57de670ea	Adding devices:update into /devices scopes list	2017-01-12 22:42:44 +05:30
Rasika Perera	e11d2244f5	Fixing scope annotation /enrollment-invite	2017-01-12 22:42:44 +05:30