Harshan Liyanage
f961b57f9f
EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
8 years ago
Saad Sahibjan
1cb969eb6d
Fix incorrect spacing
8 years ago
WSO2 Builder
27a2c9b979
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
eae935f91c
[maven-release-plugin] prepare release v1.2.5
8 years ago
Kamidu Sachith Punchihewa
7666bbfd05
Merge pull request #395 from Megala21/master
...
Fixing EMM-1752 and EMM-1755
8 years ago
WSO2 Builder
6a55e1be83
[maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
8 years ago
Megala
3416ae78c4
Fixing the problems in displaying user list when the user names has special chracters
8 years ago
Megala
1ff86289fd
Fixing the problems that happend when we have special chracters in roles
8 years ago
Megala
4ec6883ec8
Merge remote-tracking branch 'upstream/master'
8 years ago
Megala
4a71be850c
Refactoring code
8 years ago
Shavindri
28cb653b06
Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
8 years ago
Megala
a04f91cddb
Fixing issues related to mapping users and roles from different user stores
8 years ago
Megala
87150f5074
Fixing secondary role deletion
8 years ago
Megala
0756294724
Merge remote-tracking branch 'upstream/master'
8 years ago
Megala
d8555c34ab
Fixing issues related with roles of secondary user store
8 years ago
Kamidu Sachith Punchihewa
cce4428a9d
Merge pull request #390 from shavidissa/master
...
Removed the GroupManagementService and GroupManagementAdminService references from the APIs and continued adding swagger annotations
8 years ago
Shavindri
c64581dc59
Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex
8 years ago
susinda
eb20d1fc1c
Device delete implemented (only in api level) for iot
8 years ago
charitha
528687bde3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
0498c68ca5
Add validation to maximum limit value
...
(cherry picked from commit 4ed757f)
8 years ago
Megala
4999b84169
Reformatting code
8 years ago
Megala
5b96e1b849
Fixing EMM-1333
8 years ago
Kamidu Sachith Punchihewa
af4989e56d
Merge pull request #384 from shavidissa/master
...
swagger annotations and definition update continued for device type, …
8 years ago
Shavindri
1e32d5f89f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Shavindri
0842dcb2bb
swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.
8 years ago
ayyoob
93c1725e32
fixed api name for device type
8 years ago
charitha
e53b0c3860
Fix group count listing in dashboard
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
ayyoob
5727886ea1
few changes after apimgt integration
8 years ago
charitha
94a50584f4
Improve group listing with pagination
8 years ago
madhawap
16b334b0b3
changes to swagger SecurityDefinitionConfigurator and annotations
8 years ago
madhawap
7b8518a9db
changes to swagger SecurityDefinitionConfigurator and annotations
8 years ago
charitha
ce5d63925a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
e89b4015b6
Introduced pagination
8 years ago
Kamidu Sachith Punchihewa
06e70c8326
Merge pull request #373 from shavidissa/master
...
swagger annotations and definitions changes for role management, configuration management and application management(admin)
8 years ago
Shavindri
f0164b5a01
swagger annotations and definitions changes for role management, configuration management and application management(admin)
8 years ago
charitha
06176898d0
Exposed group id to API level
8 years ago
Megala
e77d8b8b29
Adding isEmpty check
8 years ago
Megala
0642cc10d7
Reformatting code
8 years ago
Megala
f9204add08
Merge remote-tracking branch 'upstream/master'
8 years ago
charitha
f22d392978
Upgrade to comply with latest CDMF changes
8 years ago
Megala
b7990b9146
Fixing problems in retriveing data from secondary user store
8 years ago
dilanua
dff32af832
Adding initial swagger annotations and permissions to Dashboard APIs
8 years ago
dilanua
1ca5762c44
Uncommenting Dashboard APIs
8 years ago
charitha
a0050d8f4d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
d1d6eefd17
Upgrading grouping backend
8 years ago
harshanl
a4538a6d6c
Removed unnecessary params from paginated queries
8 years ago
harshanl
befb5b0ad8
EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.
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
Rasika Perera
b2eb715fb7
REsolving conflicts
8 years ago
Rasika Perera
5c8c28d28c
Merge pull request #1 from warunalakshitha/master
...
upgrade product iot to carbon 4.4.9
8 years ago
Rasika Perera
237b9a7078
Creating api endpoint to retrieve features of a device-type
8 years ago
amalhub
428ce25b6f
Fixing issue: https://wso2.org/jira/browse/EMM-1646
8 years ago
Rasika Perera
a61be7a7ec
Enable group management api
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
Chatura Dilan Perera
7395c76408
Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Ace
33d8829540
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
8 years ago
dilanua
d8e057abdd
Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
8 years ago
Ace
87ad1e0e71
Fixing intermittent jackson bind issue
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
harshanl
75df243a33
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Ace
6a8a5cbd5a
Merging with master
8 years ago
harshanl
4169d3b2bd
Fixed EMM-1554
8 years ago
dilanua
713c8ac4d8
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
8 years ago
dilanua
58f8656e94
Changing permissions - /devices/owning to /devices/owning-device
8 years ago
harshanl
78cab76101
Fixed EMM-1531
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
harshanl
0eaf33aa5c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl
87a5b09266
Added users/count API
8 years ago
thusithakalugamage
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
kamidu
0fdcbae817
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
878daae5c5
Permission modifications
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
harshanl
7dc93ff010
MSSQL script fixes and added the /users/count REST API
8 years ago
mharindu
115099c8fe
Implemented permission based authorization
8 years ago
dilanua
d24ba98643
Updating activate and deactivate policy endpoints from PUT to POST
8 years ago
charitha
3575c9a33d
Fix issue in get devices with since parameter.
8 years ago
Chatura Dilan Perera
f29b9e84f2
Fixed 200 returns when activities are empty and since is a future date
8 years ago
Chatura Dilan Perera
9aa5f2793f
return date format as UTC in APIs
8 years ago
Chatura Dilan Perera
475b832c59
Changed return date format to UTC date
8 years ago
charitha
0fe827ca9f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
9246cdcf30
Return empty array when results not found with since parameter
8 years ago
Saad Sahibjan
a72b47f6f7
Fixing incorrect response for remove policy
8 years ago
harshanl
f3aefcca77
Fixed EMM-1450
8 years ago
Chatura Dilan Perera
8b17cbb339
Fix conflicts
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
harshanl
67942d5c1d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
6b4ab635af
Fixing jiras: EMM-1472, EMM-1505
8 years ago
harshanl
2cb8f0b313
Fixed EMM-1392
8 years ago
Ruwan
6134f94e3c
Merge pull request #332 from ayyoob/com
...
fixing commit issues
8 years ago
hasuniea
282f53bf09
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3
8 years ago
hasuniea
c269f35ef2
fixing getAllActivity H2 issue
8 years ago
mharindu
7346313d27
Modified scope management service
8 years ago
ayyoob
442c2b86da
fixed formatting issues
8 years ago
harshanl
a7d7c689e8
Removed unsupported roleName parameter from device API
8 years ago
ayyoob
3b56668af0
merged with upstream
8 years ago
madhawap
ecfe94235f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
madhawap
c6cc5e8df3
fixes to role updating endpoint
8 years ago
ayyoob
3edc68d204
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com
8 years ago
ayyoob
058f9e4cfa
merged with origin
8 years ago
harshanl
e80c2f4050
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
352643a421
Changing deactivate-policy api method to PUT
8 years ago
harshanl
34e97aeeae
Removed device search using roleName parameter.
8 years ago
mharindu
5bdb4630af
Fixed conflicts and merged
8 years ago
mharindu
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
mharindu
2e79dd290e
Modified scopes
8 years ago
hasuniea
1b07b18678
adding security fixes
8 years ago
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
8 years ago
mharindu
ed4c762bfd
Refactored scopes
8 years ago
ayyoob
a7074e2e4e
refactored general configuration
8 years ago
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
8 years ago
mharindu
eb5216091e
Fixed conflicts and merged
8 years ago
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
8 years ago
mharindu
6e742ee6ac
Added scope beans
8 years ago
mharindu
564c2b280e
Fixed conflicts and merged
8 years ago
Chatura Dilan
7af8ecc686
Added userstore for role listing
8 years ago
mharindu
b3d309583d
Fixed issues in scope service
8 years ago
mharindu
7f1e2fdf0b
Implemented scope management service
8 years ago
mharindu
bdec8880bb
Fixed conflicts and merged
9 years ago
mharindu
186432e1df
Fixed webapp name resolving issue
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
90910518d6
Fixed null pointer dereferences
9 years ago
Timo Briddigkeit
09020ccb9f
Fixed predictable pseudorandom number generator
9 years ago
mharindu
99664b23c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
Dilan U. Ariyaratne
ab5aa3e31c
Merge pull request #315 from madhawap/master
...
Added missing end-point to the permissions.xml
9 years ago
madhawap
0b338a1d25
Added missing end-point to the permissions.xml
9 years ago
mharindu
789086a667
Changed context paths
9 years ago
mharindu
0f904e21d8
Fixed conflicts and merged
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
mharindu
79a6da82f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu
c7eef634ac
Added send-invitation endpoint
9 years ago
dilanua
c61ef1c98e
Fixing issues of GET /compliance-data API
9 years ago
Ace
58666bc4b0
Adding device name url param for device search
9 years ago
madhawap
c3cbc5b4fb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap
0b1e4ad86b
Updated permissions.xml according to new end-points
9 years ago
Ace
d58fb57f4e
Enabling device search for multiple params
9 years ago
madhawap
e52fed0b2d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap
34354c032e
Added end-point to get devices enrolled under a specific user
9 years ago
prabathabey
6edfad5fb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
9 years ago
Dilan U. Ariyaratne
73551590b9
Merge pull request #313 from madhawap/master
...
Added end point to get Compliance Data Of a Device
9 years ago
madhawap
09e2d2ecaf
Removing the internal status code added to the compliance data wrapper
9 years ago