osh
|
8872d1baeb
|
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226
|
2022-03-06 10:03:12 +05:30 |
|
builder
|
96e4aa8436
|
[maven-release-plugin] prepare for next development iteration
|
2022-03-05 04:37:48 +00:00 |
|
builder
|
739266feca
|
[maven-release-plugin] prepare release v5.0.3
|
2022-03-05 04:37:42 +00:00 |
|
osh
|
7b1b8ecffd
|
Add last billed date
|
2022-03-02 15:44:41 +05:30 |
|
osh
|
ed256ad346
|
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
resole cofilict
|
2022-02-17 14:06:43 +05:30 |
|
osh
|
d01aa2026d
|
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
Adding the new billing API
|
2022-02-17 13:58:15 +05:30 |
|
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
|
2022-02-02 09:04:29 +00:00 |
|
builder
|
06560d24d4
|
[maven-release-plugin] prepare for next development iteration
|
2022-01-24 08:29:39 +00:00 |
|
builder
|
2784633dd6
|
[maven-release-plugin] prepare release v5.0.2
|
2022-01-24 08:29:35 +00:00 |
|
Muhammad Rashad
|
4e73b778e2
|
Move grafana to separate module
|
2022-01-24 07:19:31 +00:00 |
|
builder
|
1896199698
|
[maven-release-plugin] prepare for next development iteration
|
2022-01-24 04:04:22 +00:00 |
|
builder
|
a765f780f0
|
[maven-release-plugin] prepare release v5.0.1
|
2022-01-24 04:04:17 +00:00 |
|
Amalka Subasinghe
|
4ed28820c8
|
operation timeout feature
|
2022-01-24 03:56:25 +00:00 |
|
builder
|
ef558458a0
|
[maven-release-plugin] prepare for next development iteration
|
2022-01-18 03:25:27 +00:00 |
|
builder
|
8e191e75a6
|
[maven-release-plugin] prepare release v5.0.0
|
2022-01-18 03:25:22 +00:00 |
|
Pahansith Gunathilake
|
8b6a3ef77c
|
Merge branch 'master' into 'master'
adding device status history feature
See merge request entgra/carbon-device-mgt!836
|
2022-01-18 03:18:30 +00:00 |
|
Don Kushan Saminda Wijeratne
|
7e7fa53b8f
|
adding device status history feature
|
2022-01-18 03:18:29 +00:00 |
|
Pahansith Gunathilake
|
21e014d6a6
|
Merge branch 'api/pr/grafana/device-mgt' into 'master'
Added grafana integration
See merge request entgra/carbon-device-mgt!829
|
2022-01-18 03:11:09 +00:00 |
|
Muhammad Rashad
|
1f536c40e4
|
Added grafana integration
|
2022-01-18 03:11:08 +00:00 |
|
builder
|
2e9832caa6
|
[maven-release-plugin] prepare for next development iteration
|
2022-01-12 06:12:38 +00:00 |
|
builder
|
6b0c527bb2
|
[maven-release-plugin] prepare release v5.0.0
|
2022-01-12 06:12:32 +00:00 |
|
Rushdi
|
e54765e992
|
Updated the operation status
|
2022-01-05 13:30:42 +05:30 |
|
Rushdi
|
fd82162909
|
Added new operation status
|
2022-01-05 13:04:42 +05:30 |
|
Charitha Goonetilleke
|
78824205c1
|
Merge branch 'master' into 'master'
Allow retrieving activities for multiple device ids
See merge request entgra/carbon-device-mgt!831
|
2021-12-17 13:13:40 +00:00 |
|
shamalka
|
301a7e7009
|
Add additional attributes to policy UI beans
|
2021-12-16 01:09:07 +05:30 |
|
charitha
|
0284c955cf
|
Allow retrieving activities for multiple device ids
|
2021-12-15 14:48:49 +05:30 |
|
builder
|
d7ccaa559b
|
[maven-release-plugin] prepare for next development iteration
|
2021-12-04 17:57:16 +00:00 |
|
builder
|
907fb825ea
|
[maven-release-plugin] prepare release v5.0.0
|
2021-12-04 17:57:11 +00:00 |
|
Pahansith Gunathilake
|
a0856f7069
|
Add time duration filtering to activities EP
|
2021-12-01 17:03:38 +05:30 |
|
navodzoysa
|
71e6ca3bd0
|
Add API to retrieve filters for analytics
|
2021-11-12 16:56:18 +05:30 |
|
builder
|
216e47b429
|
[maven-release-plugin] prepare for next development iteration
|
2021-10-05 15:14:34 +00:00 |
|
builder
|
5c2dc99b09
|
[maven-release-plugin] prepare release v5.0.0
|
2021-10-05 15:14:29 +00:00 |
|
Saad Sahibjan
|
1434a27cde
|
Add new device status ASSIGNED
(cherry picked from commit 68405ed229)
|
2021-10-03 20:51:58 +05:30 |
|
Amalka Subasinghe
|
f9274b0d1a
|
update from master
|
2021-08-02 11:18:15 +05:30 |
|
Pahansith Gunathilake
|
dc6856fc0e
|
Merge branch 'master' into 'master'
Block Uninstall Policy Feature
See merge request entgra/carbon-device-mgt!787
|
2021-08-02 05:09:51 +00:00 |
|
Muhammad Rashad
|
556886daec
|
Block Uninstall Policy Feature
|
2021-08-02 05:09:51 +00:00 |
|
Saad Sahibjan
|
489aaabc44
|
Move slash to a constant
|
2021-07-16 00:13:30 +05:30 |
|
Amalka Subasinghe
|
94dd33ffa5
|
scope-role-permission refactoring and webapp authorization
|
2021-06-26 13:45:27 +05:30 |
|
Saad Sahibjan
|
f1892f726d
|
Update device group and request beans classes to have new variable
|
2021-06-24 20:46:44 +05:30 |
|
Amalka Subasinghe
|
d090fef2ac
|
updated from master and added oauth2 component
|
2021-06-21 21:31:44 +05:30 |
|
Amalka Subasinghe
|
293b5f5a7b
|
updated pom versions to 5.0.0-SNAPSHOT
|
2021-06-08 12:15:48 +05:30 |
|
Amalka Subasinghe
|
83b31f0d02
|
updated from master and fixed conf copying issue
|
2021-05-24 16:40:05 +05:30 |
|
charithag
|
e5fb17aceb
|
Add geo view API
|
2021-05-19 17:12:50 +05:30 |
|
Kaveesha
|
6c947962d6
|
Update item bean class to get documentation link from xml
|
2021-05-12 15:00:56 +05:30 |
|
Amalka Subasinghe
|
056987141b
|
cleaned up components/device-mgt
|
2021-05-10 12:30:38 +05:30 |
|
Amalka Subasinghe
|
c33e13b04c
|
updating to kernel 4.6.1
|
2021-05-10 09:41:45 +05:30 |
|
charithag
|
2d6f3298bf
|
Add NOTNOW status to activity result
|
2021-05-07 14:16:27 +05:30 |
|
MalshaPiumini
|
b2691996ab
|
Added device filter using serial number.
|
2021-05-05 14:37:45 +05:30 |
|
Entgra Builder
|
feacd5029d
|
[maven-release-plugin] prepare for next development iteration
|
2021-03-03 13:54:32 +00:00 |
|
Entgra Builder
|
09907233fc
|
[maven-release-plugin] prepare release v4.1.15
|
2021-03-03 13:54:27 +00:00 |
|
Entgra Builder
|
ddab435548
|
[maven-release-plugin] prepare for next development iteration
|
2021-02-23 16:02:44 +00:00 |
|
Entgra Builder
|
5b2c085a3e
|
[maven-release-plugin] prepare release v4.1.14
|
2021-02-23 16:02:39 +00:00 |
|
Entgra Builder
|
ca7ded79cb
|
[maven-release-plugin] prepare for next development iteration
|
2021-02-23 02:24:25 +00:00 |
|
Entgra Builder
|
368bb74436
|
[maven-release-plugin] prepare release v4.1.13
|
2021-02-23 02:24:20 +00:00 |
|
shamalka
|
9e3d126c08
|
Remove unnecessary variable from card bean
|
2021-02-22 10:53:50 +05:30 |
|
Entgra Builder
|
7463aa6e5a
|
[maven-release-plugin] prepare for next development iteration
|
2021-02-22 02:16:58 +00:00 |
|
Entgra Builder
|
531672de8e
|
[maven-release-plugin] prepare release v4.1.12
|
2021-02-22 02:16:53 +00:00 |
|
Shamalka Navod
|
ee5676d815
|
Improve policy UI bean classes
|
2021-02-22 01:43:35 +00:00 |
|
Dharmakeerthi Lasantha
|
6f4e8a3688
|
Merge branch 'sync_fix' into 'master'
Fix for sycning status update in Android
See merge request entgra/carbon-device-mgt!733
|
2021-02-17 11:00:37 +00:00 |
|
inoshperera
|
8effa09a8f
|
Fix for sycning status update in Android
|
2021-02-17 15:51:33 +05:30 |
|
Entgra Builder
|
62919fa787
|
[maven-release-plugin] prepare for next development iteration
|
2021-02-11 08:09:07 +00:00 |
|
Entgra Builder
|
b98d787367
|
[maven-release-plugin] prepare release v4.1.11
|
2021-02-11 08:09:02 +00:00 |
|
Charitha Goonetilleke
|
1e2afa6439
|
Merge branch 'event-modify-branch-1' into 'master'
Modify event creation task
See merge request entgra/carbon-device-mgt!725
|
2021-02-10 09:38:26 +00:00 |
|
Pahansith
|
0cbcd747d5
|
Modify event operation creation
|
2021-02-10 01:12:13 +05:30 |
|
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
|
2021-02-06 19:38:46 +05:30 |
|
tcdlpds@gmail.com
|
104bca0fb5
|
Add FULLY_MANAGED and DEDICATED_DEVICE ownership types
|
2021-01-29 19:34:58 +05:30 |
|
tcdlpds@gmail.com
|
b4d7497022
|
Modify DeviceTypeCommonService
|
2021-01-16 20:57:59 +05:30 |
|
Malsha Piumini
|
89298f933e
|
Uninstall applications via Apps Tab - (For Android devices only)
|
2021-01-06 19:07:09 +00:00 |
|
Pahansith
|
987f8edd61
|
Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master
|
2020-12-16 00:02:37 +05:30 |
|
charitha
|
55c3f93deb
|
Update license to entgra
|
2020-12-11 20:47:45 +05:30 |
|
charitha
|
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
|
2020-12-11 17:26:53 +05:30 |
|
Pahansith
|
bc85a89cf9
|
Change event task to implement ntask interface
|
2020-12-11 04:16:23 +05:30 |
|
Shamalka Navod
|
eccb39d6f4
|
Improve metadata API
|
2020-12-07 20:15:18 +00:00 |
|
Ace
|
bac6e3ba67
|
merging with upstream
|
2020-12-04 07:45:10 +05:30 |
|
charitha
|
10d114ba1e
|
Improve activity retrieval logic
|
2020-11-29 10:47:05 +05:30 |
|
Pahansith
|
a3629d5932
|
Add group data into geofence response, Format code
|
2020-11-21 12:24:55 +05:30 |
|
Pahansith
|
8c80185610
|
Add doc comments and format code
|
2020-11-21 12:22:53 +05:30 |
|
Pahansith
|
d9d0ba5d90
|
Add event delete API
|
2020-11-21 12:22:53 +05:30 |
|
Pahansith
|
75b619d5f9
|
Add event configuration operation creation tasks
|
2020-11-21 12:22:53 +05:30 |
|
Pahansith
|
efe116d87e
|
Modify geofence get API
|
2020-11-21 12:22:53 +05:30 |
|
Pahansith
|
af85ca47e0
|
Change Geo fence edit API - Attach Events
|
2020-11-21 12:22:53 +05:30 |
|
Pahansith
|
bd8cf5237d
|
Change Geo fence create API - Attach Event creation
|
2020-11-21 12:22:53 +05:30 |
|
Ace
|
7cd1baf1af
|
Adding missing license headers
|
2020-11-20 05:52:38 +05:30 |
|
Ace
|
e7b97d78c7
|
Imrpoving task implementation
|
2020-11-20 05:48:54 +05:30 |
|
Kaveesha
|
f99bbe36de
|
Improve Input class in policy ui Configuration
|
2020-11-19 17:28:39 +05:30 |
|
Farheen Boosary
|
8238f7dd22
|
Add Windows enterprise app installation support for publisher and store
|
2020-11-18 19:26:15 +00:00 |
|
Ace
|
37ef7b9047
|
Adding interface for dynamic task allocation
|
2020-11-17 09:02:45 +05:30 |
|
Ace
|
7b28665135
|
Defining interfaces and other adjustments
|
2020-11-16 09:19:21 +05:30 |
|
tcdlpds@gmail.com
|
b9c2190762
|
Fix merge conflicts
|
2020-11-15 00:32:24 +05:30 |
|
Malsha Piumini
|
f347861000
|
Add functionality to filter Operation Logs
|
2020-11-14 17:25:36 +00:00 |
|
tcdlpds@gmail.com
|
d25779774b
|
Improve MDM policy functionality
|
2020-11-12 01:28:23 +05:30 |
|
charitha
|
5d34b0671e
|
Add new Enrollment statuses for IoT devices
|
2020-11-10 08:08:48 +05:30 |
|
Kaveesha
|
a38e91499e
|
Add API for get devices history snapshots
|
2020-11-05 15:36:59 +05:30 |
|
tcdlpds@gmail.com
|
bd8fe8a69d
|
Merge branch 'master' of gitlab.com:entgra/carbon-device-mgt into corrective-policy
|
2020-10-28 18:27:05 +05:30 |
|
Ace
|
ad299e676c
|
removing un-necessary files
|
2020-10-23 17:21:23 +05:30 |
|
Inosh Perara
|
f97d9307e7
|
Merge branch 'geofence-api' into 'corrective-policy'
Add geo fence search and geo cache
See merge request entgra/carbon-device-mgt!670
|
2020-10-19 07:52:23 +00:00 |
|
Ace
|
22eba43aa9
|
including missing files
|
2020-10-15 21:05:33 +05:30 |
|
Pahansith
|
bc7e39c883
|
Add geo fence search and geo cache
|
2020-10-15 10:05:37 +05:30 |
|
shamalka
|
90ed562647
|
Improve device location history API
|
2020-10-13 16:11:46 +05:30 |
|
tcdlpds@gmail.com
|
ce81eac413
|
Improve endpoint-mgt functionalities
|
2020-10-08 18:49:12 +05:30 |
|