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 |
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 |
osh
|
053a57c4f5
|
Add getting billing cost by domain change
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
|
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 |
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 |
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 |
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
|
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
|
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 |
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
|
f22fc7e460
|
Fix test cases kernel-4.6.x
|
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
|
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 |
Amalka Subasinghe
|
fc9a9ca210
|
fixed permission issues
|
3 years ago |
Amalka Subasinghe
|
f9a9cff0b9
|
updated user roles
|
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 |
Amalka Subasinghe
|
51dd72ff79
|
commented braking changes related to analytics
|
3 years ago |
Amalka Subasinghe
|
d090fef2ac
|
updated from master and added oauth2 component
|
3 years ago |
Amalka Subasinghe
|
293b5f5a7b
|
updated pom versions to 5.0.0-SNAPSHOT
|
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 |
Amalka Subasinghe
|
056987141b
|
cleaned up components/device-mgt
|
4 years ago |
Amalka Subasinghe
|
c33e13b04c
|
updating to kernel 4.6.1
|
4 years ago |
MalshaPiumini
|
6f325862ec
|
Formatting the SQL query.
|
4 years ago |
MalshaPiumini
|
b2691996ab
|
Added device filter using serial number.
|
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 |
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 |
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 |
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 |
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 |
tcdlpds@gmail.com
|
51fface401
|
Append tenant domain when getting default access token
|
4 years ago |
Malsha Piumini
|
89298f933e
|
Uninstall applications via Apps Tab - (For Android devices only)
|
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 |
Shamalka Navod
|
eccb39d6f4
|
Improve metadata API
|
4 years ago |
Ace
|
4df57ede61
|
incoorporating review comments
|
4 years ago |
Ace
|
bac6e3ba67
|
merging with upstream
|
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
|
d75f48166e
|
Provide response based on headers
|
4 years ago |
Charitha Goonetilleke
|
10d114ba1e
|
Improve activity retrieval logic
|
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
|
f073ee9276
|
Add H2 DAO for event configuration
|
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 |
tcdlpds@gmail.com
|
b9c2190762
|
Fix merge conflicts
|
4 years ago |
Malsha Piumini
|
f347861000
|
Add functionality to filter Operation Logs
|
4 years ago |
tcdlpds@gmail.com
|
d25779774b
|
Improve MDM policy functionality
|
4 years ago |
Dharmakeerthi Lasantha
|
94bdff30ed
|
Merge branch 'geofence-api' into 'corrective-policy'
Fix issue in Geo fence get by fence name
See merge request entgra/carbon-device-mgt!677
|
4 years ago |
Kaveesha
|
a38e91499e
|
Add API for get devices history snapshots
|
4 years ago |
Pahansith
|
84608f2f58
|
Fix issue in Geo fence get by fence name
|
4 years ago |
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
|
4 years ago |
Pahansith
|
bc7e39c883
|
Add geo fence search and geo cache
|
4 years ago |
shamalka
|
90ed562647
|
Improve device location history API
|
4 years ago |