210 Commits

Author	SHA1	Message	Date
geethkokila	7318502697	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-31 18:07:55 +05:30
geethkokila	e60a383f4d	Adding fixes to the device search	2016-03-31 18:07:05 +05:30
ayyoob	1b4a9227d8	merged web app publisher code and refactored jwt client extension to adhere to new artefact name	2016-03-31 04:24:30 +05:30
ayyoob	83057acd9a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest	2016-03-30 23:42:47 +05:30
inosh-perera	41ba2f4f0a	adding database changes	2016-03-30 19:08:42 +05:30
ayyoob	81ae512f13	Merge pull request #6 from ayyoob/merge-devicetype ... merge device type	2016-03-30 12:20:02 +05:30
charithag	0a8e00fd1e	Merged with upstream and resolved conflicts.	2016-03-30 02:00:47 +05:30
charithag	3e4ccf6337	Add missing features and component from IoTS-1.0.0-M4	2016-03-30 01:44:04 +05:30
geethkokila	888971ae39	Fixing the oracl and postgres sql datasources and removing the start and end from the search context	2016-03-29 22:46:09 +05:30
geethkokila	aa63b5f592	Fixing the application memory usage and adding location based search	2016-03-29 17:48:36 +05:30
charithag	fa2f61f48a	Add missing parts in group management	2016-03-29 12:41:38 +05:30
ayyoob	c45895685b	Added device type multi tenancy capability.	2016-03-29 11:40:58 +05:30
prabathabey	38f3b037eb	Code cleanup	2016-03-27 21:17:33 +05:30
prabathabey	099613da73	Merging device.mgt.ui features	2016-03-27 17:29:26 +05:30
prabathabey	e9954dab4b	merging device.mgt.ui feature	2016-03-27 17:11:31 +05:30
prabathabey	284ca1b8e8	Removing obsolete source structures	2016-03-27 16:08:22 +05:30
prabathabey	43926b64b4	Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher	2016-03-27 13:01:26 +05:30
prabathabey	5dcd9dfe4a	Merging device analytics feature impl to master	2016-03-27 00:23:37 +05:30
geethkokila	e9da24c9e8	Changing the snapshot versions from 1.0.4 to 1.1.0	2016-03-24 11:41:52 +05:30
geethkokila	3a3df04331	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-21 10:33:49 +05:30
geethkokila	41191d6df0	Adding the search feature to device mgt plugin	2016-03-21 10:33:35 +05:30
inosh-perera	ef117ffa74	adding mutual SLL authentication and certificate management DAOs	2016-03-17 14:14:59 +05:30
geethkokila	7a809c1c01	Doing a partial commit	2016-03-14 11:48:43 +05:30
prabathabey	3726a57d96	Making email-sender a separate component and code cleanup	2016-03-13 00:51:54 +05:30
prabathabey	3772d54ea1	Adding an entry to p2.inf to be able to copy them to a preferred location in the product distribution	2016-03-12 16:07:08 +05:30
prabathabey	0b31042aa2	More improvements to the email sending functionality	2016-03-12 15:42:08 +05:30
geethkokila	e0e0a57c11	[maven-release-plugin] prepare for next development iteration	2016-01-05 18:15:38 +05:30
geethkokila	cebb88e712	[maven-release-plugin] prepare release v1.0.3	2016-01-05 18:15:28 +05:30
Dileesha Rajapakse	edec1452b2	Fixed EMM-1171	2016-01-05 14:16:36 +05:30
geethkokila	e66d291947	[maven-release-plugin] prepare for next development iteration	2015-12-30 14:19:05 +05:30
geethkokila	f416a73e75	[maven-release-plugin] prepare release v1.0.2	2015-12-30 14:18:57 +05:30
geethkokila	185a59fbd4	[maven-release-plugin] prepare for next development iteration	2015-12-23 22:39:29 +05:30
geethkokila	b3580d754b	[maven-release-plugin] prepare release v1.0.1	2015-12-23 22:39:20 +05:30
geethkokila	4e9255fbc9	[maven-release-plugin] prepare for next development iteration	2015-12-22 08:28:42 +05:30
geethkokila	ceb60adb34	[maven-release-plugin] prepare release v1.0.0	2015-12-22 08:28:33 +05:30
pasinduj	08387e178d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-12-21 09:37:21 +05:30
Dileesha Rajapakse	9e5891a728	Fixed EMM-1116	2015-12-18 15:34:50 +05:30
pasinduj	5ac2447080	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-12-10 17:00:35 +05:30
pasinduj	bb010bde28	modified oracle db script to remove a foriegn key	2015-12-10 16:59:03 +05:30
Dileesha Rajapakse	96366de4dd	Fixed syntax errors in sequence creation	2015-12-10 15:30:17 +05:30
pasinduj	4656a9eae7	modified all dbscripts removing a foriegn key	2015-12-10 11:43:44 +05:30
pasinduj	6e94a084a0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-12-09 10:18:10 +05:30
pasinduj	6ed2710550	revert mysql edited lines	2015-12-09 10:15:43 +05:30
pasinduj	1a7b888102	modified dbscript added missing comma	2015-12-08 16:13:35 +05:30
pasinduj	f49f13501f	modified dbscripts removing policy ID forigen key from one table	2015-12-08 15:35:01 +05:30
pasinduj	3154582abe	remove policy id foriegn key from one table	2015-12-08 13:26:51 +05:30
pasinduj	a390df68ec	modified dbscripts to remove foriegn key reference	2015-12-08 11:42:04 +05:30
Dileesha Rajapakse	799ece6b36	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-12-07 18:12:58 +05:30
geethkokila	b3e2c856a9	Fixing the end point for invititaion	2015-12-07 14:42:21 +05:30
Dileesha Rajapakse	699d92f7bd	Added DM_DEVICE_CERTIFICATE Table into SQL Scripts	2015-12-07 13:57:38 +05:30