27 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Milan Perera	7cd95d51a5	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-06 16:48:02 +05:30
Milan Perera	c650c65c38	Refactored scopes strings	2017-01-06 10:10:45 +05:30
ayyoob	fddf834ee7	removed provider tenant domain and user from the web.xml	2017-01-05 17:57:04 +05:30
Milan Perera	f173426c1b	Fixed conflicts and merged	2017-01-03 10:43:55 +05:30
WSO2 Builder	c15234c371	[maven-release-plugin] prepare for next development iteration	2016-12-24 03:15:18 +00:00
WSO2 Builder	4e9cc26ea0	[maven-release-plugin] prepare release v3.0.4	2016-12-24 03:13:35 +00:00
Milan Perera	05b178f9f1	Fixed conflicts and merged	2016-12-14 09:20:42 +05:30
WSO2 Builder	e8f1b14b7e	[maven-release-plugin] prepare for next development iteration	2016-12-09 05:46:04 +00:00
WSO2 Builder	d088aa01ea	[maven-release-plugin] prepare release v3.0.3	2016-12-09 05:43:17 +00:00
Milan Perera	aa68d5242e	Commiting permission-scope mapping improvements	2016-12-08 20:41:44 +05:30
Harshan Liyanage	d8c382a05d	Resolved conflicts with release-3.0.x	2016-12-08 18:07:14 +05:30
Harshan Liyanage	c0d4689005	Resolved conflicts	2016-12-08 16:40:18 +05:30
GPrathap	ccf117b21d	added expiration time of application access token	2016-12-05 09:57:10 +05:30
WSO2 Builder	cea3d593bf	[maven-release-plugin] prepare for next development iteration	2016-12-01 13:52:49 +00:00
WSO2 Builder	cd6806c6ad	[maven-release-plugin] prepare release v3.0.2	2016-12-01 13:50:48 +00:00
WSO2 Builder	fe6accf78f	[maven-release-plugin] prepare for next development iteration	2016-11-25 09:14:26 +00:00
WSO2 Builder	0f3e47bb46	[maven-release-plugin] prepare release v3.0.1	2016-11-25 09:11:13 +00:00
ayyoob	a015e5529d	removed device type and feature annotation	2016-11-21 20:55:12 +05:30
ayyoob	d1712656d5	Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0	2016-11-21 19:18:32 +05:30
GPrathap	eb9652a13c	removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations	2016-11-20 19:04:11 +05:30
ayyoob	8f2895daf3	changed device access verification approach	2016-11-20 02:37:42 +05:30
WSO2 Builder	e070efd257	[maven-release-plugin] prepare for next development iteration	2016-11-16 13:57:06 +00:00
WSO2 Builder	99cbbd2eb0	[maven-release-plugin] prepare release v3.0.0	2016-11-16 13:55:17 +00:00
charitha	85292f06c8	Update component versions for IoTS-1.0.0 release	2016-11-16 13:32:45 +05:30
GPrathap	fa3c5ae29f	changing MQTT message broker port to 1886	2016-11-08 15:59:04 +05:30
Ace	14455efd97	merging changes with upstream ... partial	2016-11-04 19:41:33 +05:30
Ace	4d0c0d2af9	restructuring iot-plugins ... removing mobile/iot base plugins and other restructuring	2016-11-04 19:16:44 +05:30