319 Commits

Author	SHA1	Message	Date
mharindu	d08f691886	Fixed issue in webapp-publisher-config.xml	2016-05-17 12:30:05 +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	16a8f61f79	Refactored jwt authenticator	2016-05-17 08:48:55 +05:30
charitha	25cff47335	Moved email templates to emm base plugin as they are related to emm	2016-05-16 21:11:31 +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	f2ac5c5cad	Implemented extended scope validator and improved webapp publisher to support Synapse	2016-05-16 11:46:30 +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
geethkokila	362cf40d85	Fixing the operation activity id issues	2016-05-13 00:25:13 +05:30
mharindu	fd39b31369	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-12 22:00:24 +05:30
mharindu	1f21144668	Renamed EMM permission to CDMF	2016-05-12 22:00:15 +05:30
ayyoob	42dde2c8eb	updated property	2016-05-12 19:17:31 +05:30
ayyoob	df473e4284	revert back	2016-05-12 13:49:32 +05:30
ayyoob	34f1f4dfe2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport	2016-05-12 13:41:08 +05:30
charitha	18957b0110	Add required jagerry modules for the app	2016-05-11 19:30:55 +05:30
dilanua	e151bca0c7	Adding device-identification attribute for database views in dashboard analytics feature	2016-05-11 16:25:00 +05:30
dilanua	754195bee6	Adding mssql support to dashboard analytics feature	2016-05-11 12:01:39 +05:30
Dilan U. Ariyaratne	c9eed309aa	Merge pull request #238 from dilee/master ... Fixed errors in MSSQL DB script	2016-05-11 11:08:14 +05:30
Dileesha Rajapakse	e055519d4c	Fixed errors in MSSQL DB script	2016-05-11 11:02:43 +05:30
mharindu	b58e2b13c6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-11 10:50:46 +05:30
mharindu	5ad8d2938e	Fixed issues of publishing APIs to synapse gateway	2016-05-11 10:50:32 +05:30
dilanua	adec59e934	Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature	2016-05-10 15:26:20 +05:30
Dileesha Rajapakse	cb5736854a	Fixed issues in Oracle DB script	2016-05-10 14:58:02 +05:30
Dileesha Rajapakse	de08e96646	Fixed errors in PostgreSQL script	2016-05-09 14:35:45 +05:30
dilanua	13c5fe3d1b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-05-09 12:33:34 +05:30
dilanua	0ab4035b37	Adding H2, MySQL Support for dashboard analytics feature	2016-05-09 12:33:11 +05:30
Kasun Delgolla	4cb7b86f4c	Fixing SQL errors	2016-05-09 12:20:43 +05:30
ayyoob	c165156dcd	remove imports	2016-05-09 01:05:08 +05:30
ayyoob	5f302fce63	removed unused code and resolved host issues	2016-05-04 01:19:56 +05:30
geethkokila	e4b400a5e7	Disabling device analytics publishing by default	2016-05-02 10:45:10 +05:30
geethkokila	3396a5066d	Adding changes for the updated time of device info and device location	2016-04-29 22:30:07 +05:30
geethkokila	5a77e08fd5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 17:57:05 +05:30
dilanua	2a55c50ad1	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 13:58:58 +05:30
dilanua	2b62eac4f5	Adding temporary development code bits for dashboard analytics feature	2016-04-27 13:58:53 +05:30
geethkokila	4029c86da4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-27 10:26:51 +05:30
geethkokila	2fb42518b6	Adding the changes for the device group with policy.	2016-04-27 10:26:47 +05:30
prabathabey	95d3b97c5f	Code cleanup	2016-04-26 15:59:22 +05:30
geethkokila	f1aeb1a846	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-24 08:38:28 +05:30
geethkokila	37e431d6a0	Adding the h2.sql for resolving conflicts	2016-04-24 08:33:57 +05:30
dilanua	274aa0ecd3	Adding temporary development code bits for cdmf-product dashboard feature	2016-04-22 10:48:42 +05:30
dilanua	a888cf39c0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-04-21 13:32:58 +05:30
Prabath Abeysekara	8ced6cf38e	Merge pull request #211 from charithag/master ... Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins	2016-04-19 13:36:37 +05:30
charithag	516155dae5	Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins	2016-04-18 16:39:35 +05:30
ayyoob	afe965e787	adding code review changes on JWT and API App registration	2016-04-14 19:55:55 +05:30
dilanua	c7af1a1e23	Adding temporary development code bits of dashboard analytics feature	2016-04-08 15:22:36 +05:30
dilanua	ce8d4b53a2	Adding temporary development code bits of dashboard analytics feature	2016-04-08 15:10:01 +05:30
Kasun Delgolla	4e57e5bc85	Committing restructuring mdm-admin + UI merging style fixes	2016-04-07 10:42:56 +05:30
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	562ced1be7	Added api application extension feature	2016-03-31 00:10:40 +05:30