68 Commits

Author	SHA1	Message	Date
ayyoob	e66311b844	fixed few multi tenant issues	2017-02-06 03:47:54 +05:30
ayyoob	00feadac97	fixed validation url property	2017-02-05 21:49:37 +05:30
Kamidu Sachith Punchihewa	68b36babe6	Merge pull request #575 from wso2/master ... UI fixes for device cloud	2017-02-03 16:53:19 +05:30
ayyoob	56de095599	resolved app connector build slowness issue	2017-02-03 05:00:57 +05:30
WSO2 Builder	d7e4580e77	[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration	2017-02-02 16:06:06 +05:30
WSO2 Builder	1737eaaa79	[WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11	2017-02-02 16:05:58 +05:30
ayyoob	e0f6e9579d	fixed multi tenant issues after testing	2017-02-02 03:17:19 +05:30
ayyoob	2cfc4540f4	Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into cloud-3.1.0	2017-02-02 01:59:53 +05:30
ayyoob	50d8aedade	fixed analytics multi tenant issues	2017-02-02 01:59:48 +05:30
Milan Perera	99782e6360	Resolved conflicts and merged	2017-02-01 14:13:01 +05:30
WSO2 Builder	7034dae2b5	[maven-release-plugin] prepare for next development iteration	2017-01-31 12:58:56 +05:30
WSO2 Builder	a2224f96ff	[maven-release-plugin] prepare release v3.0.10	2017-01-31 12:58:45 +05:30
lakshani	67663449d2	removed unwanted versions from the pom	2017-01-31 11:02:49 +05:30
lakshani	1319806a6c	removed snapshot versions	2017-01-30 19:32:26 +05:30
lakshani	f62e7021d6	updated the pom to latest version	2017-01-30 19:03:30 +05:30
lakshani	8f53a05962	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-01-30 18:44:33 +05:30
lakshani	fff1a3f168	fixed the issues in rest connector	2017-01-30 18:44:23 +05:30
WSO2 Builder	4554d8929d	[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration	2017-01-30 18:07:35 +05:30
WSO2 Builder	da7c040224	[WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9	2017-01-30 18:07:24 +05:30
lakshani	ffdcd2b217	updated pom based on review comments	2017-01-30 11:45:19 +05:30
lakshani	ebc6c6ec11	added java doc comments	2017-01-30 09:41:39 +05:30
lakshani	d6b6da9c14	added rest-connector	2017-01-30 09:29:33 +05:30
ayyoob	036d6936a7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-25 14:05:36 +05:30
GPrathap	21abaa8270	changed websocket token retrieval mechanism	2017-01-25 11:24:41 +05:30
ayyoob	4f1f1a3e7e	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-24 19:46:39 +05:30
WSO2 Builder	e64fe695ab	[maven-release-plugin] prepare for next development iteration	2017-01-20 13:36:50 +00:00
WSO2 Builder	5fbd40c579	[maven-release-plugin] prepare release v3.0.8	2017-01-20 13:31:44 +00:00
WSO2 Builder	9687362258	[maven-release-plugin] prepare for next development iteration	2017-01-20 02:04:54 +00:00
WSO2 Builder	ee063a1a43	[maven-release-plugin] prepare release v3.0.7	2017-01-20 02:03:09 +00:00
ayyoob	f1e75d9375	apim seperation	2017-01-18 01:48:43 +05:30
WSO2 Builder	3f1b7a6005	[maven-release-plugin] prepare for next development iteration	2017-01-14 12:22:40 +00:00
WSO2 Builder	91a0edb0a0	[maven-release-plugin] prepare release v3.0.6	2017-01-14 12:17:46 +00:00
ayyoob	09f7fb3a5f	moved the traffic through the gateway	2017-01-13 04:49:35 +05:30
ayyoob	466c2b1151	moved to gateway mode	2017-01-12 19:29:59 +05:30
ayyoob	1df7d20a81	moved common configuration to global properties for input and output adapters	2017-01-08 21:26:14 +05:30
ayyoob	4cb6aca5b0	merge with upstream	2017-01-08 01:32:16 +05:30
ayyoob	ccaf47112a	removed DCR, added global configuration values for input and output adapter	2017-01-08 01:20:04 +05:30
WSO2 Builder	b10579950b	[maven-release-plugin] prepare for next development iteration	2017-01-07 11:25:51 +00:00
WSO2 Builder	b7a5454c2f	[maven-release-plugin] prepare release v3.0.5	2017-01-07 11:22:33 +00:00
Maninda	0c7f1adcba	Fixed some issues reported with FindBugs while security plugin is enabled.	2017-01-05 19:36:52 +05:30
WSO2 Builder	227d4685c9	[maven-release-plugin] prepare for next development iteration	2016-12-24 03:15:18 +00:00
WSO2 Builder	6c38ce6385	[maven-release-plugin] prepare release v3.0.4	2016-12-24 03:13:35 +00:00
Ace	8ac0971a24	Updating identity dependencies to latest	2016-12-22 11:01:56 +05:30
Ace	6697dbcc59	upgrading to latest version of identity	2016-12-19 11:38:12 +05:30
Megala	600e2529bd	Fixing race conditions in refresh token generation	2016-12-16 14:10:38 +05:30
Megala	ec5936d013	Updating the apk file to switch between event enabling and disabling	2016-12-13 19:37:42 +05:30
WSO2 Builder	a398686ec7	[maven-release-plugin] prepare for next development iteration	2016-12-09 05:46:04 +00:00
WSO2 Builder	3bafccc303	[maven-release-plugin] prepare release v3.0.3	2016-12-09 05:43:17 +00:00
charitha	a49a5650c6	Fix issues	2016-12-08 20:07:16 +05:30
Harshan Liyanage	559fa3fe38	Resolved conflicts	2016-12-08 16:40:18 +05:30