hasuniea
2128f08658
fixing EMM-1750
8 years ago
kamidu
2f852d84f4
Fix for the issue : EMM policy updating issue
8 years ago
charitha
670ca7c228
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
8 years ago
harshanl
4bcf350236
EMM-1678:Updated the oauth component versions
8 years ago
charitha
f22d392978
Upgrade to comply with latest CDMF changes
8 years ago
harshanl
f9ba45f439
Fixed the device status changing issue when there are multiple enrollments for the same device
8 years ago
Chatura Dilan Perera
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
8 years ago
harshanl
f24242fb8a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl
dd03d0b740
Added device status change upon inactivity mechanism
8 years ago
Ruwan
0c92f80e68
Merge pull request #361 from ruwany/carbon-kernel-4.4.7
...
Migrating kernel/apim/appm/identity to latest versions
8 years ago
harshanl
1b6c7ea502
Refactored PolcyMgt component
8 years ago
Ace
154a6082ce
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
...
# Conflicts:
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
8 years ago
harshanl
108ea98677
Refactor policy mgt components and fixed add operations for invalid devices from task service
8 years ago
harshanl
c967fc34d0
Fixed EMM-1513
8 years ago
Chatura Dilan Perera
50d8885f8b
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
8 years ago
Ace
6a8a5cbd5a
Merging with master
8 years ago
Ace
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
8 years ago
Chatura Dilan Perera
de23a8cf27
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
8 years ago
thusithakalugamage
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
harshanl
671ef77b63
Fixed EMM-1107 issue
8 years ago
Chatura Dilan Perera
2d5262e21e
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
5ccd752404
[maven-release-plugin] prepare release v1.2.0
8 years ago
Chatura Dilan Perera
654e1d9938
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
aa24821667
[maven-release-plugin] prepare release v1.1.2
8 years ago
hasuniea
6db619317c
fixing app-install issue
8 years ago
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
9 years ago
Ace
07b12fe4ea
Bug fixes
9 years ago
Ace
ca8859c80a
Fixing broken build due to new javax.xml imports
9 years ago
Timo Briddigkeit
ed07774552
Fixed literal string comparison.
...
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");
A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
9 years ago
Timo Briddigkeit
0ac4752b2b
Fixed null pointer dereference
9 years ago
Timo Briddigkeit
ee5b077e6a
Fixed various XML External Entity (XXE) attack vulnerabilities
9 years ago
Chatura Dilan
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
9 years ago
Chatura Dilan
ffedcac543
[maven-release-plugin] prepare release v1.1.1
9 years ago
prabathabey
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
9 years ago
Chatura Dilan
2befefc967
Added OS build date
9 years ago
prabathabey
be7e63c390
merging rest-api-improvements branch to master
9 years ago
Chatura Dilan
24b462f4f4
Added is-active field to the Application
9 years ago
prabathabey
624e7df688
Improving HTTP status code handling and the resource implementations
9 years ago
geethkokila
1fabb0eee3
Fixing the database syncing issue
9 years ago
prabathabey
b24250f3f2
Returning device info within the device bean itself
9 years ago
prabathabey
5ed982beb4
Adding more improvements to the JAX-RS APIs of CDM-F
9 years ago
prabathabey
726a700528
Improving error handling in checking for monitoring frquency
9 years ago
prabathabey
6e5148a374
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
9 years ago
prabathabey
8b9cf0da85
Resolving conflicts caused by merging with the updates in master
9 years ago
inosh
1341884957
resolving conflicts
9 years ago
inosh
60b42715d6
syncing admin api from product emm
9 years ago
mharindu
3e291c5b13
[maven-release-plugin] prepare for next development iteration
9 years ago
mharindu
9549ac446b
[maven-release-plugin] prepare release v1.1.0
9 years ago
prabathabey
a375252a94
Adding pluggable push notification framework
9 years ago
Madhawa Perera
94aacb1625
Adding swagger annotations to beans
9 years ago
Madhawa Perera
5d1bf67630
Adding swagger annotations to beans
9 years ago
Madhawa Perera
087adafeb7
Adding swagger annotations to beans
9 years ago
geethkokila
3396a5066d
Adding changes for the updated time of device info and device location
9 years ago
geethkokila
4029c86da4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
2fb42518b6
Adding the changes for the device group with policy.
9 years ago
prabathabey
9068a3d893
Fixing compilation failures caused due to API changes
9 years ago
geethkokila
4cf37bb16c
Fixing the compilation error on the proprietory plugins.
9 years ago
dilanua
ce8d4b53a2
Adding temporary development code bits of dashboard analytics feature
9 years ago
ayyoob
c45895685b
Added device type multi tenancy capability.
9 years ago
geethkokila
e9da24c9e8
Changing the snapshot versions from 1.0.4 to 1.1.0
9 years ago
geethkokila
41191d6df0
Adding the search feature to device mgt plugin
9 years ago
geethkokila
e0e0a57c11
[maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila
cebb88e712
[maven-release-plugin] prepare release v1.0.3
9 years ago
geethkokila
e66d291947
[maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila
f416a73e75
[maven-release-plugin] prepare release v1.0.2
9 years ago
geethkokila
d0a2c5521c
Commenting this due to policy compliance warn will block the device
9 years ago
geethkokila
185a59fbd4
[maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila
b3580d754b
[maven-release-plugin] prepare release v1.0.1
9 years ago
harshanl
402b843e5d
Updated task schedule service to fix EMM-1145, EMM-1100
9 years ago
prabathabey
7a27e88551
Changing the log levels configured in log4j.properties files used as part of test configurations
9 years ago
geethkokila
4e9255fbc9
[maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila
ceb60adb34
[maven-release-plugin] prepare release v1.0.0
9 years ago
pasinduj
ddefa19e0f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Kasun Delgolla
d5f87f4dc1
Committing policy compliance monitoring issue
9 years ago
pasinduj
9a50455a29
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl
00cf61c44c
Fixed EMM-1069 and refactore DCR services
9 years ago
pasinduj
f49f13501f
modified dbscripts removing policy ID forigen key from one table
9 years ago
pasinduj
a390df68ec
modified dbscripts to remove foriegn key reference
9 years ago
harshanl
5b9c44655d
Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master
9 years ago
harshanl
30e8dc885c
Fixed EMM-1034
9 years ago
pasinduj
9c7ebdafdb
modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference
9 years ago
harshanl
b4d17b888b
fixed secondary user-store related issues & multi-tenancy issues
9 years ago
geethkokila
c1eea6894d
Fixing the feature remove from the policy
9 years ago
geethkokila
271c4f76cb
Fixnig the null pointer isssue
9 years ago
geethkokila
700b308b45
Fixing the null pointer and removnig innactive devices being monitored
9 years ago
geethkokila
1989abf881
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
fed4f72d4b
Fixing the null pointer
9 years ago
harshanl
1252d4c160
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
0f146e83fa
Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system
9 years ago
geethkokila
813f9072d8
Fixing the database issue which causes the deviceids slelect did not work
9 years ago
Dileesha Rajapakse
6446be100d
Refactored Policy Management DAO classes
9 years ago
Geeth
5fd9e87dc8
Merge pull request #44 from Kamidu/master
...
change the formatter
9 years ago
Kamidu Sachith
8953a61cc4
Enable Owneship type editing in policy
9 years ago
harshanl
026a7c187a
Fixed EMM-945, EMM-910, EMM-911, EMM-870
9 years ago
Kamidu Sachith
d7c942f395
Enable ownership editing on the policy
9 years ago
geethkokila
feab85796f
Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
9 years ago
geethkokila
20122b3f1e
Fixing the roles and users adding issue
9 years ago
Kasun Delgolla
f519b7c029
Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
prabathabey
90240e7d3f
Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
9 years ago
Kasun Delgolla
8d52735e6a
Adding app list + info to monitoring operation
9 years ago
geethkokila
c46c4f1be9
Fixing the policy update issues
9 years ago
geethkokila
d15eb10636
Adding the null check to monitiring frequncy and fixing the servlet-api issue which is caused a compilation error
9 years ago
geethkokila
f49345e722
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
8a8a152d36
Adding the policy task config
9 years ago
Dulitha Wijewantha
5962694ec2
Adding annotation for the description
9 years ago
Dulitha Wijewantha
002a1ec580
Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
Dulitha Wijewantha
1025e9a425
Fixes to user api
9 years ago
geethkokila
d52df2474e
Fixing policy descriptions
9 years ago
geethkokila
9fca18ae90
Fixing the monitoring issue
9 years ago
geethkokila
81034c84f5
Fixing the method name issue in policy manager service
9 years ago
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
9 years ago
harshanl
234cd47931
Added identity-extensions
9 years ago
mharindu
9813816fab
Fixed bug of adding operations
9 years ago
mharindu
9920f2919a
Fixed spelling mistakes of policy component
9 years ago
mharindu
fbd697edb0
Fixed issue in policy delegation executor
9 years ago
geethkokila
11ead87a5e
Fixing the policy listing issue
9 years ago
geethkokila
6ef4bdd73e
Fixing enrolment id issues
9 years ago
geethkokila
7dd48bf00e
Fixing the monitoring task for INACTIVE, BLOCKED, REMOVED, UNCLAIMED, DISENROLLMENT_REQUESTED, SUSPENDED devices
9 years ago
mharindu
1903b375f3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
dff526b272
Removing the unnessary commets and imports
9 years ago
geethkokila
5ee8c0f065
Fixing the cache manager issues
9 years ago
mharindu
cd853c9ee8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu
ad5335c9f5
Fixed local conflicts and merged
9 years ago
geethkokila
6c5f7d7ada
Fixing conflicts and checkcriterion method
9 years ago
prabathabey
2b6bf203e2
Resolving conflicts observed in policy management implementation
9 years ago
geethkokila
044995ed97
Adding the activate method when policies are added.
9 years ago
mharindu
fd29deb372
Fixed conflicts of local repo and merged
9 years ago
prabathabey
892b9681f5
Fixing transaction handling issues
9 years ago
geethkokila
458618191d
Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
9 years ago
geethkokila
c6d993e532
Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
9 years ago
geethkokila
bcb2c1ddb1
Commiting the monitoring changes and test case changes
9 years ago
geethkokila
44b496d350
Partially commiting due to update
9 years ago
mharindu
94326323bc
Added class level and method level comments for Policy core
9 years ago
mharindu
7fed00a14d
Removed unnecessary logs and added null checks in MonitoringManager
9 years ago
mharindu
5e285071d8
Removed unnecessary white spaces
9 years ago
mharindu
a51e7646e3
Fixing issues of previous PRs
9 years ago
Dilshan Edirisuriya
6cff144573
Merge pull request #26 from milanperera/master
...
Added null check to MonitoringManagerImpl
9 years ago
mharindu
fa82a28c0f
Added null check to MonitoringManagerImpl
9 years ago
prabathabey
2311572d49
code cleanup
9 years ago
prabathabey
cd31662a96
Fixing transactional anomalies found in PolicyManagerImpl
9 years ago
prabathabey
05c3d080e0
Fixing transactional anomalies found in PolicyManagerImpl
9 years ago
prabathabey
cdbdc86f42
Fixing transactional anomalies and code cleanup
9 years ago
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
9 years ago
Dilshan Edirisuriya
5b46a4e2f8
Commenting out unreachable state for now
9 years ago
geethkokila
cceb3ac5db
Fixing errors and adding caching sketch
9 years ago
dilanua
4e5a38998d
Updating DAO Layer
10 years ago
geethkokila
90f8f4aab6
Adding test cases and fixing some logic issues and fixing the null pointer from the policy core
10 years ago