184716b17a
Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into HEAD
2 years ago
9a5322845f
Change otp api to return token
2 years ago
a367cd6b35
Fix duplicate group and role error handling responses
2 years ago
9d3e5fbc3a
[maven-release-plugin] prepare for next development iteration
2 years ago
744881d21e
[maven-release-plugin] prepare release v5.0.14
2 years ago
Deenath Geeganage
7e914aeafd
Device names in endpoint-mgt and traccar are not consistent - Fix ( #21 )
...
Fix: [https://roadmap.entgra.net/issues/9656 ](https://roadmap.entgra.net/issues/9656 )
When renaming an agent, the update wasn't send to the traccar server.
Added new methods and combined it with existing agent modification code
Co-authored-by: Deenath Geegange <deenathgeeganage@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: #21
Co-authored-by: Deenath Geeganage <deenathgeeganage@gmail.com>
Co-committed-by: Deenath Geeganage <deenathgeeganage@gmail.com>
2 years ago
Pahansith Gunathilake
a86da84b6f
Merge branch 'master' into traccar-fix
2 years ago
7c2b4bd687
Fix group delete
2 years ago
93684174d4
Update traccar configuration
2 years ago
e5d7512d0a
fix traccar nullpointer error
2 years ago
Vigneshan Seshamany
17638029d3
Fix group update issue
2 years ago
777940b896
Fix SendDeviceNameChangedNotification
2 years ago
5e612ceaf2
Add capability to send a notification when device rename
2 years ago
b18ddfedce
[maven-release-plugin] prepare for next development iteration
2 years ago
ec8d08ca63
[maven-release-plugin] prepare release v5.0.13
2 years ago
b9f2bf9246
[maven-release-plugin] prepare for next development iteration
2 years ago
8f610eea63
[maven-release-plugin] prepare release v5.0.12
2 years ago
388ae39fef
Add device mgt denying exception class
2 years ago
Shamalka Navod
df5cdb5240
Fix traccar issues ( #5 )
...
* Fix traccar client thredpool issue
* Refactor traccar implementation
* Fix traccar loading issue
Co-authored-by: shamalka <shamalkanavod95@gmail.com>
Reviewed-on: #5
Co-authored-by: Shamalka Navod <shamalka@entgra.io>
Co-committed-by: Shamalka Navod <shamalka@entgra.io>
2 years ago
3332d8e85e
Merge branch 'swagger-fix' into 'master'
...
Swagger fix
See merge request entgra/carbon-device-mgt!921
2 years ago
3384b597f9
Improve device name search
2 years ago
Kavindya. Sathsarani
bb5f779c26
Add a searchable input for App Restriction Settings policy
2 years ago
92f2a6f50d
improvements in policy ui
2 years ago
c14047f913
Fix issues in the swagger related to URLs
2 years ago
259795a274
fix swagger syntax issues
2 years ago
223637c887
[maven-release-plugin] prepare for next development iteration
2 years ago
b7311af447
[maven-release-plugin] prepare release v5.0.11
2 years ago
5f1271db93
Fixes related to publishing ws api and routing requests
2 years ago
eaad94b3e9
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar
2 years ago
83be953583
Fix issues
2 years ago
fef1d41d39
Merge branch 'ldap-fixes' into 'master'
...
Add optional user store domain query param to user APIs
See merge request entgra/carbon-device-mgt!892
2 years ago
cc98f6a881
Update config files to fix billing UI isssues
2 years ago
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
c68478daca
Fix formatting issues
2 years ago
642067b146
Remove wildcard imports
2 years ago
c312e69bf4
Revert unwanted change
2 years ago
b311908d47
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar
2 years ago
31bb87db41
Add missing error logs and fix formatting issues
2 years ago
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
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
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
6b6e9ba640
Fix group names being able to be duplicated when renaming
2 years ago
6a62546440
Add optional user domain query param to user APIs
2 years ago
3c9fc68619
[maven-release-plugin] prepare for next development iteration
2 years ago
0b4fe08847
[maven-release-plugin] prepare release v5.0.10
2 years ago
0290758c25
[maven-release-plugin] prepare for next development iteration
2 years ago
790ab62b34
[maven-release-plugin] prepare release v5.0.9
2 years ago
c8527bd08b
Add Windows app uninstallation feature
2 years ago
7f96ce3c33
[maven-release-plugin] prepare for next development iteration
2 years ago
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
2 years ago
Rushdi Mohamed
120c1150ce
fix traccar speed measure on kmh
2 years ago
af25528a8b
Delete custom whitelabel favicon and logo on whitelabel reset
2 years ago
Rushdi Mohamed
6f79180920
removed unwanted codes
2 years ago
c63168be62
Fix passing favicon image bean when retrieving existing logo
2 years ago
Rushdi Mohamed
e88d5e9c3b
Add traccar configuration on p2.inf and updated mysql.sql
2 years ago
be15bf9185
Fix log message
2 years ago
eb061f9450
Refator page tite to app title
2 years ago
78546125bc
Add page title to whitelable
2 years ago
7df4aff569
Fix retrieving favicon as logo when retrieving existing images for rollback
3 years ago
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
b8a0ffe7c0
Improve favicon/logo response content type handling
3 years ago
460675fcad
Fix favicon/logo response content type
3 years ago
5677e1e3fe
Better feedback message/log if favicon/logo white label images not found
3 years ago
ed9ec69509
Move metadata and whitelabel config classes to metadata.mgt package
3 years ago
1559af9660
Adress feedback
...
Add missing licenses
3 years ago
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
7907a1c5ff
Add tenant whitelabeling api
...
Make whitelabel favion and logo api public
Refactor whitelabeling feature in separate classes
3 years ago
8636767cba
[maven-release-plugin] prepare for next development iteration
3 years ago
9af9bea2b6
[maven-release-plugin] prepare release v5.0.7
3 years ago
a7a567c971
Fix parse pom
3 years ago
4d76be36de
Merge branch 'user-store' into 'master'
...
Add new API to fetch userstores
See merge request entgra/carbon-device-mgt!884
3 years ago
b62b4aebc3
Add new API to fetch userstores
3 years ago
47fb2c77f5
Merge branch 'billing-api-1226' into 'master'
...
Adding the new billing API
See merge request entgra/carbon-device-mgt!848
3 years ago
817dc57862
[maven-release-plugin] prepare for next development iteration
3 years ago
7196d2daea
[maven-release-plugin] prepare release v5.0.6
3 years ago
ab053807b3
Fix application managment test
3 years ago
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
340be6ed65
Add new API to fetch UI policy list
3 years ago
aa2fa45a5f
Tempory merge conflict resolution
3 years ago
41a0c9118a
Add java doc comments
...
Use try-with resource when using CloseableHttpClient
Refactor few variable and method names
3 years ago
f86617a264
Add the sql files
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
daaeed52e2
Add and Change licence from WSO2 to Entgra
3 years ago
7ba8311c93
fix conflict
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
5ad9e3e6b4
Add billing data export api
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
946a12b84d
[maven-release-plugin] prepare for next development iteration
3 years ago
f55ffbb19a
[maven-release-plugin] prepare release v5.0.5
3 years ago
38f9b60970
Fix sql query that gets subscribed devices
3 years ago
39216aa651
[maven-release-plugin] prepare for next development iteration
3 years ago
8deff13edd
[maven-release-plugin] prepare release v5.0.4
3 years ago
59b2aa42b4
Fix duplicate devices in subscription log
3 years ago
a4b2a325b1
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
3 years ago
053a57c4f5
Add getting billing cost by domain change
...
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
3 years ago
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
7a4cef26e4
Fix invalid DAO factory handling & invalid event revoke payload
3 years ago
c135105889
fixes https://gitlab.com/entgra/carbon-device-mgt/-/merge_requests/848/commits
...
Add re-enrollment device cost calculation
3 years ago
8872d1baeb
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
3 years ago
96e4aa8436
[maven-release-plugin] prepare for next development iteration
3 years ago
739266feca
[maven-release-plugin] prepare release v5.0.3
3 years ago
27303cf12b
Fix invalid DAO factory handling & invalid event revoke payload
3 years ago
778bb3e987
Fix invalid time immediate after device enrollment
3 years ago
f611c45d3b
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
3 years ago
7b1b8ecffd
Add last billed date
3 years ago
cb2e5e9c66
Fix test failure
3 years ago
35e0b9189e
Add separate DAO factory for event management
3 years ago
12c48540d8
Fix device enrollment failure
3 years ago
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
5e247c6e6b
Add identity server service provider app integration
3 years ago
ed256ad346
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
...
resole cofilict
3 years ago
d01aa2026d
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
...
Adding the new billing API
3 years ago
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
06560d24d4
[maven-release-plugin] prepare for next development iteration
3 years ago
2784633dd6
[maven-release-plugin] prepare release v5.0.2
3 years ago
4e73b778e2
Move grafana to separate module
3 years ago
1896199698
[maven-release-plugin] prepare for next development iteration
3 years ago
a765f780f0
[maven-release-plugin] prepare release v5.0.1
3 years ago
4ed28820c8
operation timeout feature
3 years ago
ef558458a0
[maven-release-plugin] prepare for next development iteration
3 years ago
8e191e75a6
[maven-release-plugin] prepare release v5.0.0
3 years ago
8b6a3ef77c
Merge branch 'master' into 'master'
...
adding device status history feature
See merge request entgra/carbon-device-mgt!836
3 years ago
7e7fa53b8f
adding device status history feature
3 years ago
21e014d6a6
Merge branch 'api/pr/grafana/device-mgt' into 'master'
...
Added grafana integration
See merge request entgra/carbon-device-mgt!829
3 years ago
1f536c40e4
Added grafana integration
3 years ago
2e9832caa6
[maven-release-plugin] prepare for next development iteration
3 years ago
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
301a7e7009
Add additional attributes to policy UI beans
3 years ago
Charitha Goonetilleke
0284c955cf
Allow retrieving activities for multiple device ids
3 years ago
d7ccaa559b
[maven-release-plugin] prepare for next development iteration
3 years ago
907fb825ea
[maven-release-plugin] prepare release v5.0.0
3 years ago
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
51cf354f4a
Merge branch 'kernel-4.6.2' into 'master'
...
removed unwanted todos
See merge request entgra/carbon-device-mgt!825
3 years ago
b61c97d603
Make timestamps independent from host machine timezone
3 years ago
9f2cedd09c
Change time filtering DB column
3 years ago
a0856f7069
Add time duration filtering to activities EP
3 years ago
fbc255b7a8
removed unwanted todos
3 years ago
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
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
4c921d54b1
Update APPM subscriptions when operation log updates
3 years ago
216e47b429
[maven-release-plugin] prepare for next development iteration
3 years ago
5c2dc99b09
[maven-release-plugin] prepare release v5.0.0
3 years ago
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
f22fc7e460
Fix test cases kernel-4.6.x
3 years ago
b3a229a0e7
Update device property table in dm db when updating properties
...
(cherry picked from commit 5f64b0b1ad
3 years ago
1434a27cde
Add new device status ASSIGNED
...
(cherry picked from commit 68405ed229
3 years ago
eb05fb9a3f
Fix web-clip install issue
...
(cherry picked from commit ebe9842d9a
3 years ago
6393276503
Fix having UPPER in query of groups retrieval
...
(cherry picked from commit 4681447ba9
3 years ago
ee95c8aca1
Fix location update timestamp overwrite issue
3 years ago
7dc5d7f45d
X:Merge branch 'master' into kernel-4.6.2
3 years ago
d8999cd3a6
Fix error while adding app install to a device group
3 years ago
eae469fbc5
tenant login issue fixed
3 years ago
4503ab77c7
package name change - appmgt
3 years ago
8a07dad38c
package name change - appmgt common
3 years ago
37b08ba389
package name change - appmgt core
3 years ago
f9274b0d1a
update from master
3 years ago
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
dc6856fc0e
Merge branch 'master' into 'master'
...
Block Uninstall Policy Feature
See merge request entgra/carbon-device-mgt!787
3 years ago
556886daec
Block Uninstall Policy Feature
3 years ago
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
88d305c1b1
Merge branch 'master' into kernel-4.6.2
3 years ago
5d23d1d6f6
Fix date range shown in reverse in MDM Reports
3 years ago
489aaabc44
Move slash to a constant
3 years ago
ed087e2a0c
Update all children groups when updating a group
3 years ago
f3720e49ff
added scripts and updated config reading
3 years ago
bdb01a0098
bug fixing
3 years ago
a418fe5d0d
Merge branch 'master' into kernel-4.6.2
3 years ago
fc9a9ca210
fixed permission issues
3 years ago
510a90a59f
bug fixing authorize flow
3 years ago
d84f642b55
Add API for get app subscribed device list from a subscription group
3 years ago
c2dd2130b4
Merge branch 'master' into 'master'
...
Update DM_DEVICE_INFO table
See merge request entgra/carbon-device-mgt!776
3 years ago
52c0e55b07
adding user roles
3 years ago
f9a9cff0b9
updated user roles
3 years ago
c558cec88e
scope-role-permission refactoring and webapp authorization
3 years ago
30a1d92fde
scope-role-permission refactoring and webapp authorization
3 years ago
94dd33ffa5
scope-role-permission refactoring and webapp authorization
3 years ago
24e69d5492
Fix test cases related to hierarchical group changes
3 years ago
e18aa57fe8
Add and update api layer related to hierarchical changes
3 years ago
0ae6c6246a
Add and update service layer related to hierarchical changes
3 years ago
e22d9fd8fc
Add and update dao layer methods related to hierarchical changes
3 years ago
f1892f726d
Update device group and request beans classes to have new variable
3 years ago
51dd72ff79
commented braking changes related to analytics
3 years ago
d090fef2ac
updated from master and added oauth2 component
3 years ago
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
3 years ago
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
a1567d8a3d
Increase session time for sso and non-sso login.
4 years ago
e111c1dda8
Update DM_DEVICE_INFO table
4 years ago
Charitha Goonetilleke
3a17cb2329
Consider not now operations as pending
4 years ago
83b31f0d02
updated from master and fixed conf copying issue
4 years ago
Charitha Goonetilleke
e5fb17aceb
Add geo view API
4 years ago
5ac273f362
Add code changes to read a new xml element named scope from android.xml file
4 years ago
a12be72a13
updated to kernel 4.6.2
4 years ago
6c947962d6
Update item bean class to get documentation link from xml
4 years ago
056987141b
cleaned up components/device-mgt
4 years ago
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
6f325862ec
Formatting the SQL query.
4 years ago
60b59f455d
Solved test case failure.
4 years ago
b2691996ab
Added device filter using serial number.
4 years ago
Inosh Perara
a0ed490b0b
Merge branch 'Dummy' into 'master'
...
Device filters in store portal
Closes product-iots#866
See merge request entgra/carbon-device-mgt!746
4 years ago
365b073e6a
Fix app schedule installation issue in single node
4 years ago
Charitha Goonetilleke
99e5f9f876
Fix executing policy monitoring continuously
4 years ago
0f39b2f253
Handle execution of queries contain IN clause with empty array
4 years ago
25c2320956
Fix wrong zip codes from agents persisting
4 years ago
dca6b53a67
Added new filter in subscription details page
4 years ago
605168e770
Code modified
4 years ago
74c4f1004a
Device search in store uninstall modal
4 years ago
feacd5029d
[maven-release-plugin] prepare for next development iteration
4 years ago
09907233fc
[maven-release-plugin] prepare release v4.1.15
4 years ago
9f76c003a6
Fix app subscription adding issue for removed devices
4 years ago
8c50af1631
Merge branch 'master' into 'master'
...
Fix FCM and configuration fetching issues
See merge request entgra/carbon-device-mgt!742
4 years ago
28e0c88222
Fix FCM and configuration fetching issues
4 years ago
Charitha Goonetilleke
0435138fc9
Fix issue with updating status due to cache inconsistency
4 years ago
ddab435548
[maven-release-plugin] prepare for next development iteration
4 years ago
shamalka
navodzoysa
builder
Deenath Geeganage
Pahansith Gunathilake
Pahansith Gunathilake
Vigneshan Seshamany
Arshana
Dharmakeerthi Lasantha
Shamalka Navod
Kavindya. Sathsarani
kavindyaS007
inoshperera
Amalka Subasinghe
Oshani Silva
Rushdi Mohamed
Mohamed Rashd
Mohamed Rashd
Don Kushan Saminda Wijeratne
Muhammad Rashad
Charitha Goonetilleke
Chamindu Senanayake
Saad Sahibjan
sandaru
Kaveesha
MalshaPiumini
Farheen99
Inosh Perara
Entgra Builder