5f68953b11
Merge branch 'master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
8 years ago
27a2c9b979
[maven-release-plugin] prepare for next development iteration
8 years ago
eae935f91c
[maven-release-plugin] prepare release v1.2.5
8 years ago
370f6de260
Removed applied policy upon removal of the last policy applicable for a device
8 years ago
6a55e1be83
[maven-release-plugin] prepare for next development iteration
8 years ago
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
8 years ago
036ed6fe41
Added POLICY_REVOKE operation upon deletion of the last policy
8 years ago
73539362d4
Refactored PolicyAdministratorPointImpl
8 years ago
6e1fdabaad
EMM-1342:Added policy revoke operation
8 years ago
24c38602b8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
51910ee67a
EMM-1675:Added policy revoke operation
8 years ago
ca68181541
Fixing NPE of EMM-1715
8 years ago
2128f08658
fixing EMM-1750
8 years ago
2f852d84f4
Fix for the issue : EMM policy updating issue
8 years ago
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
4bcf350236
EMM-1678:Updated the oauth component versions
8 years ago
f22d392978
Upgrade to comply with latest CDMF changes
8 years ago
f9ba45f439
Fixed the device status changing issue when there are multiple enrollments for the same device
8 years ago
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
8 years ago
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
8 years ago
f24242fb8a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dd03d0b740
Added device status change upon inactivity mechanism
8 years ago
0c92f80e68
Merge pull request #361 from ruwany/carbon-kernel-4.4.7
...
Migrating kernel/apim/appm/identity to latest versions
8 years ago
1b6c7ea502
Refactored PolcyMgt component
8 years ago
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
108ea98677
Refactor policy mgt components and fixed add operations for invalid devices from task service
8 years ago
c967fc34d0
Fixed EMM-1513
8 years ago
50d8885f8b
[maven-release-plugin] prepare for next development iteration
8 years ago
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
8 years ago
6a8a5cbd5a
Merging with master
8 years ago
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
8 years ago
de23a8cf27
[maven-release-plugin] prepare for next development iteration
8 years ago
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
8 years ago
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
671ef77b63
Fixed EMM-1107 issue
8 years ago
2d5262e21e
[maven-release-plugin] prepare for next development iteration
8 years ago
5ccd752404
[maven-release-plugin] prepare release v1.2.0
8 years ago
654e1d9938
[maven-release-plugin] prepare for next development iteration
8 years ago
aa24821667
[maven-release-plugin] prepare release v1.1.2
8 years ago
6db619317c
fixing app-install issue
8 years ago
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
8 years ago
07b12fe4ea
Bug fixes
8 years ago
ca8859c80a
Fixing broken build due to new javax.xml imports
8 years ago
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.
8 years ago
0ac4752b2b
Fixed null pointer dereference
8 years ago
ee5b077e6a
Fixed various XML External Entity (XXE) attack vulnerabilities
8 years ago
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
8 years ago
ffedcac543
[maven-release-plugin] prepare release v1.1.1
8 years ago
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
8 years ago
2befefc967
Added OS build date
8 years ago
be7e63c390
merging rest-api-improvements branch to master
8 years ago
24b462f4f4
Added is-active field to the Application
8 years ago
624e7df688
Improving HTTP status code handling and the resource implementations
8 years ago
1fabb0eee3
Fixing the database syncing issue
8 years ago
b24250f3f2
Returning device info within the device bean itself
8 years ago
5ed982beb4
Adding more improvements to the JAX-RS APIs of CDM-F
8 years ago
726a700528
Improving error handling in checking for monitoring frquency
8 years ago
6e5148a374
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
8 years ago
8b9cf0da85
Resolving conflicts caused by merging with the updates in master
8 years ago
1341884957
resolving conflicts
8 years ago
60b42715d6
syncing admin api from product emm
8 years ago
3e291c5b13
[maven-release-plugin] prepare for next development iteration
8 years ago
9549ac446b
[maven-release-plugin] prepare release v1.1.0
8 years ago
a375252a94
Adding pluggable push notification framework
8 years ago
94aacb1625
Adding swagger annotations to beans
9 years ago
5d1bf67630
Adding swagger annotations to beans
9 years ago
087adafeb7
Adding swagger annotations to beans
9 years ago
3396a5066d
Adding changes for the updated time of device info and device location
9 years ago
4029c86da4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
2fb42518b6
Adding the changes for the device group with policy.
9 years ago
9068a3d893
Fixing compilation failures caused due to API changes
9 years ago
4cf37bb16c
Fixing the compilation error on the proprietory plugins.
9 years ago
ce8d4b53a2
Adding temporary development code bits of dashboard analytics feature
9 years ago
c45895685b
Added device type multi tenancy capability.
9 years ago
e9da24c9e8
Changing the snapshot versions from 1.0.4 to 1.1.0
9 years ago
41191d6df0
Adding the search feature to device mgt plugin
9 years ago
e0e0a57c11
[maven-release-plugin] prepare for next development iteration
9 years ago
cebb88e712
[maven-release-plugin] prepare release v1.0.3
9 years ago
e66d291947
[maven-release-plugin] prepare for next development iteration
9 years ago
f416a73e75
[maven-release-plugin] prepare release v1.0.2
9 years ago
d0a2c5521c
Commenting this due to policy compliance warn will block the device
9 years ago
185a59fbd4
[maven-release-plugin] prepare for next development iteration
9 years ago
b3580d754b
[maven-release-plugin] prepare release v1.0.1
9 years ago
402b843e5d
Updated task schedule service to fix EMM-1145, EMM-1100
9 years ago
7a27e88551
Changing the log levels configured in log4j.properties files used as part of test configurations
9 years ago
4e9255fbc9
[maven-release-plugin] prepare for next development iteration
9 years ago
ceb60adb34
[maven-release-plugin] prepare release v1.0.0
9 years ago
ddefa19e0f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
d5f87f4dc1
Committing policy compliance monitoring issue
9 years ago
9a50455a29
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
00cf61c44c
Fixed EMM-1069 and refactore DCR services
9 years ago
f49f13501f
modified dbscripts removing policy ID forigen key from one table
9 years ago
a390df68ec
modified dbscripts to remove foriegn key reference
9 years ago
5b9c44655d
Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master
9 years ago
30e8dc885c
Fixed EMM-1034
9 years ago
9c7ebdafdb
modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference
9 years ago
b4d17b888b
fixed secondary user-store related issues & multi-tenancy issues
9 years ago
c1eea6894d
Fixing the feature remove from the policy
9 years ago
271c4f76cb
Fixnig the null pointer isssue
9 years ago
700b308b45
Fixing the null pointer and removnig innactive devices being monitored
9 years ago
charitha
WSO2 Builder
harshanl
susinda
hasuniea
kamidu
Chatura Dilan Perera
Ruwan
thusithakalugamage
Prabath Abeysekara
Timo Briddigkeit
prabathabey
geethkokila
inosh
mharindu
Madhawa Perera
dilanua
ayyoob
pasinduj
Kasun Delgolla