shamalka
d61814329c
Revert global exception msg
2 years ago
Rushdi Mohamed
df60140f9c
Remove unwanted codelines and handle exceptions
2 years ago
Rushdi Mohamed
ce0d0a1903
revert changes
2 years ago
shamalka
c68478daca
Fix formatting issues
2 years ago
shamalka
642067b146
Remove wildcard imports
2 years ago
shamalka
c312e69bf4
Revert unwanted change
2 years ago
shamalka
b311908d47
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar
2 years ago
shamalka
31bb87db41
Add missing error logs and fix formatting issues
2 years ago
Pahansith Gunathilake
6962e42ca8
Merge branch 'fix-groupnames' into 'master'
...
Fix group names being able to be duplicated when renaming
See merge request entgra/carbon-device-mgt!907
2 years ago
Pahansith Gunathilake
a50d37bbf2
Merge branch 'support-4.1.15' into 'master'
...
Add Windows app uninstallation feature
See merge request entgra/carbon-device-mgt!904
2 years ago
shamalka
5ff9ef7782
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar
2 years ago
Rushdi Mohamed
29a2713af0
update the traccar-config.xml on test
2 years ago
navodzoysa
6b6e9ba640
Fix group names being able to be duplicated when renaming
2 years ago
navodzoysa
6a62546440
Add optional user domain query param to user APIs
2 years ago
builder
3c9fc68619
[maven-release-plugin] prepare for next development iteration
2 years ago
builder
0b4fe08847
[maven-release-plugin] prepare release v5.0.10
2 years ago
builder
0290758c25
[maven-release-plugin] prepare for next development iteration
2 years ago
builder
790ab62b34
[maven-release-plugin] prepare release v5.0.9
2 years ago
navodzoysa
c8527bd08b
Add Windows app uninstallation feature
2 years ago
builder
7f96ce3c33
[maven-release-plugin] prepare for next development iteration
2 years ago
builder
e851e21bcd
[maven-release-plugin] prepare release v5.0.8
2 years ago
Vigneshan Seshamany
c974c4a0f0
Fix admin role not assigned issue during admin user creation
3 years ago
Rushdi Mohamed
120c1150ce
fix traccar speed measure on kmh
3 years ago
Mohamed Rashd
af25528a8b
Delete custom whitelabel favicon and logo on whitelabel reset
3 years ago
Rushdi Mohamed
6f79180920
removed unwanted codes
3 years ago
Mohamed Rashd
c63168be62
Fix passing favicon image bean when retrieving existing logo
3 years ago
Rushdi Mohamed
e88d5e9c3b
Add traccar configuration on p2.inf and updated mysql.sql
3 years ago
Mohamed Rashd
be15bf9185
Fix log message
3 years ago
Mohamed Rashd
eb061f9450
Refator page tite to app title
3 years ago
Mohamed Rashd
78546125bc
Add page title to whitelable
3 years ago
Mohamed Rashd
7df4aff569
Fix retrieving favicon as logo when retrieving existing images for rollback
3 years ago
Mohamed Rashd
743a12083b
Refactor whitelabel update api method name to update from create
3 years ago
Rushdi Mohamed
ab332e20ed
Fix platform configuration for traccar
3 years ago
Rushdi Mohamed
9f642701ea
fix merge conflicts
3 years ago
Rushdi Mohamed
f4d0050270
fix removing permission and organizing the code
3 years ago
Rushdi Mohamed
83651efcb5
Remove unwanted codes
3 years ago
Rushdi Mohamed
35a5230ef7
Fix admin login to tracker
3 years ago
Rushdi Mohamed
a521985e98
Update tracker get token api
3 years ago
Rushdi Mohamed
6b3294bd60
Update tracker get token api
3 years ago
Rushdi Mohamed
11fa624b39
Add tracker API endpoint to return user token
3 years ago
Rushdi Mohamed
6ccddf3f4b
Update remove permission
3 years ago
Rushdi Mohamed
6ce4168d75
Update permissions
3 years ago
Rushdi Mohamed
515e826711
Update with callable thread and add set/remove user permission on enroll/disenroll device
3 years ago
Rushdi Mohamed
74adeda997
Assign device to user when enrolling a device
3 years ago
Rushdi Mohamed
2ebc24985a
Create user when enrolling device
3 years ago
Rushdi Mohamed
bd164ea78f
fix NullPointerException
3 years ago
Rushdi Mohamed
5c14315b4a
Add JSONException
3 years ago
Rushdi Mohamed
44ac5c8a8f
Fixed the bugs
3 years ago
Rushdi Mohamed
d1f2bdb296
update the threadpool apporoach/ add traccar devices/groups for existing UEM devices/groups
3 years ago
Rushdi Mohamed
c3dd560878
Update group add/update/delete and device enroll/disenroll with traccar
3 years ago
Rushdi Mohamed
9f6eaedbc3
check if location publishing to traccar enable or disabled
3 years ago
Rushdi Mohamed
53f4fd7ebc
Add add/delete a group from traccar
3 years ago
Rushdi Mohamed
1dd2e35f89
Update traccar cofiguration
3 years ago
Rushdi Mohamed
2e5a9002da
Update traccar configuration
3 years ago
Rushdi Mohamed
c18b3b1c1f
Update the code structure
3 years ago
Rushdi Mohamed
4e3567202d
Update with okhttclient pool and threading
3 years ago
Rushdi Mohamed
8d99123ec1
Update with Traccar Dis-Enrolling a Device via UEM
3 years ago
Rushdi Mohamed
c4d75234b0
Initiate traccar to locate the geo locations in the map
3 years ago
Mohamed Rashd
b8a0ffe7c0
Improve favicon/logo response content type handling
3 years ago
Mohamed Rashd
460675fcad
Fix favicon/logo response content type
3 years ago
Mohamed Rashd
5677e1e3fe
Better feedback message/log if favicon/logo white label images not found
3 years ago
Mohamed Rashd
ed9ec69509
Move metadata and whitelabel config classes to metadata.mgt package
3 years ago
Mohamed Rashd
1559af9660
Adress feedback
...
Add missing licenses
3 years ago
Mohamed Rashd
1d84adbb4f
Add java doc comment
...
Fix adding default white label on tenant create
Add whitelabel logo and favicon apis as non secured endpoints
Fix License
3 years ago
Mohamed Rashd
7907a1c5ff
Add tenant whitelabeling api
...
Make whitelabel favion and logo api public
Refactor whitelabeling feature in separate classes
3 years ago
builder
8636767cba
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
9af9bea2b6
[maven-release-plugin] prepare release v5.0.7
3 years ago
Pahansith Gunathilake
a7a567c971
Fix parse pom
3 years ago
Pahansith Gunathilake
4d76be36de
Merge branch 'user-store' into 'master'
...
Add new API to fetch userstores
See merge request entgra/carbon-device-mgt!884
3 years ago
navodzoysa
b62b4aebc3
Add new API to fetch userstores
3 years ago
Pahansith Gunathilake
47fb2c77f5
Merge branch 'billing-api-1226' into 'master'
...
Adding the new billing API
See merge request entgra/carbon-device-mgt!848
3 years ago
builder
817dc57862
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
7196d2daea
[maven-release-plugin] prepare release v5.0.6
3 years ago
Mohamed Rashd
ab053807b3
Fix application managment test
3 years ago
Pahansith Gunathilake
da509f5c69
Merge branch 'policy-load' into 'master'
...
Add new API to fetch UI policy list
See merge request entgra/carbon-device-mgt!881
3 years ago
navodzoysa
340be6ed65
Add new API to fetch UI policy list
3 years ago
Mohamed Rashd
aa2fa45a5f
Tempory merge conflict resolution
3 years ago
Mohamed Rashd
41a0c9118a
Add java doc comments
...
Use try-with resource when using CloseableHttpClient
Refactor few variable and method names
3 years ago
osh
f86617a264
Add the sql files
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
Mohamed Rashd
daaeed52e2
Add and Change licence from WSO2 to Entgra
3 years ago
osh
7ba8311c93
fix conflict
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
osh
5ad9e3e6b4
Add billing data export api
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
builder
946a12b84d
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
f55ffbb19a
[maven-release-plugin] prepare release v5.0.5
3 years ago
Mohamed Rashd
38f9b60970
Fix sql query that gets subscribed devices
3 years ago
builder
39216aa651
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
8deff13edd
[maven-release-plugin] prepare release v5.0.4
3 years ago
Mohamed Rashd
59b2aa42b4
Fix duplicate devices in subscription log
3 years ago
osh
a4b2a325b1
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
3 years ago
osh
053a57c4f5
Add getting billing cost by domain change
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
Pahansith Gunathilake
aa2234dcdd
Merge branch 'fix-geofence' into 'master'
...
Fix invalid DAO factory handling & invalid event revoke payload
See merge request entgra/carbon-device-mgt!865
3 years ago
Pahansith Gunathilake
7a4cef26e4
Fix invalid DAO factory handling & invalid event revoke payload
3 years ago
osh
c135105889
fixes https://gitlab.com/entgra/carbon-device-mgt/-/merge_requests/848/commits
...
Add re-enrollment device cost calculation
3 years ago
osh
8872d1baeb
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
3 years ago
builder
96e4aa8436
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
739266feca
[maven-release-plugin] prepare release v5.0.3
3 years ago
Pahansith Gunathilake
27303cf12b
Fix invalid DAO factory handling & invalid event revoke payload
3 years ago
Pahansith Gunathilake
778bb3e987
Fix invalid time immediate after device enrollment
3 years ago
osh
f611c45d3b
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
3 years ago
osh
7b1b8ecffd
Add last billed date
3 years ago
Pahansith Gunathilake
cb2e5e9c66
Fix test failure
3 years ago
Pahansith Gunathilake
35e0b9189e
Add separate DAO factory for event management
3 years ago
Pahansith Gunathilake
12c48540d8
Fix device enrollment failure
3 years ago
Mohamed Rashd
9cdc438970
Change to base64 string for file uploads instead of using multipart form data
...
Make release optional when creating new application
Fix screenshots not getting saved if duplicate screenshot file name found
Delete artifacts if errors while adding release to db
Improve service provider application related apis
Refactor code
3 years ago
Mohamed Rashd
5e247c6e6b
Add identity server service provider app integration
3 years ago
osh
ed256ad346
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
...
resole cofilict
3 years ago
osh
d01aa2026d
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
...
Adding the new billing API
3 years ago
Don Kushan Saminda Wijeratne
1e0e54e818
Setting maintenance user when carbon context user is null + fixing the function which sets statuses of all devices belonging to a user
3 years ago
builder
06560d24d4
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
2784633dd6
[maven-release-plugin] prepare release v5.0.2
3 years ago
Muhammad Rashad
4e73b778e2
Move grafana to separate module
3 years ago
builder
1896199698
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
a765f780f0
[maven-release-plugin] prepare release v5.0.1
3 years ago
Amalka Subasinghe
4ed28820c8
operation timeout feature
3 years ago
builder
ef558458a0
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
8e191e75a6
[maven-release-plugin] prepare release v5.0.0
3 years ago
Pahansith Gunathilake
8b6a3ef77c
Merge branch 'master' into 'master'
...
adding device status history feature
See merge request entgra/carbon-device-mgt!836
3 years ago
Don Kushan Saminda Wijeratne
7e7fa53b8f
adding device status history feature
3 years ago
Pahansith Gunathilake
21e014d6a6
Merge branch 'api/pr/grafana/device-mgt' into 'master'
...
Added grafana integration
See merge request entgra/carbon-device-mgt!829
3 years ago
Muhammad Rashad
1f536c40e4
Added grafana integration
3 years ago
builder
2e9832caa6
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
6b0c527bb2
[maven-release-plugin] prepare release v5.0.0
3 years ago
Rushdi Mohamed
e54765e992
Updated the operation status
3 years ago
Rushdi Mohamed
fd82162909
Added new operation status
3 years ago
Charitha Goonetilleke
78824205c1
Merge branch 'master' into 'master'
...
Allow retrieving activities for multiple device ids
See merge request entgra/carbon-device-mgt!831
3 years ago
shamalka
301a7e7009
Add additional attributes to policy UI beans
3 years ago
Charitha Goonetilleke
0284c955cf
Allow retrieving activities for multiple device ids
3 years ago
builder
d7ccaa559b
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
907fb825ea
[maven-release-plugin] prepare release v5.0.0
3 years ago
Pahansith Gunathilake
69677b4982
Merge branch 'modify-activity-epnew' into 'master'
...
Add time duration filtering to activities endpoint
See merge request entgra/carbon-device-mgt!828
3 years ago
Pahansith Gunathilake
51cf354f4a
Merge branch 'kernel-4.6.2' into 'master'
...
removed unwanted todos
See merge request entgra/carbon-device-mgt!825
3 years ago
Pahansith Gunathilake
b61c97d603
Make timestamps independent from host machine timezone
3 years ago
Pahansith Gunathilake
9f2cedd09c
Change time filtering DB column
3 years ago
Pahansith Gunathilake
a0856f7069
Add time duration filtering to activities EP
3 years ago
Amalka Subasinghe
fbc255b7a8
removed unwanted todos
3 years ago
Pahansith Gunathilake
26ef9bcf01
Merge branch 'subs-operation-status-fix' into 'master'
...
Fix operation status issue in app subscription
See merge request entgra/carbon-device-mgt!818
3 years ago
Chamindu Senanayake
7776e19946
Fix operation status issue in app subscription
...
Fixes https://gitlab.com/entgra/product-iots/-/issues/999
3 years ago
navodzoysa
71e6ca3bd0
Add API to retrieve filters for analytics
3 years ago
Charitha Goonetilleke
6f008ea65f
Allow users with CDM Admin permission to retrieve activities
3 years ago
Charitha Goonetilleke
3fea6f79c7
Add missing initiated by field in operation retrieval
3 years ago
lasantha
4c921d54b1
Update APPM subscriptions when operation log updates
3 years ago
builder
216e47b429
[maven-release-plugin] prepare for next development iteration
3 years ago
builder
5c2dc99b09
[maven-release-plugin] prepare release v5.0.0
3 years ago
Pahansith Gunathilake
9daa745001
Merge branch 'kernel-4.6.x' into 'kernel-4.6.x'
...
Sync with master
See merge request entgra/carbon-device-mgt!807
3 years ago
Pahansith Gunathilake
f22fc7e460
Fix test cases kernel-4.6.x
3 years ago
Saad Sahibjan
b3a229a0e7
Update device property table in dm db when updating properties
...
(cherry picked from commit 5f64b0b1ad
)
3 years ago
Saad Sahibjan
1434a27cde
Add new device status ASSIGNED
...
(cherry picked from commit 68405ed229
)
3 years ago
sandaru
eb05fb9a3f
Fix web-clip install issue
...
(cherry picked from commit ebe9842d9a
)
3 years ago
Saad Sahibjan
6393276503
Fix having UPPER in query of groups retrieval
...
(cherry picked from commit 4681447ba9
)
3 years ago
Pahansith
ee95c8aca1
Fix location update timestamp overwrite issue
3 years ago
Amalka Subasinghe
7dc5d7f45d
X:Merge branch 'master' into kernel-4.6.2
3 years ago
Pahansith
d8999cd3a6
Fix error while adding app install to a device group
3 years ago
Amalka Subasinghe
eae469fbc5
tenant login issue fixed
3 years ago
Amalka Subasinghe
4503ab77c7
package name change - appmgt
3 years ago
Amalka Subasinghe
8a07dad38c
package name change - appmgt common
3 years ago
Amalka Subasinghe
37b08ba389
package name change - appmgt core
3 years ago
Amalka Subasinghe
f9274b0d1a
update from master
3 years ago
Pahansith Gunathilake
76deadcf41
Merge branch 'master' into 'master'
...
Login cache improvements and Refresh token handling improvements
See merge request entgra/carbon-device-mgt!789
3 years ago
Pahansith Gunathilake
dc6856fc0e
Merge branch 'master' into 'master'
...
Block Uninstall Policy Feature
See merge request entgra/carbon-device-mgt!787
3 years ago
Muhammad Rashad
556886daec
Block Uninstall Policy Feature
3 years ago
Pahansith Gunathilake
939e9faeff
Merge branch 'hierarchical-grouping' into 'master'
...
Hierarchical grouping
See merge request entgra/carbon-device-mgt!780
3 years ago
Vigneshan Seshamany
0eb74d9f60
Modify login cache implementatation with LRU cache
3 years ago
Amalka Subasinghe
88d305c1b1
Merge branch 'master' into kernel-4.6.2
3 years ago
navodzoysa
5d23d1d6f6
Fix date range shown in reverse in MDM Reports
3 years ago
Saad Sahibjan
489aaabc44
Move slash to a constant
3 years ago
Saad Sahibjan
ed087e2a0c
Update all children groups when updating a group
3 years ago
Amalka Subasinghe
f3720e49ff
added scripts and updated config reading
3 years ago
Amalka Subasinghe
bdb01a0098
bug fixing
3 years ago
Amalka Subasinghe
a418fe5d0d
Merge branch 'master' into kernel-4.6.2
3 years ago
Amalka Subasinghe
fc9a9ca210
fixed permission issues
3 years ago
Amalka Subasinghe
510a90a59f
bug fixing authorize flow
3 years ago
Kaveesha
d84f642b55
Add API for get app subscribed device list from a subscription group
3 years ago
Pahansith Gunathilake
c2dd2130b4
Merge branch 'master' into 'master'
...
Update DM_DEVICE_INFO table
See merge request entgra/carbon-device-mgt!776
3 years ago
Amalka Subasinghe
52c0e55b07
adding user roles
3 years ago
Amalka Subasinghe
f9a9cff0b9
updated user roles
3 years ago
Amalka Subasinghe
c558cec88e
scope-role-permission refactoring and webapp authorization
3 years ago
Amalka Subasinghe
30a1d92fde
scope-role-permission refactoring and webapp authorization
3 years ago
Amalka Subasinghe
94dd33ffa5
scope-role-permission refactoring and webapp authorization
3 years ago
Saad Sahibjan
24e69d5492
Fix test cases related to hierarchical group changes
3 years ago
Saad Sahibjan
e18aa57fe8
Add and update api layer related to hierarchical changes
3 years ago
Saad Sahibjan
0ae6c6246a
Add and update service layer related to hierarchical changes
3 years ago
Saad Sahibjan
e22d9fd8fc
Add and update dao layer methods related to hierarchical changes
3 years ago
Saad Sahibjan
f1892f726d
Update device group and request beans classes to have new variable
3 years ago
Amalka Subasinghe
51dd72ff79
commented braking changes related to analytics
4 years ago
Amalka Subasinghe
d090fef2ac
updated from master and added oauth2 component
4 years ago
Pahansith Gunathilake
feb8f9ca38
Merge branch 'issue-work-scope' into 'master'
...
[SBAC] - Add changes to use a newly added scope element in android.xml
Closes product-iots#985 and product-iots#937
See merge request entgra/carbon-device-mgt!771
4 years ago
Amalka Subasinghe
293b5f5a7b
updated pom versions to 5.0.0-SNAPSHOT
4 years ago
Charitha Goonetilleke
89ae048a5d
Merge branch 'geo-view' into 'master'
...
Add geo view API
See merge request entgra/carbon-device-mgt!775
4 years ago
MalshaPiumini
a1567d8a3d
Increase session time for sso and non-sso login.
4 years ago
Kaveesha
e111c1dda8
Update DM_DEVICE_INFO table
4 years ago
Charitha Goonetilleke
3a17cb2329
Consider not now operations as pending
4 years ago
Amalka Subasinghe
83b31f0d02
updated from master and fixed conf copying issue
4 years ago
Charitha Goonetilleke
e5fb17aceb
Add geo view API
4 years ago
Farheen99
5ac273f362
Add code changes to read a new xml element named scope from android.xml file
4 years ago
Amalka Subasinghe
a12be72a13
updated to kernel 4.6.2
4 years ago
Kaveesha
6c947962d6
Update item bean class to get documentation link from xml
4 years ago
Amalka Subasinghe
056987141b
cleaned up components/device-mgt
4 years ago
Amalka Subasinghe
c33e13b04c
updating to kernel 4.6.1
4 years ago
Charitha Goonetilleke
515d6b5797
Allow dynamic control of operations
4 years ago
Charitha Goonetilleke
2d6f3298bf
Add NOTNOW status to activity result
4 years ago