3344 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
sinthuja	ff6b1e32b2	Fixing the virtual fire alarm device types.	2017-05-04 21:41:34 +05:30
sinthuja	485ddfc53d	Fixing the ardino and raspberry device types.	2017-05-04 16:30:14 +05:30
sinthuja	1cfef0cd9b	Adding cloud p2.inf for the analytics features as well.	2017-05-04 15:33:56 +05:30
sinthuja	d720fa1db6	Removing the obsolete android sense aggregated feature.	2017-05-04 15:22:07 +05:30
sinthuja	ef84791510	Finishing the android sense feature into sub features UI/BE/Analytics.	2017-05-04 15:21:24 +05:30
Ayyoob Hamza	d50b436ed7	Merge pull request #670 from wso2/revert-667-git_issue_666 ... Revert "Fixing cannot install androidsense device type into current pack"	2017-05-03 21:31:05 +05:30
Rasika Perera	1df315cb29	Revert "Fixing cannot install androidsense device type into current pack"	2017-05-03 21:26:55 +05:30
Amal Gunatilake	ba91b8961b	Merge pull request #667 from rasika/git_issue_666 ... Fixing cannot install androidsense device type into current pack	2017-05-03 20:52:14 +05:30
sinthuja	ff9efe1c76	Merge branch 'wso2-master'	2017-05-03 16:39:31 +05:30
sinthuja	a524a8dee5	Adding android sense ui feature.	2017-05-03 16:36:42 +05:30
sinthuja	33b77942fd	Merge pull request #669 from ruwany/master ... Adding a build profile for cloud	2017-05-03 16:35:18 +05:30
Ace	637b1d4e0a	merging and including profile specific p2.inf files	2017-05-03 16:29:15 +05:30
Ace	34c9e1cd82	Adding a build profile for cloud	2017-05-03 16:26:14 +05:30
sinthuja	e989103b9b	Merge pull request #661 from amalhub/master ... Updating carbon.devicemgt.version	2017-05-03 15:40:20 +05:30
Amal Gunatilake	f5093774df	Merge branch 'master' into master	2017-05-03 14:41:32 +05:30
Amal Gunatilake	738a6bfcd1	Updating carbon.devicemgt.version	2017-05-03 14:40:23 +05:30
WSO2 Builder	2db4069053	[WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration	2017-05-02 20:47:53 +05:30
WSO2 Builder	902d7e3cf2	[WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31	2017-05-02 20:47:39 +05:30
Amal Gunatilake	ddc1e8bef4	Merge pull request #663 from janakamarasena/master ... Add synapse configs to handle mutual ssl auth for android	2017-05-02 20:28:37 +05:30
Janak Amarasena	477ff6faee	Changed CDM version	2017-05-02 17:30:58 +05:30
Geeth	5597d4370b	Merge pull request #668 from warunalakshitha/master ... Push notification scheduler Task	2017-05-02 17:04:22 +05:30
Janak Amarasena	67510b007f	Removed unwanted handlers	2017-05-02 17:02:53 +05:30
warunalakshitha	543e68771e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2017-05-01 20:53:24 +05:30
WSO2 Builder	e2becd3169	[WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration	2017-05-01 19:57:06 +05:30
WSO2 Builder	85c36c0ca8	[WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30	2017-05-01 19:56:48 +05:30
Ayyoob Hamza	b71699dd13	Merge pull request #664 from rasika/master ... Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue	2017-05-01 19:40:08 +05:30
Rasika Perera	9d00038199	#665 : Added some improvements to the fix	2017-05-01 19:38:16 +05:30
Rasika Perera	f7dbc156b3	#665 : Added some changes to reuse PropertyUtils.replaceTenantDomainProperty()	2017-05-01 19:15:11 +05:30
Rasika Perera	f3a817939d	#666 : Fixing cannot install androidsense device type into current pack	2017-05-01 19:03:11 +05:30
Rasika Perera	be99ca571b	#665 : Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue	2017-05-01 18:54:01 +05:30
warunalakshitha	568538cc13	add comments for performance configs	2017-04-30 13:58:49 +05:30
Janak Amarasena	7db99295f5	Add synapse configs to handle mutual ssl auth for android	2017-04-28 16:58:21 +05:30
WSO2 Builder	c3fb32f3bc	[WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare for next development iteration	2017-04-28 10:33:09 +05:30
WSO2 Builder	1b0047c39f	[WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29	2017-04-28 10:32:49 +05:30
Ayyoob Hamza	5397fc3563	Merge pull request #662 from Megala21/master ... Adding security filters for secured-websocket war	2017-04-28 10:05:29 +05:30
WSO2 Builder	99e587eb78	[WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare for next development iteration	2017-04-28 08:38:44 +05:30
WSO2 Builder	9b8929a8cd	[WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28	2017-04-28 08:38:35 +05:30
Kamidu Sachith Punchihewa	6759a99ae9	Merge pull request #657 from rasika/master ... Fixing Android policy view and policy edit doesn't honor isCloud enabled param	2017-04-28 07:58:30 +05:30
megala21	d1ee78eaed	Adding security filters for websocket web.xml	2017-04-27 17:37:17 +05:30
Amal Gunatilake	d98d9c7c7a	Adding Java 8 build status badge	2017-04-27 12:44:18 +05:30
sameera910409	08adfda735	fix multi tenant issues in windows device enrollment	2017-04-27 10:32:05 +05:30
ayyoob	155135a70d	fixed few issues after testing analytics	2017-04-26 01:34:57 +05:30
Rasika Perera	511c61175c	#654 : Fixing Android policy view and policy edit doesn't honor isCloud enabled parameter	2017-04-25 14:46:55 +05:30
WSO2 Builder	1a91d1ddc0	[WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare for next development iteration	2017-04-25 13:14:01 +05:30
WSO2 Builder	426a016c37	[WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare release v3.0.27	2017-04-25 13:13:43 +05:30
WSO2 Builder	de5ff24046	Merge commit 'dc4c32129ac05dfe6247cb060cc0949fcdf5c2ed' into db9e6dc2-9fc6-4b4a-8465-9e6ea06cdee0	2017-04-25 12:50:57 +05:30
WSO2 Builder	dc4c32129a	[WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare for next development iteration	2017-04-25 11:47:30 +05:30
WSO2 Builder	b1c6ae0e2c	[WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare release v3.0.26	2017-04-25 11:47:01 +05:30
Ruwan	db8380c5cc	Merge pull request #656 from charithag/master ... Add latest agent (3.1.16)	2017-04-25 11:36:02 +05:30
charitha	9febce0601	Add latest agent (3.1.16)	2017-04-25 11:32:20 +05:30