Rasika Perera
513015c1b5
Changing context path /emm into /devicemgt on cdmf base app
8 years ago
Rasika Perera
0fb87f3aa2
Fixing device types not shown issue
8 years ago
Rasika Perera
9148c3baea
Fixing dashboard styling issues
8 years ago
harshanl
108ea98677
Refactor policy mgt components and fixed add operations for invalid devices from task service
8 years ago
harshanl
c967fc34d0
Fixed EMM-1513
8 years ago
Ace
5f90587564
Synching with master
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
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
9 years ago
ayyoob
217f541991
added certificate units
9 years ago
dilanua
b9efedfdbd
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
632202899a
Fixing issues in bulk user invitations
9 years ago
harshanl
c448d915d8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
ayyoob
058f9e4cfa
merged with origin
9 years ago
ayyoob
6f5d6abea3
updated device type label to defaul device type name
9 years ago
kamidu
9fde8c0442
Resolving conflicts
9 years ago
kamidu
120fe530ac
Fix the device view related issues
9 years ago
dilanua
d7eed8bc1d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
0945c8f547
Adding user create UI
9 years ago
harshanl
e80c2f4050
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea
ed5e954194
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea
349c3bdb63
fixing App Version not updating in portal after being initially set
9 years ago
dilanua
390d929e70
Adding policy priority UI
9 years ago
dilanua
352643a421
Changing deactivate-policy api method to PUT
9 years ago
harshanl
34e97aeeae
Removed device search using roleName parameter.
9 years ago
Ace
e1c4305e73
Adding fixes to Activities retrival query
9 years ago
Ace
71709a800f
Adding group by function when retrieving operations
9 years ago
dilanua
4549452634
Updating getAllPolicies UI function with icon key
9 years ago
prabathabey
4c3211b079
Fixing issues in acitivity retrieval
9 years ago
dilanua
6e2249419d
Updating policy edit base UI
9 years ago
dilanua
0521f1a9dd
Updating policy view Base UI
9 years ago
harshanl
8fa311e119
Removed unnecessary properties from EnrollmentInfo object
9 years ago
prabathabey
90889824e3
Further improving the performance of activity info retrieval
9 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
9 years ago
prabathabey
213836541f
Fixing missing columns returned in the query that returns the list of acitivities
9 years ago
prabathabey
3abe837de3
Improving retrieval of activities
9 years ago
prabathabey
fc5021a0d5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey
c7730adbcb
Improving the retrieval of activities
9 years ago
harshanl
eb801696bf
Fixed EMM-1492
9 years ago
harshanl
f82ce82648
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl
08ff70bb3c
Refactored CertMgt component
9 years ago
Rasika Perera
c01db9c773
Replaced emm specific unit implementation with old generalized cdmf unit
9 years ago
Rasika Perera
bb526513e8
Removed enrollment url calculation
9 years ago
mharindu
bd41e4f4fb
Implemented scope based authorization in device-mgt UI module
9 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
prabathabey
f1eca17991
Code cleanup
9 years ago
prabathabey
9a7286a84b
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
9 years ago
prabathabey
3813856be8
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
9 years ago
prabathabey
aeb4ad3295
Merging rest-api-improvements branch to master
9 years ago
geethkokila
c07914eb36
Adding the activity count for the activty paginantion
9 years ago
geethkokila
a67f432993
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
geethkokila
236eb90ce2
Fixing the limit and offset for activity
9 years ago
madhawap
f2ab923df5
fix related to http status code in 'getDevices' endpoint
9 years ago
ayyoob
ebebca8573
Added support for push notification for xmpp, mqtt and few changes to the after testing
9 years ago
madhawap
ea56d4ced3
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap
015ca0575e
added 'updatedTimeStamp' to the Activity get response
9 years ago
ayyoob
1373e995fb
added support to load device type configuration in base ui
9 years ago
dilanua
1513c6cf8a
Adding isActive property to PolicyWrapper
9 years ago
madhawap
7cdb7dcee1
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
dilanua
0eed97e84c
Adding API for getting device types
9 years ago
madhawap
b3f95d19c1
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
inoshperera
96eb71314b
Merge pull request #297 from madhawap/rest-api-improvements
...
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
madhawap
d7b860b955
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap
59119f9167
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
ayyoob
7b2c04152f
changed the UI calls from tomcat to apimgt gateway
9 years ago
Ace
7b62d2769e
Changing response code returned when adding user
9 years ago
madhawap
3d416da6fe
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
9 years ago
geethkokila
626142a59b
Fixing the isssue in retrieving the device info
9 years ago
Ace
016414c076
Bug fixes for role search
9 years ago
geethkokila
d6501cbf8c
Fixing the device search issues
9 years ago
Sahan Kariyawasam
35f43a60e7
Added Dashboard server url property
9 years ago
mharindu
de72cc21c6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
mharindu
3858920d72
Changed HTTPS Url
9 years ago
ayyoob
bb051deebc
added https url for jaggery app deployment server
9 years ago
mharindu
a80ca2d696
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
GPrathap
efb71d472a
changing sso default state
9 years ago
GPrathap
e23044d59d
fixing jira:IOTS-195
9 years ago
mharindu
f7c653b61c
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
mharindu
9eb2f5df86
Fixed foriegn key violation issue when getting pending operations
9 years ago
madhawap
f80603a365
Fixes to if-modified-since in activity provider
9 years ago
Ace
4609888ad1
Fixes to ifmodified-since in activity provider
9 years ago
ayyoob
23ee3e25e7
updated the timestamp
9 years ago
geethkokila
42ce71da2c
Fixing the spelling mistake
9 years ago
geethkokila
6aea69ae44
Fixing the duplicate issue
9 years ago
geethkokila
efa74030b4
Fixing response duplicate issue
9 years ago
prabathabey
8819c6e36b
Adding support for 'If-Modified-Since' header and 'since' query filter
9 years ago
inoshperera
d71f0c6e6d
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
inoshperera
037acbe5bb
fixing platform configuration appearing twice issue.
9 years ago
prabathabey
3c21583db6
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
1a29a9f58f
Further fixing retrieving application list with device info
9 years ago
geethkokila
ae887d6842
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
geethkokila
a04300b3b6
Fixing the activity Id issue
9 years ago
prabathabey
d3ce96585f
Fixing issues in returning application list in the device response
9 years ago
geethkokila
cc6883d955
Changing the if to a while loop, fixing the activity id issue
9 years ago
prabathabey
67c9ee0e70
Fixing commit conflict
9 years ago
prabathabey
b24250f3f2
Returning device info within the device bean itself
9 years ago
hasuniea
dc72fd1553
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
hasuniea
e2cebcd430
removed If-Modified-Since header param
9 years ago
inoshperera
ee948abc9d
fixing conflicts and improving swagger annotations and validations
9 years ago
inoshperera
5620e38681
adding proper error messages for APIs
9 years ago
prabathabey
fe22bfc125
Renaming 'recieved' to 'received'
9 years ago
prabathabey
d32cd96a74
Fixing merge conflicts
9 years ago
prabathabey
9ebf705323
Re-enabling retrieval of device info
9 years ago
prabathabey
e002ffb54a
Re-enabling retrieval of device info
9 years ago
dilanua
dada719486
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
dilanua
0bd2a46690
Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API
9 years ago
ayyoob
aa6298b5e7
updated device management admin api permission
9 years ago
ayyoob
d926bdaa34
removed unused permission from permission.xml
9 years ago
dilanua
07a4a65c7c
Fixing permission issues with GET /devices/*/*/features API
9 years ago
dilanua
25e45dc9f1
Fixing issues in GET /operations and /admin/devices APIs
9 years ago
mharindu
7a029743ba
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
mharindu
81aa298740
Fixed RoleManagementService API issues
9 years ago
prabathabey
3cb9b5bae2
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
61beca5048
Fixing getDevice method to support status, ownership, etc as query param filters
9 years ago
ayyoob
9f1de717c5
updated permissions in the permission.xml
9 years ago
mharindu
7aa37ff4d5
Fixed issues in RoleManagementService
9 years ago
mharindu
63ea40eb27
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
mharindu
ce557266ec
Fixed issues in RoleManagementService
9 years ago
ayyoob
d9c15b62e7
few changes after testing user management api
9 years ago
Prabath Abeysekara
14322d4ba5
Merge pull request #283 from ayyoob/rest-api-improvements
...
fixed api issues in policy
9 years ago
ayyoob
5b8b15f69b
fixed api issues in policy
9 years ago
prabathabey
c9a2dc4399
Improving user management API implementation
9 years ago
prabathabey
627d99e913
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
00a16ea2bc
Improving Role management API implementation
9 years ago
dilanua
4a74ea8100
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
dilanua
374d509881
Updating DeviceManagementAdminServiceImpl
9 years ago
prabathabey
3e21c6d50d
Improving ceritificate management webapp impl
9 years ago
Ace
ddfd678b2a
Adding user management API bug fixes and improvements
9 years ago
Ace
d13368d144
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
Ace
bfe215deac
Adding changes and bug fixes to UserMgtService
9 years ago
Milan Perera
289fef040b
Merge pull request #282 from ayyoob/rest-api-improvements
...
Rest api improvements in password reset
9 years ago
ayyoob
d63e5e876b
added password validation error msg
9 years ago
mharindu
cfe24229fc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
prabathabey
1d4d0b7ae2
Improving certificate management webapp implementation
9 years ago
ayyoob
74a96015a7
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
ayyoob
cf1e808cbd
refactored after testing UserAdminManangmentService
9 years ago
hasuniea
dfc673b08f
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
hasuniea
1443c7757e
fixing code issues
9 years ago
prabathabey
9f48145614
Improving device admin service impl
9 years ago
prabathabey
697c727801
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
fc3d6cccbf
Fixing Issues in notification management APIs
9 years ago
hasuniea
57d445237a
add certificateMgtService
9 years ago
charitha
92a732cd41
Moved redundant texts to constants
9 years ago
geethkokila
3defcfe20d
Fixing the applicationMgtAdminService for returing activity
9 years ago
charitha
e2c03adec4
FIx for https://wso2.org/jira/browse/IOTS-169
9 years ago
prabathabey
fbf213f77c
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
20fd2ec768
Improving application installation/uninstallation handling
9 years ago
hasuniea
9c3c08b4ca
fix UnAuthorizedDeviceAccessException.java
9 years ago
prabathabey
af58e5ec88
Code cleanup
9 years ago
prabathabey
5ed982beb4
Adding more improvements to the JAX-RS APIs of CDM-F
9 years ago
prabathabey
fd7a137b07
Improving jax-rs APIS of CDM-F
9 years ago
hasuniea
20343d9349
fixed swagger message issue
9 years ago
prabathabey
726a700528
Improving error handling in checking for monitoring frquency
9 years ago
prabathabey
6e5148a374
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
9 years ago
mharindu
71eb657e52
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
prabathabey
54f9d02ebb
Code cleanup
9 years ago
prabathabey
77d4c167af
code cleanup
9 years ago
geethkokila
b7da99a621
Adding activity apis to get the updated once after a given time
9 years ago
prabathabey
2925f52cd8
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
6d50ba14b1
Code cleanup
9 years ago
inoshperera
db3dc0517b
adding activity status related details.
9 years ago
prabathabey
e1dfecb518
Changing the value of If-Modified-Since header as a string
9 years ago
prabathabey
76ec7bdc28
Improving swagger metada
9 years ago
prabathabey
425c0e7498
Improving swagger annotations of CDM-F core APIs further
9 years ago
geethkokila
ed0da9e1d0
Fixing the device informations to get the applications
9 years ago
prabathabey
95458ce9b0
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
d92fb53dc9
Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do
9 years ago
geethkokila
ecc8b5e6f2
Fixing the api issues
9 years ago
geethkokila
0221782533
Adding new apis for getting the device location when list of device identifiers are supplied
9 years ago
geethkokila
62c84319d8
Fixing the device search for application list
9 years ago
prabathabey
88cab5abf5
Fixing commit conflicts
9 years ago
prabathabey
37aa05f79c
Committing improved swagger annotated cdm-f APIs
9 years ago
dilanua
f4f47cbfdd
Changing view names to fix oracle naming issues in dashboard analytics feature
9 years ago
geethkokila
6328d35797
Changing the device info object by adding the application list
9 years ago
inoshperera
3c73217e96
fixing osgi issue related to usage of carbon context. And adding api publishing check from config.
9 years ago
inoshperera
1ffbb2183a
adding permissions for DM services
9 years ago
prabathabey
0b9c64594c
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
32cb32b706
modifying the name of the device management admin api war
9 years ago
inoshperera
4623fa2269
swagger annotations added to APIs
9 years ago
prabathabey
30f6fc53b5
Merging the latest changes introduced in master
9 years ago
prabathabey
ebefd60533
Renaming TenantConfiguration as PlatformConfiguration
9 years ago
ayyoob
e8b9f03748
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
Milan Perera
4462c353b4
Merge pull request #277 from ayyoob/transport
...
Fixed https://wso2.org/jira/browse/IOTS-177
9 years ago
geethkokila
86e564713d
Adding the changes for getting activity ids which are changes after a certain time
9 years ago
geethkokila
01e3cc4987
Fixing the activity related issues
9 years ago
prabathabey
6d33d7036b
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
0f5cf86d04
Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
9 years ago
ayyoob
5532db6dd4
Fixed https://wso2.org/jira/browse/IOTS-177
9 years ago
inoshperera
aeec472805
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
inoshperera
2959c05e1a
adding swagger annotations for device and activity APIs.
9 years ago
mharindu
52388ed33d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
mharindu
106be76118
Fixed issues of API publishing to gateway
9 years ago
prabathabey
7e8f38cf16
Fixing conflicts while merging the latest changes in master
9 years ago
prabathabey
e7bf0c7658
Resolving conflicts caused by merging with the updates in master
9 years ago
prabathabey
8b9cf0da85
Resolving conflicts caused by merging with the updates in master
9 years ago
prabathabey
29b3b965b0
Making all CDM-F REST APIs compatible with the REST API specifications
9 years ago
Milan Perera
67e5a5a23a
Merge pull request #275 from GPrathap/master
...
added a bundleDef :net.minidev:json-smart
9 years ago
GPrathap
78475963e3
added entry for websocket url
9 years ago
inoshperera
deb4195f7a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inoshperera
a40e44899a
syncing REST apis of core and product EMM
9 years ago
Ruwan
98f8ace1ff
Merge pull request #274 from rasika90/master
...
Adding licence headers for server-side handlebar templates
9 years ago
geethkokila
c64a6e0ec5
Changing apis to return activity when an operation is added
9 years ago
Rasika Perera
d7f4a39075
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Rasika Perera
b879927dc1
Adding licence headers for handlebar templates
9 years ago
geethkokila
afba711969
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
339512e287
Updating comments in dashboard analytics feature
9 years ago
inoshperera
d7fe6d5e96
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
4663d78060
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
47e17e4a51
Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature
9 years ago
mharindu
50d35a90f8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu
66ccad65cf
Partial commit for APIM Gateway migration
9 years ago
inosh
1341884957
resolving conflicts
9 years ago
inosh
60b42715d6
syncing admin api from product emm
9 years ago
geethkokila
16b809b255
Fixing the conflicts
9 years ago
geethkokila
1697a7ce85
Doing a partial commit for syncing the code base
9 years ago
geethkokila
ba25ecc6ef
Doing a partial commit for syncing the code base
9 years ago
Prabath Abeysekara
830b3fc075
Merge pull request #272 from wso2/release-1.1.0
...
Release 1.1.0 and upgrading the versions
9 years ago
dilanua
8c4752ede3
Adding more comments to dashboard analytics data service interface
9 years ago
dilanua
975a3b915f
Properly layering beans and custom exceptions in dashboard analytics feature
9 years ago
dilanua
a7c7452e2e
Adding final updates to dashboard analytics feature
9 years ago
mharindu
3e291c5b13
[maven-release-plugin] prepare for next development iteration
9 years ago
mharindu
9549ac446b
[maven-release-plugin] prepare release v1.1.0
9 years ago
mharindu
65612f724f
Fixed compile issue
9 years ago
prabathabey
9ec80bfe18
Fixing build failures caused by changed introduced to Operation Management APIs
9 years ago
dilanua
b9a9fb3169
Adding class & method comments, constants to dashboard analytics feature
9 years ago
Ace
ecd386adf0
Fixing IOTS-160
9 years ago
mharindu
968cb00f35
Fixed conflicts and merged
9 years ago
mharindu
83c2a1f0ee
Fixed issues in api publishing
9 years ago
prabathabey
5e03c5ed30
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey
a375252a94
Adding pluggable push notification framework
9 years ago
sumedharubasinghe
067f0a8050
Merge pull request #266 from ayyoob/transport
...
added api application registration filter
9 years ago
mharindu
bca1b4b059
Fixed conflicts
9 years ago
mharindu
9f93570b29
Fixed issues in webapp-publisher
9 years ago
ayyoob
ba47af3186
added api application registration filter
9 years ago
dilanua
7051af8d80
Adding relevant contextual names for database view names in dashboard analytics feature
9 years ago
geethkokila
958288f8ec
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
c7dd386c94
Adding new apis for device informations
9 years ago
dilanua
2886ead44b
Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature
9 years ago
mharindu
49cb4787c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
mharindu
82b90522a0
Migrated to APIM 5.0.4
9 years ago
sumedharubasinghe
61ef87c658
Merge pull request #265 from rasika90/IOTS-114
...
Fixing IOTS-114: the user is unable to deselect a child node permissions
9 years ago
Rasika Perera
bc3f64a77a
Fixing IOTS-114: the user is unable to deselect a child node permissions
9 years ago
charitha
075b5a8901
Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164
9 years ago
sumedharubasinghe
6a69a3a895
Merge pull request #261 from charithag/master
...
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
9 years ago
sumedharubasinghe
2f6c1dfbdd
Merge pull request #263 from ayyoob/transport
...
few fixes in JWT client after testing with multi tenancy
9 years ago
ayyoob
c0240c5cbc
few fixes in JWT client after testing with multi tenancy
9 years ago
charitha
aadf87e5d9
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
9 years ago
Rasika Perera
be970bfc9d
Fixing IOTS-117 Domain needs to be marked as a mandatory field
9 years ago
mharindu
89026c2b7f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
charitha
6dc0a9dd38
Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
9 years ago
mharindu
9ebf2ab6d9
Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
9 years ago
charitha
ddc47cd862
Fix for https://wso2.org/jira/browse/IOTS-161
9 years ago
charitha
0ccaa9fe81
Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112
9 years ago
mharindu
5ccc480ddb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
dilanua
d5950afe7a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
c90f4471a8
Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature
9 years ago
charitha
9480c71522
Fixed script error
9 years ago
charitha
e0fc7c4018
Fix for https://wso2.org/jira/browse/IOTS-110
9 years ago
charitha
81524ae32c
Fix for https://wso2.org/jira/browse/IOTS-156
9 years ago
charitha
3d9ae8d1f6
Fix for https://wso2.org/jira/browse/IOTS-152
9 years ago
charitha
e7c5ef78d0
Removed unnecessary jaggery apis
9 years ago
mharindu
b77f5358e8
Removed external dependancies from webapp publisher component
9 years ago
mharindu
83ec18c38d
Removed external dependancies from webapp publisher component
9 years ago
mharindu
c68b92c7b4
Fixed conflicts
9 years ago
mharindu
9a4b904702
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
Ruwan
8f0840e3df
Merge pull request #254 from ayyoob/transport
...
updated authentication in api
9 years ago
ayyoob
168033b19d
updated authentication in api
9 years ago
charitha
685c52a453
Bug fixes
9 years ago
Ace
cbc505c459
changing profile name
9 years ago
Ace
4517a7f1aa
Making API publish destination configurable and other changes
9 years ago
Ace
6d9f2f92a4
Making API publish destination configurable
9 years ago
ayyoob
b3075cf1bc
removing application related roles
9 years ago
ayyoob
51d46213c2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
9 years ago
charitha
973e1ce40f
Fix issues in group api
9 years ago
charitha
0a838923cb
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/api/Group.java
9 years ago
Madhawa Perera
43648e4692
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
9 years ago
Madhawa Perera
b5741b420c
Adding swagger annotations to beans
9 years ago
prabathabey
71180e686e
Improving swagger annotations
9 years ago
prabathabey
a0dbb25824
Fixing code conflicts and improving swagger annotations
9 years ago
Madhawa Perera
e75afb8020
Adding swagger annotations to beans
9 years ago
ayyoob
48912a05bb
merged with upstream
9 years ago
prabathabey
9e4b4d2205
Improving swagger annotations
9 years ago
ayyoob
bee9a106cc
removed method and type from feature
9 years ago
inoshperera
50b5661a74
Merge pull request #245 from madhawap/master
...
Added swagger annotations to beans
9 years ago
Madhawa Perera
fca80273bc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
9 years ago
inosh-perera
b2383617e1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inosh-perera
0cf0ec6e77
adding swagger annotations to APIs
9 years ago
Madhawa Perera
6227e93d2f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
9 years ago
Madhawa Perera
087adafeb7
Adding swagger annotations to beans
9 years ago
geethkokila
ccea046240
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
4e4e660fa1
Adding the swagger documentation to the activity id resource
9 years ago
Madhawa Perera
26c10f84ec
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
9 years ago
Madhawa Perera
66c12a8b1c
Adding swagger annotations to beans
9 years ago
geethkokila
3bec779e0b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
362cf40d85
Fixing the operation activity id issues
9 years ago
inosh-perera
797c7a02d0
adding swagger annotation to beans
9 years ago
Madhawa
07c5362104
Adding swagger annotations to beans and some modifications to api interfaces
9 years ago
mharindu
ed1eb217ea
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inosh-perera
c945d63038
fixing issues in swagger dependancy
9 years ago
Madhawa
85f485df4c
Few changes to interfaces with swagger annotations
9 years ago
Madhawa
b6e7827920
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
9 years ago
Madhawa
fffc7f3205
Adding swagger annotations to beans
9 years ago
Hasunie
17f3a10ec4
Merge pull request #243 from hasuniea/master
...
added annotation for ConfigurationEntry
9 years ago
ayyoob
ec7727e8bf
removed method and type from features
9 years ago
mharindu
fd39b31369
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu
1f21144668
Renamed EMM permission to CDMF
9 years ago
hasuniea
e633d28013
added annotation for ConfigurationEntry
9 years ago
Madhawa
ae13f7f889
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
9 years ago
Madhawa
707da02c7e
Adding swagger annotations to beans
9 years ago
Kasun Delgolla
da1a60615c
Merge pull request #239 from charithag/master
...
Fixed https://wso2.org/jira/browse/IOTS-104
9 years ago
hasuniea
e4dfe63548
code conflicts
9 years ago
hasuniea
1267db52ce
added swagger annotations for TenantConfiguration
9 years ago
Milan Perera
fb9c824e40
Merge pull request #241 from ayyoob/transport
...
Few fixes after testing
9 years ago
inoshperera
97db3e42d6
Merge pull request #242 from madhawap/master
...
Added swagger annotations to the interfaces
9 years ago
inosh-perera
5597c752ac
Adding sawgger annotations to admin Jax-rs apis.
9 years ago
Madhawa
b407797ab0
added swagger annotation to the interfaces
9 years ago
ayyoob
34f1f4dfe2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
9 years ago
Madhawa
36c3a057dc
created interfaces for the api classes in order add swagger definitions
9 years ago
Madhawa
f5915cbf5d
created interfaces for the api classes in order add swagger definitions
9 years ago
Madhawa
46e0c4ea8b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Created interfaces for the api classes in order to add swagger definitions.
9 years ago
Madhawa
7b04d9f0b0
created interfaces for the api classes in order add swagger definitions
9 years ago
ayyoob
ac587c3353
fixes after testing
9 years ago
dilanua
bb3bcdfd2d
Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature
9 years ago
charitha
18957b0110
Add required jagerry modules for the app
9 years ago
charitha
0c8f1ce770
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charitha
73222e347b
Fixed https://wso2.org/jira/browse/IOTS-104
9 years ago
dilanua
14c07846b2
Adding mssql support to dashboard analytics feature
9 years ago
prabathabey
285c870d6a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey
bc894f2517
Adding Swagger-annotation dependency to carbon-device-mgt
9 years ago
mharindu
b58e2b13c6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu
5ad8d2938e
Fixed issues of publishing APIs to synapse gateway
9 years ago
Ruwan
93b1d618b6
Merge pull request #237 from charithag/master
...
Enable group analytics
9 years ago
charitha
576a7d83ad
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charitha
7ff993a7b7
Enable group analytics
9 years ago
dilanua
4cabe359a0
Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
9 years ago
dilanua
0534cd0a7e
Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
9 years ago
dilanua
adec59e934
Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature
9 years ago
dilanua
2a9e2a47e8
Adding inter-mediate code improvements to dashboard analytics feature
9 years ago
dilanua
0ab4035b37
Adding H2, MySQL Support for dashboard analytics feature
9 years ago
dilanua
a23e578537
Adding inter-mediate development code bits for dashboard analytics feature
9 years ago
dilanua
17e958d838
Adding inter-mediate development code bits for dashboard analytics feature
9 years ago
dilanua
7b43d28298
Adding temporary development code bits for dashboard analytics feature
9 years ago
dilanua
d568c6e8bd
Adding temporary development code bits for dashboard analytics feature
9 years ago
dilanua
945e188917
Adding temporary development code bits for dashboard analytics feature
9 years ago
dilanua
82ffcb012b
Adding temporary development code bits for dashboard analytics feature
9 years ago
dilanua
9786908b35
Adding temporary development code bits for dashboard analytics feature
9 years ago
Rasika Perera
18edc21a04
Adding group permissions validation for operations
9 years ago
Rasika Perera
5c680b3f65
Fixing issue on group permission validating
9 years ago
sumedharubasinghe
d7064c9230
Merge pull request #233 from ayyoob/das-ext
...
removed unused code
9 years ago
Charitha Goonetilleke
ca62c2ef73
Fix grouped device listing
9 years ago
Charitha Goonetilleke
e01b62086f
Fix parameter mismatch
9 years ago
ayyoob
442f8c38fe
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext
9 years ago
ayyoob
5f302fce63
removed unused code and resolved host issues
9 years ago
Charitha Goonetilleke
8c62d9d64c
Add authorization check for shared devices in groups
9 years ago
Charitha Goonetilleke
92784120bd
Add group sharing UI functionality
9 years ago
Charitha Goonetilleke
d15e52491a
Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt
9 years ago
Rasika Perera
33eed1f6cd
Adding permissions for roles updating
9 years ago
Rasika Perera
b6c33a0aec
Fixing group roles listing
9 years ago
Charitha Goonetilleke
b705352fb7
Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt
9 years ago
Charitha Goonetilleke
f74a5b7a59
Merge remote-tracking branch 'rasika/master'
9 years ago
Rasika Perera
938eda7c46
Adding group permissions checking
9 years ago
Rasika Perera
9cb24d8cec
Adding enum to hold default role to default permissions mapping
9 years ago
Rasika Perera
142ab10eea
Code refactoring
9 years ago
Rasika Perera
64a262d3e4
Fixing 404 on groups listing
9 years ago
Rasika Perera
4eb588ac60
Group Constants moved to common
9 years ago
geethkokila
d32e822055
Fixing the shutdown errors
9 years ago
Rasika Perera
38cdd94f3c
Adding group permission checking for Device Access Authorizations
9 years ago
dilanua
af973dacc6
Adding temporary development code bits for dashboard analytics feature
9 years ago
Rasika Perera
07c0aa1045
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
d9015b92a0
Adding temporary development code bits for dashboard analytics feature
9 years ago
dilanua
c828a5264b
Adding temporary development code bits for dashboard analytics feature
9 years ago
geethkokila
a0d260e6a3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
e2d67fc92c
Adding the changes for device search
9 years ago
Kasun Delgolla
d1def26602
Committing group listing back end pagination UI
9 years ago
dilanua
f2f153a2b4
Adding temporary development code bits for dashboard analytics feature
9 years ago
geethkokila
f2128762f0
Adding the changes for removing repeated operations from pending operations, if same operation is added twice, are making them repeated, Device will not recieve them
9 years ago
geethkokila
3396a5066d
Adding changes for the updated time of device info and device location
9 years ago
geethkokila
d4f2a95972
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag
fd531555a3
Fix bugs
9 years ago
charithag
a2cb6937c1
Fix device listing page title
9 years ago
charithag
68361f01ed
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
aa3e7a9eda
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
b8972c9019
Adding temporary development code bits for dashboard analytics feature
9 years ago
geethkokila
3dd830c7d0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
6f9851413e
Adding the changes for operation activity id
9 years ago
dilanua
330e1a1e19
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
46117b4e84
Adding temporary development code bits for dashboard analytics feature
9 years ago
mharindu
548f71ca2e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
49513ba79b
Adding temporary development code bits for dashboard analytics feature
9 years ago
dilanua
b9be51d50d
Adding temporary development code bits for dashboard analytics feature
9 years ago
mharindu
6f8bb64e1c
Fixed merge conflicts
9 years ago
mharindu
ffc7542d4d
Modified authorization to support API gateway
9 years ago
charithag
25ea00f26f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag
b1683c1ccb
Add capability to assign device in to a group and bug fixes
9 years ago
dilanua
053d14b317
Adding temporary development code bits for dashboard analytics feature
9 years ago
Ace
a06327b731
refactoring and bug fixes
9 years ago
geethkokila
5a77e08fd5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag
6e84f0a5a3
Fix font issue
9 years ago
charithag
2a006684cc
Fix formatting
9 years ago
charithag
fb52c5845d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag
bcbde92143
Update new analytics components.
9 years ago
dilanua
2a55c50ad1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
2b62eac4f5
Adding temporary development code bits for dashboard analytics feature
9 years ago
charithag
1e709bc394
Update new analytics components and remove obsoletes.
9 years ago
geethkokila
4029c86da4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
2fb42518b6
Adding the changes for the device group with policy.
9 years ago
charithag
f6281c8ef0
Add jax-rs endpoints to modify and remove devices.
...
Update clientside js to work with secured apis
9 years ago
Charitha Goonetilleke
15a6e4b63b
Fix formatting issues
9 years ago
charithag
d8a9b642ff
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag
42d11b9d78
Add tenant aware dynamic units routing
9 years ago
prabathabey
52b81dd3eb
Fixing compilation failures
9 years ago
prabathabey
f5f177a858
Wrapping all device provisioning related info in ProvisioningConfig
9 years ago
Prabath Abeysekara
6ddd5db8cc
Merge pull request #221 from ayyoob/das-ext
...
Added device type specific graph loader
9 years ago
prabathabey
2133762792
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey
95d3b97c5f
Code cleanup
9 years ago
ayyoob
e0f47cba19
Added device type specific graph loader
9 years ago
charithag
6d5635465e
Add missing UI functionalities
9 years ago
Ruwan
f04705dda5
Merge pull request #213 from charithag/patch-1
...
Fix formatting
9 years ago
charithag
61b43ce5d8
Rename packages in device mgt jax-rs apis
9 years ago
Rasika Perera
22031c476c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag
646d87968c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag
dfb7e9a9c8
Fix permissions
9 years ago
prabathabey
aef892fece
Code cleanup
9 years ago
prabathabey
a10a693507
Fixing find bugs reported issues
9 years ago
prabathabey
f2ba20baeb
Code cleanup
9 years ago
prabathabey
47572d08f5
Removing obsolete dependencies to ApplicationManager interface from DeviceManagementService SPI
9 years ago
Rasika Perera
480d6d5b7e
Remove redundant log messages
9 years ago
dilanua
7027a3553a
Adding temporary development code bits for dashboard analytics feature
9 years ago
dilanua
2f2e8f391a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua
c3bc22519a
Adding temporary development code bits for dashboard analytics feature
9 years ago
ayyoob
5e1ad22480
few changes on download api
9 years ago
ayyoob
9f98f538de
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext
9 years ago
ayyoob
b99d10e075
few changes invoker util to support file downloading
9 years ago
dilanua
274aa0ecd3
Adding temporary development code bits for cdmf-product dashboard feature
9 years ago
dilanua
a888cf39c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Ruwan
c6fbc8f1fe
Merge pull request #216 from GPrathap/master
...
fixed some bugs which caused while enabling SSO in IoT Server
9 years ago
GPrathap
84492d70ac
added constants for authentications types
9 years ago
GPrathap
55a95cca86
bug fixes
9 years ago