1223 Commits

Author	SHA1	Message	Date
hasuniea	abd018afd6	refactored imports in Certificate Generator	2016-04-04 14:24:40 +05:30
hasuniea	6ec710b250	merged code updates	2016-04-04 14:13:35 +05:30
Ruwan	a192bfa85c	Merge pull request #207 from rasika90/master ... Adding uuf template app into cdmf-base-ui	2016-04-01 19:29:58 +05:30
Rasika Perera	3e34aeeff4	Fixing "Cannot write to cached file" issue	2016-04-01 18:00:22 +05:30
Rasika Perera	5911c873f3	Adding uuf template app	2016-04-01 15:06:32 +05:30
Kasun Delgolla	04de876265	Merge pull request #206 from charithag/master ... Restructure group related UIs	2016-04-01 13:53:46 +05:30
charithag	99d004b6a6	Restructure group related UIs	2016-04-01 13:30:44 +05:30
Prabath Abeysekara	30e5666750	Merge pull request #205 from charithag/master ... Refactor group management	2016-04-01 12:57:20 +05:30
geethkokila	d6923a1343	Fixing the issue in single condition	2016-04-01 00:25:09 +05:30
inosh-perera	9661502524	fixing issue with certificate delete	2016-03-31 20:08:20 +05:30
mharindu	afbfaf4c1d	Fixed for EMM-1305	2016-03-31 19:33:19 +05:30
mharindu	a3741bda7e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-31 19:32:10 +05:30
mharindu	a2a1e8115d	Fixed conflicts and merged	2016-03-31 18:45:52 +05:30
mharindu	72591eff44	Fixed modify enrollment bug	2016-03-31 18:44:55 +05:30
inosh-perera	f0fd86fcf7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-31 18:16:09 +05:30
inosh-perera	7cd1722829	making certificates searchable	2016-03-31 18:15:15 +05:30
geethkokila	7318502697	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-31 18:07:55 +05:30
geethkokila	e60a383f4d	Adding fixes to the device search	2016-03-31 18:07:05 +05:30
charithag	f6d224a623	Refactor group management	2016-03-31 17:50:29 +05:30
charithag	d22570dadb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-31 16:57:21 +05:30
charithag	bf58342d81	Refactor group management	2016-03-31 16:27:53 +05:30
Prabath Abeysekara	f1081f7029	Merge pull request #204 from ayyoob/merge-latest ... Merged device type multitenant implementation.	2016-03-31 16:27:35 +05:30
ayyoob	733884cba7	added web app tenant authorisation for tenant for non managed api scenario	2016-03-31 15:10:37 +05:30
ayyoob	3a3e9cc649	changed analytics components to released version	2016-03-31 05:55:03 +05:30
ayyoob	1b4a9227d8	merged web app publisher code and refactored jwt client extension to adhere to new artefact name	2016-03-31 04:24:30 +05:30
geethkokila	73a82f743f	Adding the changes for device Info bean to stop returing null values and changes done for Device search unit classes	2016-03-30 23:56:44 +05:30
ayyoob	83057acd9a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest	2016-03-30 23:42:47 +05:30
inosh-perera	41ba2f4f0a	adding database changes	2016-03-30 19:08:42 +05:30
geethkokila	fbc7c0807c	Skipping the validation of task operations	2016-03-30 14:10:17 +05:30
ayyoob	fc725fa767	removed analytics	2016-03-30 13:45:39 +05:30
ayyoob	81ae512f13	Merge pull request #6 from ayyoob/merge-devicetype ... merge device type	2016-03-30 12:20:02 +05:30
ayyoob	026d4ef018	removed analytics	2016-03-30 12:17:46 +05:30
charithag	40f863fd57	Fix bundle imports for java 8	2016-03-30 10:00:56 +05:30
charithag	0a8e00fd1e	Merged with upstream and resolved conflicts.	2016-03-30 02:00:47 +05:30
charithag	3e4ccf6337	Add missing features and component from IoTS-1.0.0-M4	2016-03-30 01:44:04 +05:30
geethkokila	888971ae39	Fixing the oracl and postgres sql datasources and removing the start and end from the search context	2016-03-29 22:46:09 +05:30
charithag	2f0a3388a6	Implemented missing methods in group management.	2016-03-29 18:01:21 +05:30
geethkokila	aa63b5f592	Fixing the application memory usage and adding location based search	2016-03-29 17:48:36 +05:30
charithag	3fd141acdf	Add missing parts and test to group management.	2016-03-29 17:07:56 +05:30
charithag	d1ee1fd578	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-29 12:41:48 +05:30
charithag	fa2f61f48a	Add missing parts in group management	2016-03-29 12:41:38 +05:30
ayyoob	284a6645f0	import required packages	2016-03-29 12:07:58 +05:30
ayyoob	4554aadd82	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-03-29 11:42:14 +05:30
ayyoob	c45895685b	Added device type multi tenancy capability.	2016-03-29 11:40:58 +05:30
ayyoob	021378df3b	added org.wso2.carbon import package	2016-03-28 23:05:47 +05:30
ayyoob	e06565728e	removed duplicate imports and improper imports	2016-03-28 20:46:38 +05:30
charithag	062a843ca2	Fix for https://wso2.org/jira/browse/IOTS-99	2016-03-28 13:28:49 +05:30
prabathabey	ffbc0904a6	Fixing build failures caused by missing package imports	2016-03-27 21:51:45 +05:30
prabathabey	22e579ff15	Fixing build failures causde by missing references to certain packages	2016-03-27 21:17:05 +05:30
prabathabey	3a7ef33c16	Fixing a build failure caused by unresolvable packages consumed by device.mgt.core and code cleanup	2016-03-27 16:58:11 +05:30