1480 Commits

Author	SHA1	Message	Date
mharindu	89026c2b7f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-17 20:33:23 +05:30
charitha	6dc0a9dd38	Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario	2016-05-17 18:40:39 +05:30
mharindu	894e11c1c4	Fixed the JWT verifier issue	2016-05-17 15:39:16 +05:30
mharindu	9ebf2ab6d9	Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt	2016-05-17 15:33:17 +05:30
charitha	ddc47cd862	Fix for https://wso2.org/jira/browse/IOTS-161	2016-05-17 14:25:28 +05:30
charitha	0ccaa9fe81	Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112	2016-05-17 13:57:47 +05:30
mharindu	5ccc480ddb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-17 12:25:57 +05:30
mharindu	efc9fc3265	Fixed conflicts	2016-05-17 08:58:54 +05:30
mharindu	16a8f61f79	Refactored jwt authenticator	2016-05-17 08:48:55 +05:30
dilanua	d5950afe7a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-17 05:55:05 +05:30
dilanua	c90f4471a8	Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature	2016-05-17 05:54:40 +05:30
charitha	9480c71522	Fixed script error	2016-05-16 21:57:48 +05:30
charitha	e0fc7c4018	Fix for https://wso2.org/jira/browse/IOTS-110	2016-05-16 21:01:33 +05:30
ayyoob	cbdf5dd175	added a simple resolution for https://wso2.org/jira/browse/APIMANAGER-4504	2016-05-16 20:41:30 +05:30
ayyoob	2ceff61811	refactors jet authenticator to pick tenant specific key store	2016-05-16 19:44:31 +05:30
charitha	81524ae32c	Fix for https://wso2.org/jira/browse/IOTS-156	2016-05-16 18:37:49 +05:30
mharindu	ace6c2dbfc	Fixed issues in JWT Authenticator	2016-05-16 18:13:00 +05:30
charitha	3d9ae8d1f6	Fix for https://wso2.org/jira/browse/IOTS-152	2016-05-16 17:50:58 +05:30
charitha	e7c5ef78d0	Removed unnecessary jaggery apis	2016-05-16 17:03:36 +05:30
mharindu	b77f5358e8	Removed external dependancies from webapp publisher component	2016-05-16 14:23:52 +05:30
mharindu	83ec18c38d	Removed external dependancies from webapp publisher component	2016-05-16 14:20:34 +05:30
mharindu	c68b92c7b4	Fixed conflicts	2016-05-16 14:12:28 +05:30
mharindu	9a4b904702	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-16 11:55:35 +05:30
mharindu	659cdcc50c	Implemented extended scope validator and improved webapp publisher to support Synapse	2016-05-16 11:47:04 +05:30
mharindu	f2ac5c5cad	Implemented extended scope validator and improved webapp publisher to support Synapse	2016-05-16 11:46:30 +05:30
Ruwan	8f0840e3df	Merge pull request #254 from ayyoob/transport ... updated authentication in api	2016-05-15 20:07:02 +05:30
ayyoob	168033b19d	updated authentication in api	2016-05-15 17:46:13 +05:30
charitha	685c52a453	Bug fixes	2016-05-15 13:13:30 +05:30
Ace	cbc505c459	changing profile name	2016-05-15 01:35:57 +05:30
Ace	4517a7f1aa	Making API publish destination configurable and other changes	2016-05-15 01:15:11 +05:30
Ace	6d9f2f92a4	Making API publish destination configurable	2016-05-15 01:12:45 +05:30
ayyoob	b3075cf1bc	removing application related roles	2016-05-14 00:10:39 +05:30
ayyoob	51d46213c2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport	2016-05-13 15:03:11 +05:30
charitha	973e1ce40f	Fix issues in group api	2016-05-13 13:52:35 +05:30
charitha	0a838923cb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... # Conflicts: # components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Group.java	2016-05-13 12:43:53 +05:30
Madhawa Perera	43648e4692	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-13 08:07:44 +05:30
Madhawa Perera	b5741b420c	Adding swagger annotations to beans	2016-05-13 08:07:28 +05:30
prabathabey	71180e686e	Improving swagger annotations	2016-05-13 07:39:09 +05:30
prabathabey	a0dbb25824	Fixing code conflicts and improving swagger annotations	2016-05-13 07:12:03 +05:30
Madhawa Perera	e75afb8020	Adding swagger annotations to beans	2016-05-13 07:07:55 +05:30
ayyoob	48912a05bb	merged with upstream	2016-05-13 05:23:19 +05:30
prabathabey	9e4b4d2205	Improving swagger annotations	2016-05-13 04:02:42 +05:30
ayyoob	bee9a106cc	removed method and type from feature	2016-05-13 02:53:08 +05:30
Madhawa Perera	94aacb1625	Adding swagger annotations to beans	2016-05-13 02:38:10 +05:30
Madhawa Perera	fca80273bc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-13 01:39:43 +05:30
Madhawa Perera	5d1bf67630	Adding swagger annotations to beans	2016-05-13 01:31:33 +05:30
inosh-perera	b2383617e1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-13 01:30:22 +05:30
inosh-perera	0cf0ec6e77	adding swagger annotations to APIs	2016-05-13 01:30:17 +05:30
Madhawa Perera	6227e93d2f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Adding swagger annotations to beans	2016-05-13 01:25:44 +05:30
Madhawa Perera	087adafeb7	Adding swagger annotations to beans	2016-05-13 01:25:29 +05:30