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
4 years ago
Amalka Subasinghe
f9a9cff0b9
updated user roles
4 years ago
Amalka Subasinghe
c558cec88e
scope-role-permission refactoring and webapp authorization
4 years ago
Amalka Subasinghe
30a1d92fde
scope-role-permission refactoring and webapp authorization
4 years ago
Amalka Subasinghe
94dd33ffa5
scope-role-permission refactoring and webapp authorization
4 years ago
Saad Sahibjan
24e69d5492
Fix test cases related to hierarchical group changes
4 years ago
Saad Sahibjan
e18aa57fe8
Add and update api layer related to hierarchical changes
4 years ago
Saad Sahibjan
0ae6c6246a
Add and update service layer related to hierarchical changes
4 years ago
Saad Sahibjan
e22d9fd8fc
Add and update dao layer methods related to hierarchical changes
4 years ago
Saad Sahibjan
f1892f726d
Update device group and request beans classes to have new variable
4 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
MalshaPiumini
6f325862ec
Formatting the SQL query.
4 years ago
MalshaPiumini
60b59f455d
Solved test case failure.
4 years ago
MalshaPiumini
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
Pahansith
365b073e6a
Fix app schedule installation issue in single node
4 years ago
Charitha Goonetilleke
99e5f9f876
Fix executing policy monitoring continuously
4 years ago
Farheen Boosary
0f39b2f253
Handle execution of queries contain IN clause with empty array
4 years ago
inoshperera
25c2320956
Fix wrong zip codes from agents persisting
4 years ago
MalshaPiumini
dca6b53a67
Added new filter in subscription details page
4 years ago
MalshaPiumini
605168e770
Code modified
4 years ago
MalshaPiumini
74c4f1004a
Device search in store uninstall modal
4 years ago
Entgra Builder
feacd5029d
[maven-release-plugin] prepare for next development iteration
4 years ago
Entgra Builder
09907233fc
[maven-release-plugin] prepare release v4.1.15
4 years ago
tcdlpds@gmail.com
9f76c003a6
Fix app subscription adding issue for removed devices
4 years ago
Dharmakeerthi Lasantha
8c50af1631
Merge branch 'master' into 'master'
...
Fix FCM and configuration fetching issues
See merge request entgra/carbon-device-mgt!742
4 years ago
inoshperera
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
Entgra Builder
ddab435548
[maven-release-plugin] prepare for next development iteration
4 years ago
Entgra Builder
5b2c085a3e
[maven-release-plugin] prepare release v4.1.14
4 years ago
Dharmakeerthi Lasantha
d4aaf3ce4b
Merge branch 'sync_fix' into 'master'
...
Fix issue in enrollment object modification
See merge request entgra/carbon-device-mgt!741
4 years ago
inoshperera
bfd1f794de
Fix issue in enrollment object modification
4 years ago
Entgra Builder
ca7ded79cb
[maven-release-plugin] prepare for next development iteration
4 years ago
Entgra Builder
368bb74436
[maven-release-plugin] prepare release v4.1.13
4 years ago
tcdlpds@gmail.com
2ccd137ec0
Upgrade product version in device-mgt UI
4 years ago
Dharmakeerthi Lasantha
cb3b07f35e
Merge branch 'policy-ui' into 'master'
...
Remove unnecessary variable from card bean
See merge request entgra/carbon-device-mgt!736
4 years ago
Pahansith
e1afa53560
Fix geofence update issue
4 years ago
shamalka
9e3d126c08
Remove unnecessary variable from card bean
4 years ago
Entgra Builder
7463aa6e5a
[maven-release-plugin] prepare for next development iteration
4 years ago
Entgra Builder
531672de8e
[maven-release-plugin] prepare release v4.1.12
4 years ago
Shamalka Navod
ee5676d815
Improve policy UI bean classes
4 years ago
Charitha Goonetilleke
31dc6fc839
Fix NPE
4 years ago
Dharmakeerthi Lasantha
7e088ea747
Merge branch 'sync_fix' into 'master'
...
Fix cache not updating
See merge request entgra/carbon-device-mgt!734
4 years ago
inoshperera
4f88c2354c
Fix cache not updating
4 years ago
Dharmakeerthi Lasantha
6f4e8a3688
Merge branch 'sync_fix' into 'master'
...
Fix for sycning status update in Android
See merge request entgra/carbon-device-mgt!733
4 years ago
inoshperera
8effa09a8f
Fix for sycning status update in Android
4 years ago
tcdlpds@gmail.com
4ea3890a2e
Upgrade server version in UI text info
4 years ago
shamalka
1faee050af
Remove commented code lines
4 years ago
shamalka
72edb6c323
Accept multiple device status in store API
4 years ago
Entgra Builder
62919fa787
[maven-release-plugin] prepare for next development iteration
4 years ago
Entgra Builder
b98d787367
[maven-release-plugin] prepare release v4.1.11
4 years ago
Dharmakeerthi Lasantha
ce80f4efe0
Merge branch 'event-modify-branch-1' into 'master'
...
Code format of event task operation
See merge request entgra/carbon-device-mgt!728
4 years ago
Pahansith
4cc670a614
Format code
4 years ago
Charitha Goonetilleke
1e2afa6439
Merge branch 'event-modify-branch-1' into 'master'
...
Modify event creation task
See merge request entgra/carbon-device-mgt!725
4 years ago
Pahansith
9ef6cfc1e6
Move executor pool to the DeviceManagementDataHolder
4 years ago
tcdlpds@gmail.com
572e93a357
Fix server startup issues
4 years ago
Pahansith
2fa4a6167e
Fix test failures
4 years ago
Pahansith
0cbcd747d5
Modify event operation creation
4 years ago
tcdlpds@gmail.com
175205b959
Fix build failure
4 years ago
tcdlpds@gmail.com
7b41e2cd0d
Fix EULA loading issue for tenants
...
Fix registry loading issue when SSO has enabled. Because of that issue device type EULA displaying page is broken
4 years ago
tcdlpds@gmail.com
104bca0fb5
Add FULLY_MANAGED and DEDICATED_DEVICE ownership types
4 years ago
tcdlpds@gmail.com
51fface401
Append tenant domain when getting default access token
4 years ago
Pahansith
a7e6b64f70
Fix review issues and format code
4 years ago
Charitha Goonetilleke
ad4d7a453f
Fix NPE occur when updating device with null status
4 years ago
tcdlpds@gmail.com
b4d7497022
Modify DeviceTypeCommonService
4 years ago
Charitha Goonetilleke
864bbcdc83
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
4 years ago
Charitha Goonetilleke
2bdaf4186b
Add Activity ID for repeated operation
4 years ago
Malsha Piumini
89298f933e
Uninstall applications via Apps Tab - (For Android devices only)
4 years ago
Charitha Goonetilleke
9a2792dd31
Fix issue in not updating operation response for non-removed devices
4 years ago
Pahansith
baeb34e1da
Fix review issues and format code
4 years ago
Pahansith
a36733d224
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master
4 years ago
Pahansith
931fb8ef54
Add windows agent token generation parameters to config API
4 years ago
Pahansith
987f8edd61
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master
4 years ago
Charitha Goonetilleke
4943635a61
Fetch enrollment Id if it is not already in the device
4 years ago
Charitha Goonetilleke
55c3f93deb
Update license to entgra
4 years ago
Charitha Goonetilleke
a9cb2ae84d
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
...
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
4 years ago
Pahansith
bc85a89cf9
Change event task to implement ntask interface
4 years ago
tcdlpds@gmail.com
087b826d29
Improve information logging
4 years ago
Shamalka Navod
eccb39d6f4
Improve metadata API
4 years ago
Inosh Perara
5297dfa73d
Merge branch 'lasantha' into 'master'
...
Adding heart beat management functionality for dynamic task distribution
See merge request entgra/carbon-device-mgt!695
4 years ago
Ace
ceab2566ac
Addressing review comments
4 years ago
Ace
5531bc0140
Addressing review comments
4 years ago
Ace
4df57ede61
incoorporating review comments
4 years ago
Dharmakeerthi Lasantha
d9386901d4
Merge branch 'corrective-policy' into 'master'
...
Implement OIDC Based SSO For All React Applications
Closes product-iots#656
See merge request entgra/carbon-device-mgt!680
4 years ago
Vigneshan Seshamany
0917d3bf7f
Improve consent management page to process oidc requests
4 years ago
Ace
bac6e3ba67
merging with upstream
4 years ago
Ace
c6db9eeecc
adding randomly assigned task functionality and other improvements
4 years ago
Pahansith Gunathilake
caba7fc673
Add missing error logs to OperationManagerImpl
4 years ago
Pahansith
e5dd609dc2
Add method comments and format code
4 years ago
Charitha Goonetilleke
911bd62a44
Fix not adhering 'initiated by'
4 years ago
Charitha Goonetilleke
31a6497950
Fix enrollment modification issues
4 years ago
Charitha Goonetilleke
d75f48166e
Provide response based on headers
4 years ago
Charitha Goonetilleke
10d114ba1e
Improve activity retrieval logic
4 years ago
Ace
9d39197844
Adding improvements to dynamic task allocation
4 years ago
Pahansith
a3629d5932
Add group data into geofence response, Format code
4 years ago
Pahansith
8c80185610
Add doc comments and format code
4 years ago
Pahansith
d9d0ba5d90
Add event delete API
4 years ago
Pahansith
fed779302a
Fix issues in Event DAO and improvements for the operation task
4 years ago
Pahansith
f073ee9276
Add H2 DAO for event configuration
4 years ago
Pahansith
75b619d5f9
Add event configuration operation creation tasks
4 years ago
Pahansith
efe116d87e
Modify geofence get API
4 years ago
Pahansith
af85ca47e0
Change Geo fence edit API - Attach Events
4 years ago
Pahansith
bd8cf5237d
Change Geo fence create API - Attach Event creation
4 years ago
Ace
b1d95af5b0
remvoing restriction that prevents activity count to be returned when if-modified-since header is present
4 years ago
Ace
ada570f0a0
fixing NPE when processing operations
4 years ago
tcdlpds@gmail.com
fc0fa92826
Fix incorrect device operation count returning issue
4 years ago
Ace
7cd1baf1af
Adding missing license headers
4 years ago
Ace
e7b97d78c7
Imrpoving task implementation
4 years ago
Kaveesha
f99bbe36de
Improve Input class in policy ui Configuration
4 years ago