dilanua
78b5cf9fb3
Updating user APIs - UI
8 years ago
dilanua
4eaa3be491
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
83498b1039
Updating operation APIs
8 years ago
kamidu
8eeabcee2c
Fix for Jira issue EMM-1418
8 years ago
hasuniea
1ba598a93e
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
charitha
3d19d9ed2e
Add MySQLOperationDAOImpl for row locking.
8 years ago
hasuniea
6db619317c
fixing app-install issue
8 years ago
harshanl
2cb8f0b313
Fixed EMM-1392
8 years ago
harshanl
d81733a4d6
Removed unused class
8 years ago
kamidu
4506db3647
Fix notification view issue
8 years ago
kamidu
77a8fed7de
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
hasuniea
5c57b664ad
fixing getAllActivity H2 issue
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
harshanl
d628699e8b
Fixed repeating task operations.
8 years ago
mharindu
af286b8aaf
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu
7346313d27
Modified scope management service
8 years ago
harshanl
2bf6f562df
Fixed repeating task operations.
8 years ago
kamidu
28760d2bee
Enable advanced search for devices
8 years ago
dilanua
b37687cb58
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
8cb26b3264
Fixing no api resource found issue: changing user credentials
8 years ago
ayyoob
a7c201363c
logged exception trace
8 years ago
ayyoob
442c2b86da
fixed formatting issues
8 years ago
ayyoob
892d5cee20
avoided lazy inialization
8 years ago
harshanl
a7d7c689e8
Removed unsupported roleName parameter from device API
8 years ago
harshanl
671ba46fae
Removed unnecessary properties from EnrollmentInfo object
8 years ago
harshanl
d401741d9b
Fixed EMM-1492
8 years ago
Ace
e5a4c0f795
Adding role add/update/delete related changes
8 years ago
ayyoob
e45ba68a90
changing the context of device-types api
8 years ago
ayyoob
3b56668af0
merged with upstream
8 years ago
ayyoob
c04edef151
Added Certificate Configuration
8 years ago
dilanua
fcff1f0854
Fixing user menu reg exp issue
8 years ago
dilanua
106051a0a5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
e07991174d
Adding user password change UI
8 years ago
kamidu
83cbd56b03
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
0be419d6cc
Fix ui issues in device view section
8 years ago
dilanua
f71106d011
Fixing issues on Password Reset UI
8 years ago
dilanua
0836b2c99e
Fixing user create page QR-generation issues
8 years ago
kamidu
42b6882cc1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
73b4abc46b
Updating user remove UI
8 years ago
dilanua
4acfde1511
Adding user edit UI and fixes
8 years ago
kamidu
3219ac2101
Fixing the notification listing ui
8 years ago
dilanua
312f9d3f26
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
280c5e496d
Adding user edit UI and fixes
8 years ago
Ace
d8c6720857
Removing previous query
8 years ago
Ace
74b7af7be7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Ace
aa01c7a52e
Adding query improvements to activities retrieval query
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
217f541991
added certificate units
8 years ago
dilanua
b9efedfdbd
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
632202899a
Fixing issues in bulk user invitations
8 years ago
harshanl
c448d915d8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
ayyoob
058f9e4cfa
merged with origin
8 years ago
ayyoob
6f5d6abea3
updated device type label to defaul device type name
8 years ago
kamidu
9fde8c0442
Resolving conflicts
8 years ago
kamidu
120fe530ac
Fix the device view related issues
8 years ago
dilanua
d7eed8bc1d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
0945c8f547
Adding user create UI
8 years ago
harshanl
e80c2f4050
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
hasuniea
ed5e954194
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
hasuniea
349c3bdb63
fixing App Version not updating in portal after being initially set
8 years ago
dilanua
390d929e70
Adding policy priority UI
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
Ace
e1c4305e73
Adding fixes to Activities retrival query
8 years ago
Ace
71709a800f
Adding group by function when retrieving operations
8 years ago
dilanua
4549452634
Updating getAllPolicies UI function with icon key
8 years ago
prabathabey
4c3211b079
Fixing issues in acitivity retrieval
8 years ago
dilanua
6e2249419d
Updating policy edit base UI
8 years ago
dilanua
0521f1a9dd
Updating policy view Base UI
8 years ago
harshanl
8fa311e119
Removed unnecessary properties from EnrollmentInfo object
8 years ago
prabathabey
90889824e3
Further improving the performance of activity info retrieval
8 years ago
prabathabey
c161d7b659
Adding indexes to improve performance of entity retrieval and fixing a sytax error in the SQL query used to retrieve activities
8 years ago
prabathabey
213836541f
Fixing missing columns returned in the query that returns the list of acitivities
8 years ago
prabathabey
3abe837de3
Improving retrieval of activities
8 years ago
prabathabey
fc5021a0d5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
prabathabey
c7730adbcb
Improving the retrieval of activities
8 years ago
harshanl
eb801696bf
Fixed EMM-1492
8 years ago
harshanl
f82ce82648
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl
08ff70bb3c
Refactored CertMgt component
8 years ago
Rasika Perera
c01db9c773
Replaced emm specific unit implementation with old generalized cdmf unit
8 years ago
Rasika Perera
bb526513e8
Removed enrollment url calculation
8 years ago
mharindu
55acb7e7d3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu
bd41e4f4fb
Implemented scope based authorization in device-mgt UI module
8 years ago
madhawap
d0d101297f
changes to removeCertificate endpoint, fix for the jira EMM-1490
8 years ago
madhawap
f12d2a5d69
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
madhawap
324e7fd4c6
changes to removeCertificate endpoint, fix for the jira EMM-1490
8 years ago
Ace
aa7d3385ce
Adding missed role-listing changes
8 years ago
Ace
c693a11d7c
Fixing user,device,role listing pages
8 years ago
mharindu
5bdb4630af
Fixed conflicts and merged
8 years ago
mharindu
734aaa8c9e
Fixed null pointer exception
8 years ago
mharindu
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
hasuniea
48543862c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
952905c60d
Adding Policy Edit UI
8 years ago
mharindu
2e79dd290e
Modified scopes
8 years ago
hasuniea
1b07b18678
adding security fixes
8 years ago
dilanua
fa0891d9a2
Adding Policy View UI
8 years ago
mharindu
acf6d7ecd7
Fixed conflicts and merged
8 years ago
dilanua
13126fe398
Adding policy create UI
8 years ago
dilanua
87cdfa209e
Updating policy management
8 years ago
harshanl
f1c1c67656
Removed unused policy.mgt module from device core bundle
8 years ago
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
8 years ago
harshanl
35ea88b9de
Fixed EMM-1476.
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
madhawap
5bd879545b
fix for the iOS device operations blocker
8 years ago
madhawap
2e71c21378
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
madhawap
d315e739e4
fix for the iOS device operations blocker
8 years ago
kamidu
23fe8b1fdb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
160d8c2feb
Fix the policy create wizard ui issues
8 years ago
dilanua
2ec9f68135
Removing the deprecation of operation.js as it seems to have one dependancy to plugins
8 years ago
Rasika Perera
b8bf855378
Calculating enrollment url when generalConfig.host config exists
8 years ago
inoshperera
2e8df6a16a
Merge pull request #322 from charithag/master
...
Fix issues in sql statements
8 years ago
charitha
efcd5272d2
Fix issues in sql statements
8 years ago
harshanl
01e2408ece
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu
34f1d9ee38
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
kamidu
9510554f67
Fix the notification view internal server error issue
8 years ago
dilanua
c7f4bba8bf
Deprecating operation.js module from UI
8 years ago
dilanua
e125871de0
Adding business-controllers to UI Modules
8 years ago
harshanl
06f72c014e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
8 years ago
dilanua
ec7f8ccd1f
disabling testing info logs at token-protected-service-invokers.js
8 years ago
dilanua
89cebcdb9e
Updating UI oauth module with suppressed warnings for verified, but unresolved variables and functions
8 years ago
dilanua
39b14c9bc5
Adding conf-reader to UI modules
8 years ago
dilanua
bbff93adcc
Updating token-handler-utils with suppressed warnings for java packg imports
8 years ago
mharindu
ccdcea0109
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
dilanua
303f16e747
Deprecating obsolete UI functions - device.js
8 years ago
dilanua
bc4192280c
Updating OAuth UI Module
8 years ago
dilanua
020f35cb4e
Updating OAuth UI Module
8 years ago
dilanua
7017f6e32b
Updating OAuth module dependants
8 years ago
dilanua
032b5d129a
Adding OAUTH module to UI
8 years ago
dilanua
b86be8375c
Refactoring OAuth utilities at UI Layer
8 years ago
dilanua
70074e2f3e
Refactoring OAuth utilities at UI Layer
8 years ago
dilanua
76385a1c9b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
a4c5aa5951
Refactoring OAuth utilities at UI Layer
8 years ago
Milan Perera
59b862dfc7
Merge pull request #321 from ayyoob/com
...
few fixes in JWT Client
8 years ago
dilanua
f7509f698d
Removing obsolete UI modules
8 years ago
dilanua
2efdc30177
Refactoring OAuth utilities at UI Layer
8 years ago
mharindu
84090fb16c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
ayyoob
c71e5ead00
few fixes in JWT Client
8 years ago
ayyoob
b57db836d3
removed error message
8 years ago
Milan Perera
c49dc435e1
Merge pull request #319 from ayyoob/transport
...
Updated grant type implementation
8 years ago
dilanua
4b39a877ad
Updating oauth token handlers
8 years ago
ayyoob
d5e756c205
Updated Grant Type Implementation
8 years ago
dilanua
1172e759ca
Deprecating serverAdress.js
8 years ago
prabathabey
5ed3174a28
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
prabathabey
5adfab9f8a
Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API
8 years ago
Ace
07b12fe4ea
Bug fixes
8 years ago
Ace
0d94a293a4
Adding notification and fixing QR code
8 years ago
prabathabey
c63818b78f
Avoiding multiple device data getting retrieved upon the same id
8 years ago
prabathabey
e27905792f
Code cleanup
8 years ago
prabathabey
5bc7cf7c30
Simplifying operation management related implementations
8 years ago
dilanua
8550bcb145
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
d2ec81b12b
Refactoring oauth token handling functions and dependants
8 years ago
Ace
1ed0481ec3
Changing nav-bar base-unit implementation
8 years ago
mharindu
6e742ee6ac
Added scope beans
8 years ago
mharindu
564c2b280e
Fixed conflicts and merged
8 years ago
Chatura Dilan
046cd6586c
Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Chatura Dilan
7af8ecc686
Added userstore for role listing
8 years ago
dilanua
34edbce1a0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
c228f03481
Refactoring oauth token handling functions and dependants
8 years ago
prabathabey
89634a9c38
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
prabathabey
bd1322e801
Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl
8 years ago
dilanua
2e5d046fbf
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
b72d099641
Refactoring oauth token handling functions
8 years ago
hasuniea
70f23b0919
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
hasuniea
a02f7a5db1
fixing formatting issue
8 years ago
dilanua
d05c6e2170
Deprecating /api/token.jag (unused)
8 years ago
mharindu
3457bba4a3
Adding Annotation reading fix for device-mgt-extensions
8 years ago
dilanua
87dbb5f9e1
Refactoring ui token handling functions
8 years ago
dilanua
7facff4b58
Updating ui init logic
8 years ago
mharindu
19275634a1
Fixed webapp name resolving issue
8 years ago
dilanua
c57c75945c
Deprecating invoker-request-wrapper (unused)
8 years ago
dilanua
00f98f5cce
Updating base ui app config reader
8 years ago
dilanua
d04cb54ae8
Refactoring base ui app config reader
8 years ago
dilanua
c12630e65c
Refactoring base ui app config reader
8 years ago
dilanua
1916c4df5f
Refactoring cdmf product page layout
8 years ago
dilanua
7d9cde3cfb
Refactoring Navigation Bar
8 years ago
dilanua
99aca9b90a
Updating user-listing
8 years ago
dilanua
bbce1a3d8a
Refactoring user-listing front-end logic
8 years ago
dilanua
8f81f2bb01
Refactoring data-tables-invoker-api
8 years ago
dilanua
225b1ddc45
Refactoring device-mgt-props
8 years ago
mharindu
3331604699
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
mharindu
827567733c
Fixed scope update issue in API update
8 years ago
dilanua
7e7549437b
Refactoring user module
8 years ago
dilanua
24d846a328
Refactoring user-create page and related modules
8 years ago
dilanua
b636738be3
Fixing issue: user-list not getting updated upon user-removal
8 years ago
madhawap
86fdc85d13
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
madhawap
d79de070f1
fix to iOS device enrolment
8 years ago
ayyoob
250ce1f77c
added device mgt grant types
8 years ago
mharindu
b3d309583d
Fixed issues in scope service
8 years ago
dilanua
da6ff6e7fa
Refactoring user-listing page
8 years ago
dilanua
177b7cf3df
Refactoring data-tables-extended-unit
8 years ago
Ace
c8b37207fc
Fixing context issue in service-invoker
8 years ago
mharindu
b8f2457046
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
dilanua
31b62e6336
Adding jaggery.conf url mapping for data-tables-invoker-api
8 years ago
mharindu
7f1e2fdf0b
Implemented scope management service
8 years ago
Ace
b8635db485
Adding changes to common modules to accomodate ui restructuring
8 years ago
mharindu
bdec8880bb
Fixed conflicts and merged
8 years ago
mharindu
9932f061fb
Fixed webapp name resolving issue
8 years ago
mharindu
186432e1df
Fixed webapp name resolving issue
8 years ago
Dulitha Wijewantha
03f323d6e2
Fixed a bug where getBoolean wasn't used
8 years ago
Ace
ca8859c80a
Fixing broken build due to new javax.xml imports
8 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.
8 years ago
mharindu
80f737822e
Fixed enrollment device mapping issue
8 years ago
Prabath Abeysekara
fbb09a7f58
Merge pull request #316 from xenobyte/master
...
Fixed predictable pseudorandom number generator
8 years ago
Timo Briddigkeit
0ac4752b2b
Fixed null pointer dereference
8 years ago
Timo Briddigkeit
0ea2c458e7
instanceof will return false for null references, the null check is not needed.
8 years ago
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
8 years ago
Ace
15ae91d1c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Ace
ca10ad53bb
Adding emm apis as common modules
9 years ago
prabathabey
40b43a8b97
DAO exceptions thrown while retrieving advance details of devices appears to have been swallowen at the REST API implementation that exposes the aforementioned functionality. This particular fix resolves it
9 years ago
Timo Briddigkeit
b674304087
Made constants real constant using final
9 years ago
Timo Briddigkeit
ee5b077e6a
Fixed various XML External Entity (XXE) attack vulnerabilities
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
68fbfaf346
Merge branch 'certmgt-postgresql'
9 years ago
prabathabey
ce2a801934
Fixing https://wso2.org/jira/browse/EMM-1448 which fixes issues while persisting certificates when PostgreSQL is used as the underlying certificate management repository database
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
madhawap
68b7d304a0
Added end point to get Compliance Data Of a Device
9 years ago
prabathabey
0125310440
Prepending the url template configured for updating notifications with a '/'
9 years ago
prabathabey
78057b2992
Adding an API to return the list of device types registered in the underlying device management platform
9 years ago
mharindu
d3982c9797
Modified API definitions
9 years ago
mharindu
cc5f677165
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
mharindu
aa6085ac8c
Added scopes to APIs
9 years ago
hasuniea
282ac72249
adding SCEPManagerService to scep manager compenent
9 years ago