Commit Graph

920 Commits

Author SHA1 Message Date
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
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
prabathabey
284ca1b8e8 Removing obsolete source structures 2016-03-27 16:08:22 +05:30
prabathabey
12c4ba10af Code cleanup 2016-03-27 16:04:15 +05:30
prabathabey
36161f6288 Merging extended device management functionalities 2016-03-27 16:02:40 +05:30
prabathabey
5e7985dae6 merging group-mgt implementation 2016-03-27 16:01:06 +05:30
prabathabey
b584131160 Fixing build failures in device.mgt.analytics.data.publisher bundle 2016-03-27 13:18:18 +05:30
prabathabey
43926b64b4 Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher 2016-03-27 13:01:26 +05:30
prabathabey
1a43cf6a55 Fixing build faliure caused by not adding a package-import upon org.wso2.carbon.base 2016-03-27 03:06:39 +05:30
prabathabey
5dcd9dfe4a Merging device analytics feature impl to master 2016-03-27 00:23:37 +05:30
prabathabey
e537e2d841 Adding device.mgt base ui framework 2016-03-25 14:46:19 +05:30
geethkokila
e9da24c9e8 Changing the snapshot versions from 1.0.4 to 1.1.0 2016-03-24 11:41:52 +05:30
geethkokila
41191d6df0 Adding the search feature to device mgt plugin 2016-03-21 10:33:35 +05:30
geethkokila
1826c9ee49 Doing a partial commit for pull 2016-03-14 12:02:36 +05:30
geethkokila
be890c2e9a Doing a partial commit 2016-03-14 11:55:25 +05:30
geethkokila
7a809c1c01 Doing a partial commit 2016-03-14 11:48:43 +05:30
prabathabey
3726a57d96 Making email-sender a separate component and code cleanup 2016-03-13 00:51:54 +05:30
prabathabey
0b31042aa2 More improvements to the email sending functionality 2016-03-12 15:42:08 +05:30
prabathabey
535c74a962 Improving email sender functionality 2016-03-12 12:46:36 +05:30
Dileesha Rajapakse
8ac485d66d Fixed Pagination issues in Device and Operation Oracle DAO classes 2016-02-02 17:53:47 +05:30
Dileesha Rajapakse
9204ed900d Fixed Pagination issues in Oracle DAO classes 2016-02-02 16:37:26 +05:30
Kamidu Sachith
370badf9d3 Preventing infromation leakage 2016-01-28 18:58:24 +05:30
geethkokila
e0e0a57c11 [maven-release-plugin] prepare for next development iteration 2016-01-05 18:15:38 +05:30
geethkokila
cebb88e712 [maven-release-plugin] prepare release v1.0.3 2016-01-05 18:15:28 +05:30
geethkokila
e66d291947 [maven-release-plugin] prepare for next development iteration 2015-12-30 14:19:05 +05:30
geethkokila
f416a73e75 [maven-release-plugin] prepare release v1.0.2 2015-12-30 14:18:57 +05:30
geethkokila
185a59fbd4 [maven-release-plugin] prepare for next development iteration 2015-12-23 22:39:29 +05:30
geethkokila
b3580d754b [maven-release-plugin] prepare release v1.0.1 2015-12-23 22:39:20 +05:30
prabathabey
1fe9371558 Fixing https://wso2.org/jira/browse/EMM-1133 2015-12-23 21:41:10 +05:30
prabathabey
cbee88c7d0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-23 18:14:42 +05:30
prabathabey
77c4c34858 Fixing https://wso2.org/jira/browse/EMM-1133 2015-12-23 18:13:39 +05:30
harshanl
8d4c09c20f Fixed EMM-1139 2015-12-23 17:10:12 +05:30
harshanl
9a7093a0f7 Fixed EMM-1146 issue 2015-12-23 15:29:45 +05:30
prabathabey
7a27e88551 Changing the log levels configured in log4j.properties files used as part of test configurations 2015-12-22 22:43:26 +05:30
geethkokila
4e9255fbc9 [maven-release-plugin] prepare for next development iteration 2015-12-22 08:28:42 +05:30
geethkokila
ceb60adb34 [maven-release-plugin] prepare release v1.0.0 2015-12-22 08:28:33 +05:30
Kamidu Sachith
c6e2c01caa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 16:45:52 +05:30
Kamidu Sachith
2d23eb86eb Improve runtime performance 2015-12-21 16:38:42 +05:30
harshanl
a61fe6171a Refactored pagination code 2015-12-21 14:22:09 +05:30
Dileesha Rajapakse
b25438097e Fixed issues in EnrollmentDAOImpl 2015-12-18 23:26:01 +05:30
harshanl
6441c201e5 Added search support for pagination 2015-12-18 22:17:07 +05:30
Dileesha Rajapakse
eb680da572 Fixed EMM-1103 2015-12-17 14:57:28 +05:30
harshanl
91ece82eca Updated operation DAO to sort data in DESC order of timestamp. 2015-12-17 12:52:42 +05:30
harshanl
d4b6ba5e36 Added pagination support for operation management apis. 2015-12-17 10:32:06 +05:30
harshanl
30e8dc885c Fixed EMM-1034 2015-12-03 20:13:10 +05:30
harshanl
73906f7cda Fixed EMM-1003 2015-11-30 22:20:33 +05:30
harshanl
d95a198ad6 Fixed EMM-1001 2015-11-30 19:56:47 +05:30
Kamidu Sachith
53064516d3 Fix for the Jira Issue EMM-989 2015-11-26 16:02:16 +05:30
Kamidu Sachith
8573a284e0 Enable Domain name in the invitation main 2015-11-26 11:39:11 +05:30
manoj
e1dc3d2ea3 add notify mechanisam to plugins for some operations - Ex -: IOS send push note to apns when add operation 2015-11-20 22:14:18 +05:30
manoj
99f82e4817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-20 12:52:32 +05:30
harshanl
b4d17b888b fixed secondary user-store related issues & multi-tenancy issues 2015-11-20 00:43:01 +05:30
manoj
a04658af14 App Manager integration 2015-11-19 10:21:59 +05:30
manoj
79c268cb41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-19 10:18:01 +05:30
Dileesha Rajapakse
767ea70436 Refactored CommandOperation DAO class 2015-11-18 22:05:15 +05:30
Dileesha Rajapakse
8bd9295f81 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-17 19:28:40 +05:30
Dileesha Rajapakse
f3cfb79bac Refactored Operation DAO classes 2015-11-17 19:28:32 +05:30
harshanl
f0471203e7 Added logic to skip device authorization for policy operations 2015-11-17 18:28:42 +05:30
Dileesha Rajapakse
6e95451f57 Refactored Operation DAO class 2015-11-17 17:26:55 +05:30
manoj
dbf8d13ced Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-17 16:15:24 +05:30
manoj
20db31c2a9 Add app manager features 2015-11-17 16:14:51 +05:30
Dileesha Rajapakse
825017a492 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-17 09:58:43 +05:30
Dileesha Rajapakse
4379232c25 Refactored Enrollment DAO class 2015-11-16 22:01:21 +05:30
harshanl
a3e20367f2 Fixed issue in Policy Task when DeviceAuthorization enabled. 2015-11-16 19:51:59 +05:30
Dileesha Rajapakse
6446be100d Refactored Policy Management DAO classes 2015-11-16 16:49:35 +05:30
Dileesha Rajapakse
91d9db1ffa Refactored ApplicationMapping and ProfileOperation DAO classes 2015-11-16 14:15:54 +05:30
Dileesha Rajapakse
27254cc922 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 11:45:29 +05:30
harshanl
cb02c9da80 Fixed issues in DeviceAuthorization 2015-11-16 11:43:52 +05:30
Dileesha Rajapakse
6f0276ab2f Modified Application Mapping DAO classes 2015-11-16 11:39:52 +05:30
Dileesha Rajapakse
7b2cfd69f5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-16 09:49:37 +05:30
harshanl
b9ca6705ae Merged changes 2015-11-13 21:57:05 +05:30
harshanl
e14f09b8a8 Added requireDeviceAuthorization support 2015-11-13 21:33:33 +05:30
manoj
fdc4ad8e18 Set user level autherization is support by plugin or not 2015-11-13 21:29:47 +05:30
manoj
22c2da7fcb Set user level autherization is support by plugin or not 2015-11-13 21:22:38 +05:30
manoj
dc2e41e083 Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction 2015-11-13 19:02:55 +05:30
manoj
adc3b652bf Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction 2015-11-13 18:57:45 +05:30
Dileesha Rajapakse
786eb93bca Refactored Operation DAO classes 2015-11-13 14:15:05 +05:30
Dileesha Rajapakse
123ea228ad Refactored Enrolment DAO class 2015-11-12 10:30:45 +05:30
Dileesha Rajapakse
1975821446 Refactored Device and Application DAO classes 2015-11-11 18:47:02 +05:30
harshanl
5d107b0d56 Merged changes 2015-11-10 18:46:26 +05:30
harshanl
93e641893c Merged changes 2015-11-10 18:31:02 +05:30
harshanl
026a7c187a Fixed EMM-945, EMM-910, EMM-911, EMM-870 2015-11-10 18:17:34 +05:30
inosh-perera
4faa740c9d Fixing JIRA EMM-947 - only the registered device types are returned to UI 2015-11-10 17:36:30 +05:30
harshanl
c826be9b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 18:59:26 +05:30
harshanl
74a3b0e346 Fixed EMM-910 2015-11-03 18:58:52 +05:30
geethkokila
30c53b7d14 Fixing the EMM-900, Ading the LB host name and port to the email url 2015-11-03 16:24:49 +05:30
geethkokila
2479be9f5a Fixing the email client issue 2015-11-02 19:37:21 +05:30
Kasun Delgolla
c00b1ee713 Committing fix for JIRA- EMM-860 2015-10-29 20:46:48 +05:30
prabathabey
90240e7d3f Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts 2015-10-29 14:11:24 +05:30
harshanl
8a1dba166a Updated FeatureMgr spec 2015-10-28 22:09:01 +05:30
harshanl
340a690995 Added sql script 2015-10-20 10:11:42 +05:30
harshanl
1d4bba9807 License issue fixed 2015-10-20 08:12:02 +05:30
harshanl
09fbf9e8a1 Fixed DAO issues 2015-10-19 22:45:39 +05:30
harshanl
89e930d530 Fixed isssues in pagination 2015-10-18 21:56:13 +05:30
harshanl
25d7459974 Pagination changes 2015-10-18 20:50:39 +05:30
harshanl
155606a326 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:54:35 +05:30
prabathabey
a0ebec9f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:18:26 +05:30
prabathabey
c74e27102f Fixing issues in adding license configs 2015-10-18 18:16:52 +05:30
harshanl
81b6770c08 Fixed oauth issue with tenants 2015-10-18 01:44:28 +05:30
harshanl
6c196d5317 Added pagination support 2015-10-16 23:40:13 +05:30
harshanl
9a68aa92bc Removed the use of web-app context in permission.xml of webapps 2015-10-14 22:33:36 +05:30
harshanl
d4eab9f86e Code refactored. 2015-10-12 19:48:35 +05:30
harshanl
429b738dba Fixed issues in permission tree' 2015-10-06 22:41:59 +05:30
harshanl
77f5f466d6 Added scope validator and refactored code 2015-10-06 11:44:40 +05:30
harshanl
648d8ec209 Added OAuth scope validator & fixed DataHolders 2015-10-05 11:28:47 +05:30
harshanl
234cd47931 Added identity-extensions 2015-10-02 18:00:05 +05:30
milanperera
e408d50037 Refactored permission module 2015-10-02 17:07:57 +05:30
milanperera
a0187b905b Removed unneccessary imports and code segments 2015-10-02 16:57:42 +05:30
milanperera
a84edd7a99 Added seperate permission tree class 2015-10-02 16:40:52 +05:30
milanperera
02ad7fb8e1 Refactored authorization module 2015-10-02 16:40:13 +05:30
milanperera
ed937467cd Refactored permission authorizer module 2015-10-01 17:35:08 +05:30
milanperera
68befaae01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-01 12:14:28 +05:30
milanperera
1034eb85c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-28 16:55:50 +05:30
mharindu
0a321e279a Added null check to getLicense 2015-09-24 14:37:52 +05:30
Dilshan Edirisuriya
9ce1c2002a Null check in DAO 2015-09-22 14:09:59 +05:30
milanperera
126c2ec371 Implemented permission authorizing module 2015-09-17 11:09:31 +05:30
milanperera
47ac0b1146 Fixed conflicts and merged local changes 2015-09-15 10:22:53 +05:30
Dilshan Edirisuriya
ac5a7f4ab1 Null check in JWT authenticator and fixing tenant id issue in device DAO 2015-09-14 17:12:07 +05:30
milanperera
37854a2cef Partial Commit 2015-09-14 15:51:23 +05:30
Dilshan Edirisuriya
5f2ec88300 Changes in certificate managment 2015-09-14 15:28:28 +05:30
Dilshan Edirisuriya
3907c0fba2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-14 15:23:18 +05:30
Dilshan Edirisuriya
4a03c7abf7 certificate authentication changes 2015-09-14 15:23:11 +05:30
harshanl
b8720917e1 Added Dynamic-client-registration module 2015-09-11 20:53:19 +05:30
milanperera
517039cccb Partial commit 2015-09-10 11:20:29 +05:30
mharindu
2331b61bdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-08 11:16:41 +05:30
harshanl
bf0e95fa6c Fixed notification service issues 2015-09-07 18:14:20 +05:30
harshanl
330f059a09 Added App-Mgt config testcases 2015-09-05 01:26:52 +05:30
mharindu
3421663724 Fixed conflics and merged 2015-09-04 11:15:59 +05:30
geethkokila
4500aacd38 Adding the scep support for getting the device tenant id 2015-09-03 23:38:27 +05:30
mharindu
0e7ff3c0c8 Merged 2015-09-03 20:40:49 +05:30
hasuniea
581c4f013b refactored changes 2015-09-03 20:19:28 +05:30
mharindu
069c7e7c5f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 12:03:41 +05:30
harshanl
bbec523a47 Added notification mechanism 2015-09-03 00:19:58 +05:30
mharindu
cbf10a8b59 Refactored addOperation method 2015-09-02 17:35:41 +05:30
hasuniea
7642112a9f code clean up 2015-09-02 17:27:28 +05:30
mharindu
0c43338f5d Added runtime exception to DCA 2015-09-02 16:16:18 +05:30
mharindu
1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 15:34:11 +05:30
geethkokila
5ee8c0f065 Fixing the cache manager issues 2015-09-02 14:47:36 +05:30
hasuniea
9d5f2af7e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 14:26:15 +05:30
mharindu
725894ed2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 18:20:09 +05:30
geethkokila
f2b8f978f5 Fixing the operations connection close problems 2015-09-01 18:15:02 +05:30
mharindu
cd853c9ee8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 17:20:12 +05:30
geethkokila
b14461a5af Fixing the datasource issue in the device magt core 2015-09-01 17:16:51 +05:30
mharindu
ad5335c9f5 Fixed local conflicts and merged 2015-09-01 15:29:24 +05:30
mharindu
6385c13012 Fixed issues in DeviceDAO 2015-09-01 15:25:16 +05:30
prabathabey
2b6bf203e2 Resolving conflicts observed in policy management implementation 2015-09-01 15:06:41 +05:30
mharindu
fd29deb372 Fixed conflicts of local repo and merged 2015-09-01 12:57:13 +05:30
prabathabey
892b9681f5 Fixing transaction handling issues 2015-09-01 12:51:18 +05:30
geethkokila
458618191d Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases 2015-08-31 19:31:13 +05:30
geethkokila
c673395ce6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-31 17:13:42 +05:30
harshanl
20873e7786 Added null checks 2015-08-31 14:37:44 +05:30
geethkokila
c6d993e532 Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task 2015-08-30 21:45:56 +05:30
Your Name
b906d43cc8 Committing tenant configuration manager service 2015-08-29 22:14:07 +05:30
geethkokila
bcb2c1ddb1 Commiting the monitoring changes and test case changes 2015-08-29 17:39:07 +05:30
geethkokila
44b496d350 Partially commiting due to update 2015-08-28 12:33:10 +05:30
hasuniea
7a54838996 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-28 12:22:07 +05:30
mharindu
69cf3f8939 Cleaned code and added comments 2015-08-27 17:15:37 +05:30
mharindu
abc16557dc Removed unnecessary new lines in DeviceDAOImpl 2015-08-27 10:45:10 +05:30
mharindu
460fda1bb9 Removed unnecessary new lines in DeviceDAOImpl 2015-08-27 10:43:52 +05:30
harshanl
aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps 2015-08-26 18:20:37 +05:30
mharindu
8c748b3dfd Removed unnecessary comments 2015-08-26 17:45:21 +05:30
hasuniea
9f6dd55223 fixed issue in modify enrollment 2015-08-26 14:05:21 +05:30
harshanl
1850a76462 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-25 09:47:11 +05:30
prabathabey
3582973f84 Code cleanup 2015-08-24 11:04:47 +05:30
prabathabey
d4c5d9023e Adding necessary instructions for transaction handling 2015-08-24 11:04:28 +05:30
prabathabey
de2c378214 Code cleanup 2015-08-24 10:15:50 +05:30
harshanl
423c8e2727 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-24 10:05:24 +05:30
prabathabey
ce0cc1699f Fixing more transaction handling related issues 2015-08-23 20:19:20 +05:30
prabathabey
cdbdc86f42 Fixing transactional anomalies and code cleanup 2015-08-22 03:56:44 +05:30
harshanl
076d60ec83 PermissionManager changes 2015-08-22 03:01:20 +05:30
prabathabey
d7e363cef7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-22 01:51:56 +05:30
prabathabey
00807e8295 Fixing transaction anomalies and code clean up 2015-08-22 01:51:42 +05:30
Prabath Abeysekara
a5c9886c63 Merge pull request #25 from milanperera/master
Fixed "204 Content Not Found" issue in LicenseManager
2015-08-22 00:51:12 +05:30
mharindu
f36c82b059 Refactored LicenseManager 2015-08-22 00:47:17 +05:30
mharindu
4709107719 Refactored LicenseManager 2015-08-22 00:31:18 +05:30
mharindu
8949992148 Fixed 204 issue in LicenseManager 2015-08-22 00:12:24 +05:30
Dilshan Edirisuriya
3c444f6102 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Conflicts:
	components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java
2015-08-21 14:53:36 +05:30
dilanua
4e5a38998d Updating DAO Layer 2015-08-07 22:09:51 +05:30
dilanua
df81bef812 Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus 2015-08-07 18:13:42 +05:30
geethkokila
149b743a2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-07 12:27:43 +05:30
harshanl
58c45c92be Fixed tenant configuration persisting issue 2015-08-06 18:11:40 +05:30
geethkokila
c039adf4ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-03 18:21:10 +05:30
prabathabey
c41f6c3002 Code cleanup 2015-08-03 17:22:46 +05:30
geethkokila
3fa65ae98c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 23:32:12 +05:30
milanperera
e30956b619 Fixed an issue in SQL query of getPendingOperations(CommandOp) 2015-07-30 18:34:56 +05:30
milanperera
508082808c Fixed a bug in commons.licence 2015-07-30 17:10:12 +05:30
prabathabey
84bc22f9f3 Setting default values for fields validFrom and validTo 2015-07-30 16:56:45 +05:30
prabathabey
536e13b0a7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 15:17:03 +05:30