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 |
|
harshanl
|
402b843e5d
|
Updated task schedule service to fix EMM-1145, EMM-1100
|
2015-12-23 19:35:50 +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 |
|
pasinduj
|
ddefa19e0f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-17 09:41:19 +05:30 |
|
Kasun Delgolla
|
d5f87f4dc1
|
Committing policy compliance monitoring issue
|
2015-12-16 14:38:32 +05:30 |
|
pasinduj
|
9a50455a29
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-14 08:57:36 +05:30 |
|
harshanl
|
00cf61c44c
|
Fixed EMM-1069 and refactore DCR services
|
2015-12-11 20:04:22 +05:30 |
|
pasinduj
|
f49f13501f
|
modified dbscripts removing policy ID forigen key from one table
|
2015-12-08 15:35:01 +05:30 |
|
pasinduj
|
a390df68ec
|
modified dbscripts to remove foriegn key reference
|
2015-12-08 11:42:04 +05:30 |
|
harshanl
|
5b9c44655d
|
Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master
|
2015-12-03 20:20:26 +05:30 |
|
harshanl
|
30e8dc885c
|
Fixed EMM-1034
|
2015-12-03 20:13:10 +05:30 |
|
pasinduj
|
9c7ebdafdb
|
modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference
|
2015-12-03 18:30:45 +05:30 |
|
harshanl
|
b4d17b888b
|
fixed secondary user-store related issues & multi-tenancy issues
|
2015-11-20 00:43:01 +05:30 |
|
geethkokila
|
c1eea6894d
|
Fixing the feature remove from the policy
|
2015-11-19 14:45:08 +05:30 |
|
geethkokila
|
271c4f76cb
|
Fixnig the null pointer isssue
|
2015-11-16 18:08:21 +05:30 |
|
geethkokila
|
700b308b45
|
Fixing the null pointer and removnig innactive devices being monitored
|
2015-11-16 17:44:30 +05:30 |
|
geethkokila
|
1989abf881
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 17:41:37 +05:30 |
|
geethkokila
|
fed4f72d4b
|
Fixing the null pointer
|
2015-11-16 17:41:07 +05:30 |
|
harshanl
|
1252d4c160
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 17:21:33 +05:30 |
|
geethkokila
|
0f146e83fa
|
Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system
|
2015-11-16 17:17:15 +05:30 |
|
geethkokila
|
813f9072d8
|
Fixing the database issue which causes the deviceids slelect did not work
|
2015-11-16 17:15:16 +05:30 |
|
Dileesha Rajapakse
|
6446be100d
|
Refactored Policy Management DAO classes
|
2015-11-16 16:49:35 +05:30 |
|
Geeth
|
5fd9e87dc8
|
Merge pull request #44 from Kamidu/master
change the formatter
|
2015-11-10 20:35:58 +05:30 |
|
Kamidu Sachith
|
8953a61cc4
|
Enable Owneship type editing in policy
|
2015-11-10 20:17:59 +05:30 |
|
harshanl
|
026a7c187a
|
Fixed EMM-945, EMM-910, EMM-911, EMM-870
|
2015-11-10 18:17:34 +05:30 |
|
Kamidu Sachith
|
d7c942f395
|
Enable ownership editing on the policy
|
2015-11-10 14:51:10 +05:30 |
|
geethkokila
|
feab85796f
|
Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
|
2015-11-02 19:44:52 +05:30 |
|
geethkokila
|
20122b3f1e
|
Fixing the roles and users adding issue
|
2015-10-30 17:48:30 +05:30 |
|
Kasun Delgolla
|
f519b7c029
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-29 15:46:41 +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 |
|
Kasun Delgolla
|
8d52735e6a
|
Adding app list + info to monitoring operation
|
2015-10-20 09:51:43 +05:30 |
|
geethkokila
|
c46c4f1be9
|
Fixing the policy update issues
|
2015-10-19 20:34:02 +05:30 |
|
geethkokila
|
d15eb10636
|
Adding the null check to monitiring frequncy and fixing the servlet-api issue which is caused a compilation error
|
2015-10-17 17:08:12 +05:30 |
|
geethkokila
|
f49345e722
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-16 23:47:19 +05:30 |
|
geethkokila
|
8a8a152d36
|
Adding the policy task config
|
2015-10-16 23:47:16 +05:30 |
|
Dulitha Wijewantha
|
5962694ec2
|
Adding annotation for the description
|
2015-10-16 23:37:58 +05:30 |
|
Dulitha Wijewantha
|
002a1ec580
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-16 21:06:04 +05:30 |
|
Dulitha Wijewantha
|
1025e9a425
|
Fixes to user api
|
2015-10-16 21:05:51 +05:30 |
|
geethkokila
|
d52df2474e
|
Fixing policy descriptions
|
2015-10-15 13:01:53 +05:30 |
|
geethkokila
|
9fca18ae90
|
Fixing the monitoring issue
|
2015-10-14 18:54:39 +05:30 |
|
geethkokila
|
81034c84f5
|
Fixing the method name issue in policy manager service
|
2015-10-12 18:59:41 +05:30 |
|
Dulitha Wijewantha
|
45ce4dbe4e
|
Policy Updating
* Fixed issues regarding roles updating for policy
* Fixed the relevent test cases
JIRA:- https://wso2.org/jira/browse/EMM-812
|
2015-10-12 12:09:21 +05:30 |
|
harshanl
|
234cd47931
|
Added identity-extensions
|
2015-10-02 18:00:05 +05:30 |
|
mharindu
|
9813816fab
|
Fixed bug of adding operations
|
2015-09-29 16:24:35 +05:30 |
|
mharindu
|
9920f2919a
|
Fixed spelling mistakes of policy component
|
2015-09-09 20:00:10 +05:30 |
|
mharindu
|
fbd697edb0
|
Fixed issue in policy delegation executor
|
2015-09-08 11:27:29 +05:30 |
|
geethkokila
|
11ead87a5e
|
Fixing the policy listing issue
|
2015-09-03 20:49:26 +05:30 |
|
geethkokila
|
6ef4bdd73e
|
Fixing enrolment id issues
|
2015-09-02 22:55:52 +05:30 |
|
geethkokila
|
7dd48bf00e
|
Fixing the monitoring task for INACTIVE, BLOCKED, REMOVED, UNCLAIMED, DISENROLLMENT_REQUESTED, SUSPENDED devices
|
2015-09-02 19:39:50 +05:30 |
|
mharindu
|
1903b375f3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 15:34:11 +05:30 |
|
geethkokila
|
dff526b272
|
Removing the unnessary commets and imports
|
2015-09-02 15:02:33 +05:30 |
|
geethkokila
|
5ee8c0f065
|
Fixing the cache manager issues
|
2015-09-02 14:47:36 +05:30 |
|
mharindu
|
cd853c9ee8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 17:20:12 +05:30 |
|
mharindu
|
ad5335c9f5
|
Fixed local conflicts and merged
|
2015-09-01 15:29:24 +05:30 |
|
geethkokila
|
6c5f7d7ada
|
Fixing conflicts and checkcriterion method
|
2015-09-01 15:14:40 +05:30 |
|
prabathabey
|
2b6bf203e2
|
Resolving conflicts observed in policy management implementation
|
2015-09-01 15:06:41 +05:30 |
|
geethkokila
|
044995ed97
|
Adding the activate method when policies are added.
|
2015-09-01 15:03:09 +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
|
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 |
|
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 |
|
mharindu
|
94326323bc
|
Added class level and method level comments for Policy core
|
2015-08-27 01:00:59 +05:30 |
|
mharindu
|
7fed00a14d
|
Removed unnecessary logs and added null checks in MonitoringManager
|
2015-08-26 18:10:10 +05:30 |
|
mharindu
|
5e285071d8
|
Removed unnecessary white spaces
|
2015-08-26 15:16:29 +05:30 |
|
mharindu
|
a51e7646e3
|
Fixing issues of previous PRs
|
2015-08-26 12:48:53 +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 |
|
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 |
|
dilanua
|
4e5a38998d
|
Updating DAO Layer
|
2015-08-07 22:09:51 +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
|
b8462b02ac
|
Fixing the conflicts
|
2015-07-29 07:30:14 +05:30 |
|
prabathabey
|
54cd6b80f4
|
Fixing merge conflicts
|
2015-07-28 15:21:06 +05:30 |
|
prabathabey
|
955c119006
|
Adding policy delegation
|
2015-07-28 15:19:34 +05:30 |
|
geethkokila
|
dc205aa081
|
Fixing the conflicts
|
2015-07-27 20:32:12 +05:30 |
|
geethkokila
|
6d687364c6
|
Fixing the monitoring tasks
|
2015-07-27 12:27:12 +05:30 |
|
milanperera
|
f0ec3dbe4c
|
Fixed NPE issues in policy-mgt
|
2015-07-27 10:49:46 +05:30 |
|
milanperera
|
5b2e0c8989
|
Merged
|
2015-07-24 12:32:26 +05:30 |
|
geethkokila
|
fde54d2d32
|
Fixing the monitoring service
|
2015-07-24 12:26:57 +05:30 |
|
milanperera
|
5a8975d7ac
|
Partial Commit
|
2015-07-23 16:55:54 +05:30 |
|
geethkokila
|
2769392bc0
|
Fixing the monitoring task for not to notify the blocked and inactive devices
|
2015-07-23 15:32:12 +05:30 |
|
geethkokila
|
bd75f70a24
|
Fixing the merge conflicts
|
2015-07-23 10:17:04 +05:30 |
|
geethkokila
|
6270dff93c
|
Fixing priviledege carbon context issue in device-mgt component
|
2015-07-23 10:14:24 +05:30 |
|
geethkokila
|
8ab843e76c
|
Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
Merging the milan's changes
|
2015-07-22 17:59:45 +05:30 |
|
milanperera
|
35ac8ec6c9
|
Fixed formating issues in PolicyManagerImpl
|
2015-07-22 17:53:58 +05:30 |
|
milanperera
|
de6572d819
|
Fixed for JIRA MDM-372
|
2015-07-22 17:46:40 +05:30 |
|
geethkokila
|
aee2402d0d
|
Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home
|
2015-07-22 17:24:33 +05:30 |
|
milanperera
|
7313ba1e7e
|
Implemented policy monitoring add operation
|
2015-07-21 19:43:22 +05:30 |
|
harshanl
|
00b9303283
|
Fixed the issue with java package name
|
2015-07-21 10:26:24 +05:30 |
|
geethkokila
|
c4739efd0e
|
Fixing the policy monitoring service adding
|
2015-07-20 19:05:13 +05:30 |
|