Commit Graph

1005 Commits

Author SHA1 Message Date
harshanl
20873e7786 Added null checks 2015-08-31 14:37:44 +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
cada581396 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-28 12:33:15 +05:30
geethkokila
44b496d350 Partially commiting due to update 2015-08-28 12:33:10 +05:30
geethkokila
12a2e1f11f Partially commiting to fix update problem 2015-08-28 12:31:03 +05:30
harshanl
ae03025546 Fixed syntax issues in sql scripts 2015-08-27 18:56:58 +05:30
harshanl
aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps 2015-08-26 18:20:37 +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
prabathabey
f66d1dd07b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-24 10:14:22 +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
Dilshan Edirisuriya
6cff144573 Merge pull request #26 from milanperera/master
Added null check to MonitoringManagerImpl
2015-08-22 05:16:26 +05:30
mharindu
fa82a28c0f Added null check to MonitoringManagerImpl 2015-08-22 05:15:05 +05:30
prabathabey
2311572d49 code cleanup 2015-08-22 04:48:24 +05:30
prabathabey
cd31662a96 Fixing transactional anomalies found in PolicyManagerImpl 2015-08-22 04:42:35 +05:30
prabathabey
05c3d080e0 Fixing transactional anomalies found in PolicyManagerImpl 2015-08-22 04:09:59 +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
c27e81491a Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt 2015-08-22 00:48:01 +05:30
mharindu
f36c82b059 Refactored LicenseManager 2015-08-22 00:47:17 +05:30
Milan Perera
9002375f6d Update RegistryBasedLicenseManager.java 2015-08-22 00:32:22 +05:30
mharindu
4709107719 Refactored LicenseManager 2015-08-22 00:31:18 +05:30
Prabath Abeysekara
df83601899 Merge pull request #24 from hasuniea/master
fixed slf4j confliction
2015-08-22 00:15:56 +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
Dilshan Edirisuriya
5b46a4e2f8 Commenting out unreachable state for now 2015-08-21 14:46:49 +05:30
geethkokila
cceb3ac5db Fixing errors and adding caching sketch 2015-08-21 12:09:32 +05:30
hasuniea
a03e00c819 fixed slf4j conflict 2015-08-21 05:47:28 +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
90f8f4aab6 Adding test cases and fixing some logic issues and fixing the null pointer from the policy core 2015-08-07 13:03:34 +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
Dilshan Edirisuriya
473309ca6b Merge pull request #23 from milanperera/master
Fixed an issue in SQL query of getPendingOperations(CommandOp)
2015-07-30 18:36:22 +05:30
milanperera
e30956b619 Fixed an issue in SQL query of getPendingOperations(CommandOp) 2015-07-30 18:34:56 +05:30
Dilshan Edirisuriya
990bf4da82 Merge pull request #22 from milanperera/master
Refactored DCA
2015-07-30 17:12:07 +05:30
milanperera
508082808c Fixed a bug in commons.licence 2015-07-30 17:10:12 +05:30
milanperera
596a99d412 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 16:57:21 +05:30
prabathabey
84bc22f9f3 Setting default values for fields validFrom and validTo 2015-07-30 16:56:45 +05:30
milanperera
05a2339cea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-30 16:17:11 +05:30