246 Commits

Author	SHA1	Message	Date
ayyoob	a294c20a2a	added device management api to be default	2017-02-09 09:59:24 +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
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
Hasunie	3b98e0f754	Merge pull request #572 from charithag/master-update-swagger-docs ... Update swagger docs	2017-02-02 14:58:11 +05:30
charitha	9bf38af4f7	Fix issues in swagger docs	2017-02-01 15:03:10 +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
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
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	9d64fd0d4b	fixed multi tenant login issue	2017-01-16 16:08:07 +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	466c2b1151	moved to gateway mode	2017-01-12 19:29:59 +05:30
Milan Perera	2eb18e304a	Change scope of android configuration	2017-01-10 11:39:09 +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
Milan Perera	77d1e684f6	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-06 16:48:02 +05:30
Rasika Perera	81c62b3a13	Merge pull request #501 from ayyoob/release-3.0.x ... made policy manager to be part of device mgt service	2017-01-06 14:15:23 +05:30
inoshperera	7da5ae239b	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-06 11:38:41 +05:30
inoshperera	22a58121d2	changing the Andrid API tag to standerdise	2017-01-06 11:38:09 +05:30
Milan Perera	86aac810ce	Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x	2017-01-06 10:11:16 +05:30
Milan Perera	d2d912fb6d	Refactored scopes strings	2017-01-06 10:10:45 +05:30
ayyoob	f603f58fd1	moved compliance payload generation code to api impl	2017-01-05 22:06:37 +05:30
Maninda	0c7f1adcba	Fixed some issues reported with FindBugs while security plugin is enabled.	2017-01-05 19:36:52 +05:30
ayyoob	54011d2197	removed provider tenant domain and user from the web.xml	2017-01-05 17:57:04 +05:30
ayyoob	3fa679a3e9	made policy manager to be part of device type mgt service	2017-01-05 14:37:27 +05:30
Madawa Soysa	1b56ebb831	Improving scope annotations in android plugin	2017-01-05 14:26:43 +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	c302d7b25a	Coorecting version import ranges	2016-12-23 09:58:28 +05:30
charitha	a4841d87ba	Add custom email template for android	2016-12-22 18:31:05 +05:30
charitha	0c2465d03e	Add enrollment invitations API EP for android	2016-12-20 23:48:21 +05:30
Ace	488c2abafa	removing slf4j from packing in the android devicemgt jaxrs	2016-12-19 15:24:02 +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
Harshan Liyanage	559fa3fe38	Resolved conflicts	2016-12-08 16:40:18 +05:30
WSO2 Builder	4ae70fe1f1	[maven-release-plugin] prepare for next development iteration	2016-11-29 10:24:35 +00:00
WSO2 Builder	42c2b04c62	[maven-release-plugin] prepare release v2.2.7	2016-11-29 10:12:05 +00:00
WSO2 Builder	ab087bf934	[maven-release-plugin] prepare for next development iteration	2016-11-29 07:23:41 +00:00
WSO2 Builder	072dd089ef	[maven-release-plugin] prepare release v2.2.6	2016-11-29 07:21:29 +00:00
inoshperera	3b867a533d	fixing http status code	2016-11-24 12:46:33 +05:30
inoshperera	d9a449dd26	adding modify enrollment capability to save chnages in enrollment such as GCM token update	2016-11-23 12:36:05 +05:30
WSO2 Builder	c9861e9636	[maven-release-plugin] prepare for next development iteration	2016-10-31 11:57:15 +00:00