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
81c684be50
Refactoring user-menu - UI
8 years ago
dilanua
d8e057abdd
Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
8 years ago
dilanua
6fea974c90
Refactoring notifications side-pane - UI
8 years ago
dilanua
ce1a063688
Refactoring notifications side-pane - UI
8 years ago
dilanua
9a095fa670
Refactoring change password modal - UI
8 years ago
Ace
87ad1e0e71
Fixing intermittent jackson bind issue
8 years ago
dilanua
b16f0fd592
Refactoring change password modal - UI
8 years ago
Ace
099ffd6a74
Updating velocity dependencies to OSGI enabled bundle version
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
b4e4b114a5
Updating dashboard title
8 years ago
dilanua
e8571b7b65
Updating operation-mod with windows operation apis
8 years ago
dilanua
408e10a890
Changing admin dashboard name to 'Navigating Dashboard' - UI
8 years ago
dilanua
713c8ac4d8
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
8 years ago
dilanua
cd66f64945
Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI
8 years ago
dilanua
37131afb4a
Adding radio:checked and input[type=hidden] support to operation mod - UI
8 years ago
dilanua
e4dae67fea
Changing permissions - /devices/any to /devices/any-device
8 years ago
dilanua
58f8656e94
Changing permissions - /devices/owning to /devices/owning-device
8 years ago
Rasika Perera
d9b25eda08
Adding deviceName into notifications
8 years ago
Dilan U. Ariyaratne
1651ade4a7
Merge pull request #357 from thusithak/master
...
Theme migration - 2.2.0 alpha defect fixes
8 years ago
Dilan U. Ariyaratne
df7c54b1af
Merge pull request #356 from DimalChandrasiri/theme-migration
...
Model Fixes
8 years ago
thusithakalugamage
2f5d90cb6c
[EMM-1571] Add policies page wizard styling and layout defects
8 years ago
harshanl
5b0e99aeff
Fixed EMM-1562
8 years ago
harshanl
78cab76101
Fixed EMM-1531
8 years ago
Imesh Chandrasiri
1599b84e54
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri
e2576b21a8
Adding default button class to modal popups
8 years ago
kamidu
a448959fe0
Fix for EMM-1548
8 years ago
Ace
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
8 years ago
kamidu
e2d0f7d040
Fix for EMM-1559
8 years ago
Imesh Chandrasiri
3e5064feed
Fix for datatable icon size change on pagination
8 years ago
Imesh Chandrasiri
9573bce48f
Fix for datatable icon size change on pagination
8 years ago
Imesh Chandrasiri
317252ebb0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Rasika Perera
1d7546916c
Changes to the policiesCount, rolesCount, usersCount methods
8 years ago
Rasika Perera
0fab418187
Fixing invalid device count and group count
8 years ago
Imesh Chandrasiri
b56fb667b7
Modal fixes
8 years ago
kamidu
d7c7315f16
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
70dd5ded77
Fix for the policy edit internal server issue
8 years ago
Dilan U. Ariyaratne
3cbaecfbbf
Merge pull request #355 from DimalChandrasiri/theme-migration
...
Data Table CSS Removed from custom.desktop file
8 years ago
thusithakalugamage
144dd92c47
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage
d2a44647dd
[EMM-1549] - Heading defect fix
8 years ago
dilanua
00d79c9ece
Changing certificates breadcrumb name from certificate to certificates - UI
8 years ago
Imesh Chandrasiri
7a452d09ab
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri
e3b230937e
Remove data table styles
8 years ago
thusithakalugamage
4cb5238112
[EMM-1543] styling defect fix
8 years ago
thusithakalugamage
3b3962b772
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
thusithakalugamage
0273a6e369
responsive tab panel component - markup rewrite for uuf
8 years ago
dilanua
6aa01d2e7a
Fixing NPE issue in token-protected-service-invokers - UI
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
Rasika Perera
ae7f4b8373
Adding permission update error message box
8 years ago
Rasika Perera
7edc7f29db
Fixing role add permission update issue
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
6825a87bb9
button component - active and focus style defect fix
8 years ago
thusithakalugamage
c871fbcdad
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage
b2cde2228f
wizard component - layout defect fixes
8 years ago
thusithakalugamage
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri
b08aeefbbc
Modal Changes
8 years ago
kamidu
2ec2600471
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Imesh Chandrasiri
8f68a3658e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri
f908738659
Modal Changes
8 years ago
Rasika Perera
8e247bda62
Fixing font warning on page load
8 years ago
Rasika Perera
4d0fd67539
Adding missing woff2 fonts
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
Imesh Chandrasiri
47b46c50b0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage
42c6500a31
adding responsive, date addition and version number update
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
thusithakalugamage
ef646800fa
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage
dc23e55444
responsive tab panel component - style changes
8 years ago
Imesh Chandrasiri
d182c194ed
removing data table css from custom.desktop.css
8 years ago
harshanl
2f1c03ae1f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
7a0e52e8f9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
6a9225d249
Updating device module for permissions - Ui
8 years ago
harshanl
97cb3cc015
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl
7dc93ff010
MSSQL script fixes and added the /users/count REST API
8 years ago
Imesh Chandrasiri
690bd7de5c
modal popup changes
8 years ago
Rasika Perera
940f2aaede
Merge pull request #348 from DimalChandrasiri/theme-migration
...
Theme migration
8 years ago
harshanl
d60daae97f
MSSQL fixes to dbscrpits and DAO layer
8 years ago
Imesh Chandrasiri
613d0ff7be
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri
f42215a926
Adding modal code changes
8 years ago
kamidu
c2471fc2bb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
2cd5a0e659
Enable permission check according to the new permissions
8 years ago
Rasika Perera
432c46601b
Fixing breadcrumb height issue
8 years ago
Rasika Perera
cfa32cf75c
Fixing icons background color issue
8 years ago
dilanua
2d864bf02e
Removing unnecessary spacing provided for operation-bar - UI
8 years ago
harshanl
1e00a012a8
Removed unnecessary import statements
8 years ago
harshanl
0ee6110b3d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu
ce1f5c5701
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu
115099c8fe
Implemented permission based authorization
8 years ago
dilanua
4fe79be5f8
Updating datatables server-side-paging module
8 years ago
dilanua
9e9f3e859a
Updating custom-desktop.css to remove unnecessary bottom border of operation-bar
8 years ago
kamidu
f5e1fee561
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
411641bc57
Enable permission check according to the new permissions
8 years ago
charitha
de6f2558c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
2fde165b7c
Fix SQL error when could happen due to duplicate enrollments.
...
(cherry picked from commit c75307f)
8 years ago
Rasika Perera
5157cb81f8
Merge pull request #345 from thusithak/theme-migration
...
Theme migration - responsive small device view defect fixes
8 years ago
thusithakalugamage
e80daf7709
responsive small device view defect fixes
8 years ago
harshanl
e72d3147f0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
d24ba98643
Updating activate and deactivate policy endpoints from PUT to POST
8 years ago
harshanl
b7ffaf0b0f
Fixed issues in DAO implementations and MSSQL db script
8 years ago
dilanua
a74862d73b
Updating policy module - UI
8 years ago
Rasika Perera
f37c2c6de8
Fixing requesting invalid url for Roboto-Regular web font
8 years ago
Rasika Perera
887322b716
Merge pull request #344 from DimalChandrasiri/theme-migration
...
Theme migration
8 years ago
dilanua
795fbcb366
Updating ios operation endpoints - UI
8 years ago
Imesh Chandrasiri
2786c576ea
Merge Conflicts Fixed
8 years ago
mharindu
24930b3042
Partial commit of migration
8 years ago
Imesh Chandrasiri
fe0bdb9ba6
Merge Conflicts Fixed
8 years ago
Imesh Chandrasiri
d1acfe1503
Modal Changes added
8 years ago
harshanl
bdb5b970fd
Removed access modifiers from Interface APIs
8 years ago
harshanl
8e6c15acf2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
e881aa6da4
Fixing Role Editing UI
8 years ago
dilanua
c57e9eba3a
Updating Roles listing UI to dynamically fetch app-context
8 years ago
dilanua
0427a6dd4b
Refactoring Role Create UI - moving units to page
8 years ago
dilanua
934c45cd95
Adding role creation UI
8 years ago
dilanua
746a4d4372
Refactoring roles listing UI - merging srcs in units to page
8 years ago
dilanua
fd6ddf7a52
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
677385920e
Updating User Listing UI
8 years ago
Rasika Perera
ad5c97e354
Temporary resolving WARN logs for css fonts on the theme.
8 years ago
dilanua
687efa97b1
Updating Role Listing UI
8 years ago
dilanua
eedb66ec45
Updating User Listing UI
8 years ago
dilanua
6f28bf1d94
Updating User Listing UI
8 years ago
dilanua
32fc58c917
Updating User Listing UI
8 years ago
dilanua
54807b99ee
Updating role listing UI
8 years ago
Rasika Perera
8148b5b06c
Separating CDMF base app and uuf-template app
8 years ago
Imesh Chandrasiri
4a69e162b3
Modal Changes added
8 years ago
Imesh Chandrasiri
1ed6213916
Modal Changes added
8 years ago
harshanl
54112a3f3d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
harshanl
6554368bfa
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl
551d77bd62
Refactored OperationMgr code
8 years ago
kamidu
cd77ce692e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
abb3aea9a9
fixes for notification isses
8 years ago
harshanl
675843d7f7
Added Valid device list to Activity response
8 years ago
harshanl
a77564ac2d
Added status for each device in Activity response
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
Chatura Dilan Perera
83442b0bca
Fixed issue in activity retrival
8 years ago
Chatura Dilan Perera
29d6b38d15
Fixed issue in activity getting with response
8 years ago
Chatura Dilan Perera
40cabd0064
Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Chatura Dilan Perera
549a2773f2
Fixed issue releated to activity api since
8 years ago
harshanl
624bf7c7b4
Fixed EMM-1518
8 years ago
harshanl
56f23a83fc
changed comments
8 years ago
Imesh Chandrasiri
e02264099b
Adding user menu update
8 years ago
thusithakalugamage
00bf595cb2
moving wso2 theme to emm - removing duplicated styles for buttons and links, navbar style update
8 years ago
thusithakalugamage
42a3d5f7e5
moving wso2 theme to emm - modal window content positioning and background fixes
8 years ago
thusithakalugamage
b5fda80377
emm login page layouts updated to wso2 theme markup
8 years ago
thusithakalugamage
b67b34e831
cdmf navbar hamburger menu and menu open state icons correction
8 years ago
thusithakalugamage
6b5d884fd5
vertical tab component bottom margin defect fix
8 years ago
thusithakalugamage
333e05dcc5
Merge branch 'theme-migration' of https://github.com/DimalChandrasiri/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage
ee856d6b8b
moving wso2 theme to emm - link hover defect fix
8 years ago
thusithakalugamage
cd6cf9f6b3
moving wso2 theme to emm - navbar cllapse color fixes
8 years ago
thusithakalugamage
849c2a4f55
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri
5cdafa04a6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
Imesh Chandrasiri
802d5e5fe9
Markup change to suite the padding
8 years ago
thusithakalugamage
aa23239f40
moving wso2 theme to emm - layout color update
8 years ago
Charitha Goonetilleke
9e0edf84ab
Merge pull request #337 from charithag/master
...
Fix issue in get devices with since parameter
8 years ago
harshanl
811d225bc3
Fixed adding operations to invalid devices
8 years ago
charitha
0fe827ca9f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
579d91bd79
Fix issue in get devices with since parameter.
8 years ago
Imesh Chandrasiri
4bebb77d5f
Merge branch 'theme-migration' of https://github.com/thusithak/carbon-device-mgt into theme-migration
8 years ago
thusithakalugamage
1a2c6ec8eb
moving wso2 theme to emm - layout
8 years ago
Imesh Chandrasiri
8a17ec9e48
Changing the login button to new theme
8 years ago
charitha
9246cdcf30
Return empty array when results not found with since parameter
8 years ago
Chatura Dilan Perera
763993263c
Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
Chatura Dilan Perera
16e6e12436
Fixed issue in Activity API returning one activity
8 years ago
thusithakalugamage
1f7b618d5a
moving wso2 theme to emm - layout
8 years ago
Saad Sahibjan
a72b47f6f7
Fixing incorrect response for remove policy
8 years ago
harshanl
f3aefcca77
Fixed EMM-1450
8 years ago
hasuniea
e723761344
fixing code conflicts
8 years ago
Chatura Dilan Perera
8b17cbb339
Fix conflicts
8 years ago
hasuniea
b3582f9d47
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
7bc927fbd0
Removing obsolete constants from constants.js - UI
8 years ago
dilanua
fbd51e31c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
13e2381293
Updating OAuth Utils - UI
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
0ba6edf36d
Updating utility.js and removing unused config files - UI
8 years ago
dilanua
e32c9c0bdb
Updating init.js module - UI
8 years ago
dilanua
f61b929bfd
Updating data-tables API - UI
8 years ago
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
442c2b86da
fixed formatting issues
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
bd41e4f4fb
Implemented scope based authorization in device-mgt UI module
8 years ago
Ace
aa7d3385ce
Adding missed role-listing changes
9 years ago
Ace
c693a11d7c
Fixing user,device,role listing pages
9 years ago
mharindu
5bdb4630af
Fixed conflicts and merged
9 years ago
mharindu
734aaa8c9e
Fixed null pointer exception
9 years ago
mharindu
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
hasuniea
48543862c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
952905c60d
Adding Policy Edit UI
9 years ago
mharindu
2e79dd290e
Modified scopes
9 years ago
hasuniea
1b07b18678
adding security fixes
9 years ago
dilanua
fa0891d9a2
Adding Policy View UI
9 years ago
mharindu
acf6d7ecd7
Fixed conflicts and merged
9 years ago
dilanua
13126fe398
Adding policy create UI
9 years ago
dilanua
87cdfa209e
Updating policy management
9 years ago
harshanl
f1c1c67656
Removed unused policy.mgt module from device core bundle
9 years ago
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
9 years ago
harshanl
35ea88b9de
Fixed EMM-1476.
9 years ago
mharindu
ed4c762bfd
Refactored scopes
9 years ago
ayyoob
a7074e2e4e
refactored general configuration
9 years ago
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
9 years ago
mharindu
eb5216091e
Fixed conflicts and merged
9 years ago
madhawap
5bd879545b
fix for the iOS device operations blocker
9 years ago
madhawap
2e71c21378
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap
d315e739e4
fix for the iOS device operations blocker
9 years ago
kamidu
23fe8b1fdb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
kamidu
160d8c2feb
Fix the policy create wizard ui issues
9 years ago
dilanua
2ec9f68135
Removing the deprecation of operation.js as it seems to have one dependancy to plugins
9 years ago
Rasika Perera
b8bf855378
Calculating enrollment url when generalConfig.host config exists
9 years ago
inoshperera
2e8df6a16a
Merge pull request #322 from charithag/master
...
Fix issues in sql statements
9 years ago
charitha
efcd5272d2
Fix issues in sql statements
9 years ago
harshanl
01e2408ece
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu
34f1d9ee38
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
kamidu
9510554f67
Fix the notification view internal server error issue
9 years ago
dilanua
c7f4bba8bf
Deprecating operation.js module from UI
9 years ago
dilanua
e125871de0
Adding business-controllers to UI Modules
9 years ago
harshanl
06f72c014e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
9 years ago
dilanua
ec7f8ccd1f
disabling testing info logs at token-protected-service-invokers.js
9 years ago
dilanua
89cebcdb9e
Updating UI oauth module with suppressed warnings for verified, but unresolved variables and functions
9 years ago
dilanua
39b14c9bc5
Adding conf-reader to UI modules
9 years ago
dilanua
bbff93adcc
Updating token-handler-utils with suppressed warnings for java packg imports
9 years ago
mharindu
ccdcea0109
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
dilanua
303f16e747
Deprecating obsolete UI functions - device.js
9 years ago
dilanua
bc4192280c
Updating OAuth UI Module
9 years ago
dilanua
020f35cb4e
Updating OAuth UI Module
9 years ago
dilanua
7017f6e32b
Updating OAuth module dependants
9 years ago
dilanua
032b5d129a
Adding OAUTH module to UI
9 years ago
dilanua
b86be8375c
Refactoring OAuth utilities at UI Layer
9 years ago
dilanua
70074e2f3e
Refactoring OAuth utilities at UI Layer
9 years ago
dilanua
a4c5aa5951
Refactoring OAuth utilities at UI Layer
9 years ago
dilanua
f7509f698d
Removing obsolete UI modules
9 years ago
dilanua
2efdc30177
Refactoring OAuth utilities at UI Layer
9 years ago
mharindu
84090fb16c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
Milan Perera
c49dc435e1
Merge pull request #319 from ayyoob/transport
...
Updated grant type implementation
9 years ago
dilanua
4b39a877ad
Updating oauth token handlers
9 years ago
dilanua
1172e759ca
Deprecating serverAdress.js
9 years ago
prabathabey
5ed3174a28
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 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
9 years ago
Ace
07b12fe4ea
Bug fixes
9 years ago
Ace
0d94a293a4
Adding notification and fixing QR code
9 years ago
prabathabey
c63818b78f
Avoiding multiple device data getting retrieved upon the same id
9 years ago
prabathabey
e27905792f
Code cleanup
9 years ago
prabathabey
5bc7cf7c30
Simplifying operation management related implementations
9 years ago
dilanua
8550bcb145
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
d2ec81b12b
Refactoring oauth token handling functions and dependants
9 years ago
Ace
1ed0481ec3
Changing nav-bar base-unit implementation
9 years ago
mharindu
6e742ee6ac
Added scope beans
9 years ago
mharindu
564c2b280e
Fixed conflicts and merged
9 years ago
Chatura Dilan
046cd6586c
Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
Chatura Dilan
7af8ecc686
Added userstore for role listing
9 years ago
dilanua
34edbce1a0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
c228f03481
Refactoring oauth token handling functions and dependants
9 years ago
prabathabey
89634a9c38
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey
bd1322e801
Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl
9 years ago
dilanua
b72d099641
Refactoring oauth token handling functions
9 years ago
dilanua
d05c6e2170
Deprecating /api/token.jag (unused)
9 years ago
mharindu
3457bba4a3
Adding Annotation reading fix for device-mgt-extensions
9 years ago
dilanua
87dbb5f9e1
Refactoring ui token handling functions
9 years ago
dilanua
7facff4b58
Updating ui init logic
9 years ago
dilanua
c57c75945c
Deprecating invoker-request-wrapper (unused)
9 years ago
dilanua
00f98f5cce
Updating base ui app config reader
9 years ago
dilanua
d04cb54ae8
Refactoring base ui app config reader
9 years ago
dilanua
c12630e65c
Refactoring base ui app config reader
9 years ago
dilanua
1916c4df5f
Refactoring cdmf product page layout
9 years ago
dilanua
7d9cde3cfb
Refactoring Navigation Bar
9 years ago
dilanua
99aca9b90a
Updating user-listing
9 years ago
dilanua
bbce1a3d8a
Refactoring user-listing front-end logic
9 years ago
dilanua
8f81f2bb01
Refactoring data-tables-invoker-api
9 years ago
dilanua
225b1ddc45
Refactoring device-mgt-props
9 years ago
mharindu
3331604699
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
mharindu
827567733c
Fixed scope update issue in API update
9 years ago
dilanua
7e7549437b
Refactoring user module
9 years ago
dilanua
24d846a328
Refactoring user-create page and related modules
9 years ago
dilanua
b636738be3
Fixing issue: user-list not getting updated upon user-removal
9 years ago
ayyoob
250ce1f77c
added device mgt grant types
9 years ago
mharindu
b3d309583d
Fixed issues in scope service
9 years ago
dilanua
da6ff6e7fa
Refactoring user-listing page
9 years ago
dilanua
177b7cf3df
Refactoring data-tables-extended-unit
9 years ago
Ace
c8b37207fc
Fixing context issue in service-invoker
9 years ago
mharindu
b8f2457046
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
dilanua
31b62e6336
Adding jaggery.conf url mapping for data-tables-invoker-api
9 years ago
mharindu
7f1e2fdf0b
Implemented scope management service
9 years ago
Ace
b8635db485
Adding changes to common modules to accomodate ui restructuring
9 years ago
mharindu
bdec8880bb
Fixed conflicts and merged
9 years ago
mharindu
186432e1df
Fixed webapp name resolving issue
9 years ago
Dulitha Wijewantha
03f323d6e2
Fixed a bug where getBoolean wasn't used
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
mharindu
80f737822e
Fixed enrollment device mapping issue
9 years ago
Prabath Abeysekara
fbb09a7f58
Merge pull request #316 from xenobyte/master
...
Fixed predictable pseudorandom number generator
9 years ago
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
9 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
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
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
mharindu
ff82accb48
added scopes to notification API
9 years ago
mharindu
60659ce15b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
mharindu
fe28bc25f1
Refactored scopes
9 years ago
madhawap
c17dda082d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap
2136ebbeee
changes to 'updateNotificationStatus' swagger annotations
9 years ago
hasuniea
54498f41cd
modifying scep utils
9 years ago
mharindu
ac75ff1d71
Fixed conflict and merged
9 years ago
mharindu
49623a4693
Implemented scope based authorization
9 years ago
Chatura Dilan
2befefc967
Added OS build date
9 years ago
madhawap
b55a164457
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
9 years ago
madhawap
dbf938416b
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
9 years ago
prabathabey
be7e63c390
merging rest-api-improvements branch to master
9 years ago
prabathabey
ed5d611c35
Code cleanup
9 years ago
prabathabey
f33ac36bfa
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
37852051ff
Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
9 years ago
Chatura Dilan
24b462f4f4
Added is-active field to the Application
9 years ago
Ace
cf887a2e93
Merging emm module changes to devicemgt iot app
9 years ago
Chatura Dilan
f100853031
Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
dilanua
d34f29ab46
Fixing device types not retrieving issue
9 years ago
Chatura Dilan
bb6d2f2012
Fixed user search
9 years ago
madhawap
d9b35c29cd
swagger annotation fix to policy 'apply-changes' end point
9 years ago
madhawap
88feb5a852
Add Pagination to Notification end points
9 years ago
prabathabey
624e7df688
Improving HTTP status code handling and the resource implementations
9 years ago
prabathabey
a23f44e682
Improving AcitivityManagement API implementation with proper error handling, etc
9 years ago
prabathabey
ad6b95ff62
Code cleanup
9 years ago
prabathabey
a46bd9194b
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
4236744d39
Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
9 years ago
Dilan U. Ariyaratne
a278b788d6
Merge pull request #308 from madhawap/rest-api-improvements
...
added priorities end-point to PolicyManagement
9 years ago
madhawap
b50e007897
added /priorities end-point to PolicyManagement
9 years ago
madhawap
9c215c4ac9
added /priorities end-point to PolicyManagement
9 years ago
Ruwan
6ce7f8c65a
Merge pull request #307 from ayyoob/transport
...
Few changes added after testing with the cluster
9 years ago
ayyoob
ba6e202442
Few changes added after testing with the cluster
9 years ago
inoshperera
50009c7ac5
adding apply policy end point
9 years ago
madhawap
ee11bde8b0
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap
235d690f1e
Implemented 'offset' and 'limit' parameters to the 'operation' api
9 years ago
prabathabey
0c54753b34
Cleaning up UserManagementService API implementation
9 years ago