244 Commits

Author	SHA1	Message	Date
mharindu	24930b3042	Partial commit of migration	2016-09-05 16:37:09 +05:30
mharindu	d7e8cc30dd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7	2016-08-24 14:56:06 +05:30
Chatura Dilan Perera	8b17cbb339	Fix conflicts	2016-08-19 15:00:57 +05:30
Chatura Dilan Perera	654e1d9938	[maven-release-plugin] prepare for next development iteration	2016-08-18 22:09:42 +05:30
Chatura Dilan Perera	aa24821667	[maven-release-plugin] prepare release v1.1.2	2016-08-18 22:09:33 +05:30
mharindu	71c71402f8	Fixed dependancy issues	2016-08-12 08:41:13 +05:30
mharindu	f5609cc8ff	Adding carbon 4.4.7 migration changes	2016-08-11 12:19:05 +05:30
hasuniea	1b07b18678	adding security fixes	2016-08-08 18:05:12 +05:30
Milan Perera	c49dc435e1	Merge pull request #319 from ayyoob/transport ... Updated grant type implementation	2016-07-28 14:14:03 +05:30
ayyoob	d5e756c205	Updated Grant Type Implementation	2016-07-27 14:43:44 +05:30
prabathabey	3afd43e14a	Reverting the carbon kernel version back to 4.4.3	2016-07-26 12:24:51 +05:30
prabathabey	ea032337d3	Changing Kernel version that carbon-device-mgt repository depends on and fixing the axiom version range	2016-07-26 11:30:28 +05:30
Chatura Dilan	4ec11e8c08	[maven-release-plugin] prepare for next development iteration	2016-07-08 19:11:40 +05:30
Chatura Dilan	ffedcac543	[maven-release-plugin] prepare release v1.1.1	2016-07-08 19:09:55 +05:30
mharindu	5de4993319	Fixed URL tampering issue	2016-06-28 17:23:39 +05:30
prabathabey	aeb4ad3295	Merging rest-api-improvements branch to master	2016-06-21 15:52:35 +05:30
ayyoob	ebebca8573	Added support for push notification for xmpp, mqtt and few changes to the after testing	2016-06-20 02:33:59 +05:30
hasuniea	57d445237a	add certificateMgtService	2016-05-31 12:48:26 +05:30
prabathabey	6e5148a374	Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services	2016-05-30 08:21:59 +05:30
dilanua	f4f47cbfdd	Changing view names to fix oracle naming issues in dashboard analytics feature	2016-05-28 00:41:21 +05:30
GPrathap	c9c0a75430	added a bundleDef :net.minidev:json-smart	2016-05-25 14:39:59 +05:30
ayyoob	feaf6b2b35	added webapp publisher missing bundle	2016-05-24 15:35:48 +05:30
mharindu	3e291c5b13	[maven-release-plugin] prepare for next development iteration	2016-05-20 16:43:16 +05:30
mharindu	9549ac446b	[maven-release-plugin] prepare release v1.1.0	2016-05-20 16:43:02 +05:30
mharindu	968cb00f35	Fixed conflicts and merged	2016-05-19 00:42:14 +05:30
prabathabey	a375252a94	Adding pluggable push notification framework	2016-05-19 00:20:45 +05:30
mharindu	82b90522a0	Migrated to APIM 5.0.4	2016-05-18 11:49:20 +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
prabathabey	a0dbb25824	Fixing code conflicts and improving swagger annotations	2016-05-13 07:12:03 +05:30
prabathabey	9e4b4d2205	Improving swagger annotations	2016-05-13 04:02:42 +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
prabathabey	bc894f2517	Adding Swagger-annotation dependency to carbon-device-mgt	2016-05-11 12:38:15 +05:30
mharindu	5ad8d2938e	Fixed issues of publishing APIs to synapse gateway	2016-05-11 10:50:32 +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
ayyoob	3a3e9cc649	changed analytics components to released version	2016-03-31 05:55:03 +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
charithag	bc0595a187	Change analytics version to 5.0.11	2016-03-30 09:14:07 +05:30
charithag	3e4ccf6337	Add missing features and component from IoTS-1.0.0-M4	2016-03-30 01:44:04 +05:30
prabathabey	501fefc2d2	Added version/version range properties for nimbus and httpclient	2016-03-27 21:55:29 +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	36161f6288	Merging extended device management functionalities	2016-03-27 16:02:40 +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