1585 Commits

Author	SHA1	Message	Date
Shabirmean	adec5cc303	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-06-08 12:01:32 +05:30
Sahan Kariyawasam	35f43a60e7	Added Dashboard server url property	2016-06-07 19:18:03 +05:30
Shabirmean	a55dc9bce8	Adding necessary imports for the Certificate generation from CSR	2016-06-07 09:29:54 +05:30
Shabirmean	4380f7e242	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-06-06 19:13:56 +05:30
mharindu	de72cc21c6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-06-06 15:52:57 +05:30
mharindu	3858920d72	Changed HTTPS Url	2016-06-06 15:52:22 +05:30
ayyoob	bb051deebc	added https url for jaggery app deployment server	2016-06-06 13:55:05 +05:30
ayyoob	c5a997b1bf	added missing imports	2016-06-06 10:42:31 +05:30
mharindu	a80ca2d696	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-06-06 09:10:07 +05:30
GPrathap	efb71d472a	changing sso default state	2016-06-05 23:21:39 +05:30
GPrathap	e23044d59d	fixing jira:IOTS-195	2016-06-05 23:15:54 +05:30
Shabirmean	cbd42d2026	Changes to the certificate generators to fetch the Certificate alias from the Unique Identifier set in the CSR	2016-06-02 17:13:09 +05:30
mharindu	cfe24229fc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-31 16:19:03 +05:30
charitha	92a732cd41	Moved redundant texts to constants	2016-05-31 11:30:36 +05:30
charitha	e2c03adec4	FIx for https://wso2.org/jira/browse/IOTS-169	2016-05-31 11:14:37 +05:30
hasuniea	20343d9349	fixed swagger message issue	2016-05-30 13:03:21 +05:30
mharindu	71eb657e52	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-28 21:05:09 +05:30
geethkokila	ed0da9e1d0	Fixing the device informations to get the applications	2016-05-28 03:12:10 +05:30
geethkokila	ecc8b5e6f2	Fixing the api issues	2016-05-28 02:02:43 +05:30
geethkokila	0221782533	Adding new apis for getting the device location when list of device identifiers are supplied	2016-05-28 01:57:36 +05:30
dilanua	f4f47cbfdd	Changing view names to fix oracle naming issues in dashboard analytics feature	2016-05-28 00:41:21 +05:30
geethkokila	6328d35797	Changing the device info object by adding the application list	2016-05-28 00:19:04 +05:30
Madhawa Perera	4b128a6ebd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-27 22:15:53 +05:30
Madhawa Perera	d805245ffc	added username field to the device certificate db and related changes	2016-05-27 22:15:21 +05:30
Hasunie	981db24ca8	Merge pull request #279 from hasuniea/master ... add certificate feature	2016-05-27 19:48:49 +05:30
hasuniea	271170c26e	refactored cert feature	2016-05-27 18:42:24 +05:30
ayyoob	e03be5183d	updated JWT Authenticator implementation to support tenancy	2016-05-27 14:01:54 +05:30
prabathabey	ebefd60533	Renaming TenantConfiguration as PlatformConfiguration	2016-05-27 11:22:54 +05:30
ayyoob	c9cd051a6b	subscribed to super tenant apis	2016-05-27 02:20:15 +05:30
ayyoob	e8b9f03748	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-27 01:27:32 +05:30
Milan Perera	4462c353b4	Merge pull request #277 from ayyoob/transport ... Fixed https://wso2.org/jira/browse/IOTS-177	2016-05-26 21:21:06 +05:30
geethkokila	86e564713d	Adding the changes for getting activity ids which are changes after a certain time	2016-05-26 21:16:01 +05:30
geethkokila	01e3cc4987	Fixing the activity related issues	2016-05-26 18:44:12 +05:30
hasuniea	ad7fa09e32	add certificate service	2016-05-26 18:11:07 +05:30
ayyoob	5532db6dd4	Fixed https://wso2.org/jira/browse/IOTS-177	2016-05-26 17:10:37 +05:30
mharindu	52388ed33d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim	2016-05-26 12:44:36 +05:30
mharindu	106be76118	Fixed issues of API publishing to gateway	2016-05-26 12:41:20 +05:30
hasuniea	c281b6a6f0	SCEP csr sign feature	2016-05-25 18:14:28 +05:30
hasuniea	7281abf876	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-25 18:11:29 +05:30
Milan Perera	67e5a5a23a	Merge pull request #275 from GPrathap/master ... added a bundleDef :net.minidev:json-smart	2016-05-25 14:56:36 +05:30
GPrathap	78475963e3	added entry for websocket url	2016-05-25 14:38:46 +05:30
inoshperera	deb4195f7a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-25 13:54:42 +05:30
hasuniea	ad1a4cbd6a	fixed code conflicts	2016-05-25 13:51:46 +05:30
hasuniea	e2e517d7ca	SCEP endpoint	2016-05-25 13:44:42 +05:30
inoshperera	a40e44899a	syncing REST apis of core and product EMM	2016-05-25 12:38:24 +05:30
Ruwan	98f8ace1ff	Merge pull request #274 from rasika90/master ... Adding licence headers for server-side handlebar templates	2016-05-25 11:45:12 +05:30
geethkokila	c64a6e0ec5	Changing apis to return activity when an operation is added	2016-05-25 11:42:44 +05:30
Rasika Perera	d7f4a39075	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-25 11:34:51 +05:30
Rasika Perera	b879927dc1	Adding licence headers for handlebar templates	2016-05-25 11:28:24 +05:30
geethkokila	afba711969	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-25 08:16:14 +05:30