Supun94
cc5d9012c1
Created simple evaluation point
2016-12-19 16:19:36 +05:30
Supun94
21bc812281
Minor refactoring on Policy Eval service comp
2016-12-19 16:19:36 +05:30
Rasika Perera
1465c56822
Revert "[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit f9b6939cb7
2016-12-19 12:39:56 +05:30
WSO2 Builder
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
2016-12-19 09:06:04 +05:30
Rasika Perera
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37
2016-12-19 08:45:19 +05:30
WSO2 Builder
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
2016-12-16 17:03:06 +05:30
geethkokila
2b7d5fd66b
Fixing the null pointer issue in policy manager
2016-12-15 10:57:48 +05:30
WSO2 Builder
a59edee410
[maven-release-plugin] prepare for next development iteration
2016-12-08 14:39:00 +00:00
WSO2 Builder
8f9b21b41b
[maven-release-plugin] prepare release v2.0.3
2016-12-08 14:37:11 +00:00
geethkokila
d911281ad1
Merging master branch with release-2.0.x
2016-12-08 12:34:50 +05:30
WSO2 Builder
228b24ca79
[maven-release-plugin] prepare for next development iteration
2016-12-01 12:14:01 +00:00
WSO2 Builder
5dbb258f55
[maven-release-plugin] prepare release v2.0.2
2016-12-01 12:10:10 +00:00
geethkokila
20ca76640d
Adding changes for the grouping and ownership changes
2016-12-01 16:35:59 +05:30
geethkokila
0879a75f7b
Fixing the serializing issue of device groups.
2016-11-30 17:46:01 +05:30
WSO2 Builder
8431b30ddc
[maven-release-plugin] prepare for next development iteration
2016-11-25 08:06:30 +00:00
WSO2 Builder
ae2e283f14
[maven-release-plugin] prepare release v2.0.1
2016-11-25 07:43:34 +00:00
WSO2 Builder
19c1b3566d
[maven-release-plugin] prepare for next development iteration
2016-11-16 12:18:48 +00:00
WSO2 Builder
cff6e242c8
[maven-release-plugin] prepare release v2.0.0
2016-11-16 12:16:25 +00:00
charitha
a6064d2561
Update component versions for IoTS-1.0.0 release
2016-11-16 13:32:13 +05:30
charitha
ac30e7eb3e
Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
2016-11-01 14:47:21 +05:30
WSO2 Builder
9517a3d30f
[maven-release-plugin] prepare for next development iteration
2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9
[maven-release-plugin] prepare release v1.2.6
2016-10-31 10:32:11 +00:00
charitha
1bfba25c5e
Remove user list and role list attributes from group object
...
Move group components to same devicemgt package levels
2016-10-26 17:51:38 +05:30
charitha
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
2016-10-25 14:22:44 +05:30
WSO2 Builder
27a2c9b979
[maven-release-plugin] prepare for next development iteration
2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c
[maven-release-plugin] prepare release v1.2.5
2016-10-18 12:09:16 +00:00
harshanl
370f6de260
Removed applied policy upon removal of the last policy applicable for a device
2016-10-18 17:10:34 +05:30
WSO2 Builder
6a55e1be83
[maven-release-plugin] prepare for next development iteration
2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
2016-10-17 14:13:25 +00:00
harshanl
036ed6fe41
Added POLICY_REVOKE operation upon deletion of the last policy
2016-10-14 19:20:11 +05:30
harshanl
73539362d4
Refactored PolicyAdministratorPointImpl
2016-10-14 17:33:41 +05:30
harshanl
6e1fdabaad
EMM-1342:Added policy revoke operation
2016-10-14 17:13:43 +05:30
harshanl
24c38602b8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-13 17:11:42 +05:30
harshanl
51910ee67a
EMM-1675:Added policy revoke operation
2016-10-13 17:11:36 +05:30
susinda
ca68181541
Fixing NPE of EMM-1715
2016-10-13 12:11:37 +05:30
hasuniea
2128f08658
fixing EMM-1750
2016-10-13 10:00:08 +05:30
kamidu
2f852d84f4
Fix for the issue : EMM policy updating issue
2016-10-10 16:37:37 +05:30
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
2016-10-10 15:29:10 +05:30
harshanl
4bcf350236
EMM-1678:Updated the oauth component versions
2016-10-06 19:43:23 +05:30
charitha
f22d392978
Upgrade to comply with latest CDMF changes
2016-10-04 19:03:07 +05:30
harshanl
f9ba45f439
Fixed the device status changing issue when there are multiple enrollments for the same device
2016-09-30 11:04:28 +05:30
Chatura Dilan Perera
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
2016-09-29 20:32:59 +05:30
harshanl
f24242fb8a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-09-23 21:17:50 +05:30
harshanl
dd03d0b740
Added device status change upon inactivity mechanism
2016-09-23 21:17:37 +05:30
Ruwan
0c92f80e68
Merge pull request #361 from ruwany/carbon-kernel-4.4.7
...
Migrating kernel/apim/appm/identity to latest versions
2016-09-23 17:04:18 +05:30
harshanl
1b6c7ea502
Refactored PolcyMgt component
2016-09-22 20:30:18 +05:30
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
2016-09-22 19:08:21 +05:30
harshanl
108ea98677
Refactor policy mgt components and fixed add operations for invalid devices from task service
2016-09-21 19:44:46 +05:30
harshanl
c967fc34d0
Fixed EMM-1513
2016-09-20 18:43:50 +05:30
Chatura Dilan Perera
50d8885f8b
[maven-release-plugin] prepare for next development iteration
2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
2016-09-19 18:54:38 +05:30
Ace
6a8a5cbd5a
Merging with master
2016-09-19 12:21:41 +05:30
Ace
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
2016-09-14 17:23:09 +05:30
Chatura Dilan Perera
de23a8cf27
[maven-release-plugin] prepare for next development iteration
2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
2016-09-09 20:18:12 +05:30
thusithakalugamage
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
2016-09-09 18:42:46 +05:30
harshanl
671ef77b63
Fixed EMM-1107 issue
2016-09-09 18:25:28 +05:30
Chatura Dilan Perera
2d5262e21e
[maven-release-plugin] prepare for next development iteration
2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404
[maven-release-plugin] prepare release v1.2.0
2016-09-09 17:10:04 +05:30
Chatura Dilan Perera
654e1d9938
[maven-release-plugin] prepare for next development iteration
2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667
[maven-release-plugin] prepare release v1.1.2
2016-08-18 22:09:33 +05:30
hasuniea
6db619317c
fixing app-install issue
2016-08-17 15:29:51 +05:30
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
2016-08-03 14:12:24 +05:30
Ace
07b12fe4ea
Bug fixes
2016-07-26 22:03:14 +05:30
Ace
ca8859c80a
Fixing broken build due to new javax.xml imports
2016-07-18 09:09:29 +05:30
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.
2016-07-15 16:25:31 +02:00
Timo Briddigkeit
0ac4752b2b
Fixed null pointer dereference
2016-07-15 09:47:08 +02:00
Timo Briddigkeit
ee5b077e6a
Fixed various XML External Entity (XXE) attack vulnerabilities
2016-07-13 15:02:11 +02:00
Chatura Dilan
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
2016-07-08 19:11:40 +05:30
Chatura Dilan
ffedcac543
[maven-release-plugin] prepare release v1.1.1
2016-07-08 19:09:55 +05:30
prabathabey
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
2016-07-07 13:10:19 +05:30
Chatura Dilan
2befefc967
Added OS build date
2016-07-01 15:45:59 +05:30
prabathabey
be7e63c390
merging rest-api-improvements branch to master
2016-06-30 16:40:15 +05:30
Chatura Dilan
24b462f4f4
Added is-active field to the Application
2016-06-29 17:41:45 +05:30
prabathabey
624e7df688
Improving HTTP status code handling and the resource implementations
2016-06-27 16:28:49 +05:30
geethkokila
1fabb0eee3
Fixing the database syncing issue
2016-06-07 12:55:15 +05:30
prabathabey
b24250f3f2
Returning device info within the device bean itself
2016-06-02 20:49:23 +05:30
prabathabey
5ed982beb4
Adding more improvements to the JAX-RS APIs of CDM-F
2016-05-30 16:40:57 +05:30
prabathabey
726a700528
Improving error handling in checking for monitoring frquency
2016-05-30 11:45:02 +05:30
prabathabey
6e5148a374
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
2016-05-30 08:21:59 +05:30
prabathabey
8b9cf0da85
Resolving conflicts caused by merging with the updates in master
2016-05-25 17:37:21 +05:30
inosh
1341884957
resolving conflicts
2016-05-23 14:14:05 +05:30
inosh
60b42715d6
syncing admin api from product emm
2016-05-23 14:11:25 +05:30
mharindu
3e291c5b13
[maven-release-plugin] prepare for next development iteration
2016-05-20 16:43:16 +05:30
mharindu
9549ac446b
[maven-release-plugin] prepare release v1.1.0
2016-05-20 16:43:02 +05:30
prabathabey
a375252a94
Adding pluggable push notification framework
2016-05-19 00:20:45 +05:30
Madhawa Perera
94aacb1625
Adding swagger annotations to beans
2016-05-13 02:38:10 +05:30
Madhawa Perera
5d1bf67630
Adding swagger annotations to beans
2016-05-13 01:31:33 +05:30
Madhawa Perera
087adafeb7
Adding swagger annotations to beans
2016-05-13 01:25:29 +05:30
geethkokila
3396a5066d
Adding changes for the updated time of device info and device location
2016-04-29 22:30:07 +05:30
geethkokila
4029c86da4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-27 10:26:51 +05:30
geethkokila
2fb42518b6
Adding the changes for the device group with policy.
2016-04-27 10:26:47 +05:30
prabathabey
9068a3d893
Fixing compilation failures caused due to API changes
2016-04-26 16:40:30 +05:30
geethkokila
4cf37bb16c
Fixing the compilation error on the proprietory plugins.
2016-04-24 08:54:31 +05:30
dilanua
ce8d4b53a2
Adding temporary development code bits of dashboard analytics feature
2016-04-08 15:10:01 +05:30
ayyoob
c45895685b
Added device type multi tenancy capability.
2016-03-29 11:40:58 +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
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
d0a2c5521c
Commenting this due to policy compliance warn will block the device
2015-12-24 11:09:32 +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
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
