1369 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
hasuniea	2b89b692a4	adding event configuration refference	2016-06-02 16:37:50 +05:30
hasuniea	c170373ace	fix responce code	2016-06-02 15:57:00 +05:30
hasuniea	ec91b0a539	fixing eventReceiver	2016-06-02 15:30:09 +05:30
Shabirmean	fa454388ac	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-06-02 14:20:05 +05:30
Shabirmean	a117ae37c7	Modifications to the Token Refresh Flow & the Enrolment flow in the VFAlarm	2016-06-02 14:19:48 +05:30
Ruwan	bbe631d3f2	Merge pull request #287 from Anushkasandaruwan/master ... Merging changes related to generation of emails based on accelarometer input.	2016-06-01 22:19:19 +05:30
Anushka Sandaruwan	82e50bdc76	Delete README.md~	2016-06-01 20:25:34 +05:30
Anushka Samaranayake	9f1d4a0e3e	Alert generation	2016-06-01 20:24:54 +05:30
Anushka Samaranayake	1265a1dd34	Alert generation	2016-06-01 20:22:29 +05:30
hasuniea	198b3c67dc	add entry in permission xml	2016-05-31 19:16:52 +05:30
hasuniea	0bcbab7071	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 18:54:27 +05:30
Chatura Dilan	d3a0fc3f12	Added install application permissions	2016-05-31 18:50:26 +05:30
hasuniea	daee6109cc	fixing code issues	2016-05-31 18:48:49 +05:30
Chatura Dilan	7c59e391de	Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 18:42:54 +05:30
Chatura Dilan	ba1f3bbbcc	fixed issue in unlock devices permissions	2016-05-31 18:42:37 +05:30
hasuniea	786c6859bd	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 18:15:11 +05:30
hasuniea	d01e176933	add eventreceiver fix	2016-05-31 18:08:16 +05:30
prabathabey	640cf95528	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 18:02:15 +05:30
prabathabey	d7b4b83424	Fixing path of license resource	2016-05-31 18:02:04 +05:30
mharindu	56a2ca0aa0	Added missing HTTP method attribute in permissions.xml in android webapp	2016-05-31 17:21:31 +05:30
Chatura Dilan	9086a130c4	Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 16:21:54 +05:30
Chatura Dilan	3fd56b56c4	Fix cxf servelt issues	2016-05-31 16:21:42 +05:30
prabathabey	212c11750c	Added http schem supported by the API	2016-05-31 16:13:20 +05:30
inoshperera	763854ef9a	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 14:51:07 +05:30
Milan Perera	bb5de7c174	Merge pull request #286 from ayyoob/rest-api-improvements ... removed device Id from notification bean	2016-05-31 14:51:02 +05:30
ayyoob	61d88f77b6	removed device Id from notification bean	2016-05-31 14:48:23 +05:30
inoshperera	6d14133bab	fixing the mismatch of swagger annotation and implementation	2016-05-31 14:45:05 +05:30
Chatura Dilan	bf1e00f472	Fixed the host name of Android API	2016-05-30 17:07:04 +05:30
prabathabey	eb025c42f7	Fixing issues encountered while deploying the agent webapp of windows	2016-05-30 12:30:12 +05:30
prabathabey	18257b8729	Changing the name of the android API webapp	2016-05-30 12:08:44 +05:30
prabathabey	4dbf699b66	Fixing issues in android sense plugin which were caused by refactoring done in cdm-f	2016-05-30 08:33:55 +05:30
prabathabey	63bb616e9c	Improving swagger annotations	2016-05-28 08:12:10 +05:30
prabathabey	631d57e70d	Improving swagger annotations	2016-05-28 06:03:06 +05:30
Kasun Delgolla	a01fe5e4f9	Adding missing parameters	2016-05-28 02:14:56 +05:30
prabathabey	44aa3a93a9	Adding more improvements to swagger annotations	2016-05-28 02:07:17 +05:30
inoshperera	9f8ca3ea9a	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-28 01:50:20 +05:30
inoshperera	4dbf1bdc2f	adding swagger annotation and making APIs standerdize	2016-05-28 01:50:14 +05:30
Kasun Delgolla	bd65e8b2a7	Committing missing android features	2016-05-28 01:38:03 +05:30
Chatura Dilan	b8cfcf4413	Fixed Enrollment issue	2016-05-27 23:18:11 +05:30
Chatura Dilan	91003fdee1	Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-27 22:44:22 +05:30
Chatura Dilan	d25e1b2421	Fixed Android APIs	2016-05-27 22:43:03 +05:30
Hasunie	f91dc2ee60	Merge pull request #285 from hasuniea/master ... add windows feature	2016-05-27 20:08:12 +05:30
hasuniea	cc8190b541	add windows feature	2016-05-27 20:03:25 +05:30
inoshperera	f346c7c528	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-27 19:38:41 +05:30
prabathabey	479acf3b45	Improving swagger annotations of device management admin API	2016-05-27 19:38:12 +05:30
hasuniea	d7527e95f0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins	2016-05-27 18:45:49 +05:30
hasuniea	d4bce21f75	windows plugin	2016-05-27 18:45:20 +05:30
prabathabey	ba9d85b065	Adding swagger related dependencies to android agent webapp	2016-05-27 18:26:34 +05:30
inoshperera	aa4a4889a5	adding API header	2016-05-27 15:36:22 +05:30
prabathabey	9a01df5d55	Renaming android agent webapp	2016-05-27 14:58:19 +05:30