431 Commits

Author	SHA1	Message	Date
ayyoob	a037f91f56	removed task Config from template	2017-05-24 00:27:13 +05:30
ayyoob	4d22bc7064	fixed UI Issues	2017-05-24 00:26:02 +05:30
ayyoob	dd1c2e4338	Added few fixes after testing and added default UI for device type management	2017-05-22 02:51:35 +05:30
ayyoob	f945da194d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0	2017-05-19 01:56:40 +05:30
ayyoob	abc9315f95	Added Pluggable Device Type	2017-05-19 01:49:10 +05:30
sinthuja	4df590caa1	Fixing https://github.com/wso2/product-iots/issues/447.	2017-05-16 18:17:45 +05:30
ayyoob	fbb5f5ae88	merged with origin	2017-05-15 18:15:24 +05:30
ayyoob	d2d7be6fd6	fixed tenant related issue for mqtt push notification and stream artifact publishing	2017-05-10 13:50:06 +05:30
ayyoob	035403495c	made default stat permission as constant	2017-05-09 16:45:47 +05:30
ayyoob	b36ff4b874	added a authorisation resource for stat	2017-05-09 00:54:49 +05:30
ayyoob	77ceed5368	renamed device type publisher service to DeviceAnalyticsArtifactUploaderAdminService	2017-05-09 00:54:01 +05:30
ayyoob	cedb6cb798	fixed device stats loading page issue	2017-05-05 03:02:35 +05:30
madhawap	c4ba14376e	Removed commented lines	2017-05-04 15:32:25 +05:30
ayyoob	a3910908f8	fixed an issue in the logging	2017-04-26 14:48:20 +05:30
ayyoob	018d875a84	removed temporary logs ... (cherry picked from commit 615e44e)	2017-04-26 14:26:23 +05:30
ayyoob	1e2ca17275	fixed few issues after testing ... (cherry picked from commit 5b6d8d3)	2017-04-26 10:19:55 +05:30
ayyoob	3df2912a6a	added default UI for realtime,batch, device view and type view	2017-04-24 02:51:03 +05:30
ayyoob	2a89a2fb23	resolved issues in event management service	2017-04-22 18:31:13 +05:30
ayyoob	f834001d22	merged with origin	2017-04-22 01:24:24 +05:30
ayyoob	4ce8352690	added device event api	2017-04-22 00:15:58 +05:30
Jasintha	e6b38fbdb4	Implemeting dynamic recivers and streams deployment into DAS	2017-04-21 15:51:24 +05:30
megala21	32ea2e52c4	Fixes https://github.com/wso2/product-iots/issues/373 and https://github.com/wso2/product-iots/issues/370	2017-04-21 15:18:20 +05:30
ayyoob	0e9bb7caf6	corrected operation definition	2017-04-19 16:34:18 +05:30
ayyoob	c28f820455	added missing apis - operation and device management	2017-04-19 16:32:06 +05:30
megala21	2360b338d8	Fixing the role creation problem	2017-04-17 13:14:14 +05:30
megala21	2b92676191	Fixes https://github.com/wso2/product-iots/issues/346	2017-04-05 11:02:58 +05:30
Amal Gunatilake	e9c2f3e72d	Merge branch 'master' into cloud-3.1.0	2017-03-24 11:55:35 +05:30
kamidu	cda0dd417f	fixing the role filtering api issues	2017-03-23 12:21:41 +05:30
kamidu	73ab0a38bf	adding get location api witch was missing from previous emm versions	2017-03-22 20:13:08 +05:30
kamidu	a6f5c002a9	adding get location api witch was missing from previous emm versions	2017-03-22 20:12:50 +05:30
kamidu	a77794f81a	adding role filtering for device cloud via api	2017-03-22 20:12:30 +05:30
kamidu	fc6c8e0290	adding get location api witch was missing from previous emm versions	2017-03-22 20:11:41 +05:30
lakshani	eb12e5b9f1	Adding commit 'added java doc comments'	2017-02-28 21:11:15 +05:30
lakshani	3f90b403c0	Adding lakshani's commit 'updated device status button'	2017-02-28 21:03:53 +05:30
charitha	d2991585aa	Applying charithas commit on IOTS-436	2017-02-28 20:56:25 +05:30
ayyoob	87910bc92b	transferred mutual authenticator to jwt authenticator	2017-02-08 13:10:36 +05:30
ayyoob	b7566f4e4a	added artifact deployment support through UI	2017-02-05 17:51:48 +05:30
ayyoob	0999bb70a0	exposed artefact deployment through api ... Merged Jasintha’s code	2017-02-05 17:51:15 +05:30
Kamidu Sachith Punchihewa	559fe98cc9	Merge pull request #585 from wso2/master ... Cloud ui fixes and the new master fixes	2017-02-03 17:24:49 +05:30
Milan Perera	a5f41ef734	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud	2017-02-01 12:14:59 +05:30
charitha	8e01a98ded	Removed unused Dashboard API	2017-01-30 20:41:31 +05:30
charitha	423879bee7	Updated swagger docs	2017-01-30 20:41:05 +05:30
charitha	3cf797fba6	Removed hardcoded device types in swagger docs	2017-01-30 17:25:27 +05:30
lakshani	26f2e2d2ae	added role query param to getdevices restapis	2017-01-30 07:50:10 +05:30
GPrathap	47e6f6d292	adding username as parameter	2017-01-29 16:51:37 +05:30
ayyoob	3423ef025d	merged with upstream	2017-01-24 19:39:49 +05:30
ayyoob	e74b4e23c4	removed apim dependency from cdmf	2017-01-24 19:32:59 +05:30
Rasika Perera	704680d68d	Fixing null pointer when roles are not specified on creating new user	2017-01-24 01:54:37 +05:30
Rasika Perera	d723e22a8c	Fixed roleUpdate issue	2017-01-23 14:35:03 +05:30
Rasika Perera	8e6855a203	Adding DEFAULT_DEVICE_USER on adding user	2017-01-20 18:01:56 +05:30