Commit Graph

6756 Commits

Author SHA1 Message Date
Shamalka Navod
00838aa2e7 Merge branch 'traccar' into 'master'
Add traccar changes

See merge request entgra/carbon-device-mgt-plugins!194
2022-09-05 09:49:54 +00:00
shamalka
aff3d0c1ba Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt-plugins into traccar 2022-08-23 16:11:35 +05:30
Pahansith Gunathilake
7d268d4179 Bump versions 2022-08-03 04:13:30 +00:00
builder
7ece172b93 [maven-release-plugin] prepare for next development iteration 2022-07-18 23:47:10 +05:30
builder
cd30d92c5e [maven-release-plugin] prepare release v6.0.4 2022-07-18 23:47:05 +05:30
Pahansith Gunathilake
fb45133bb0 Update carbon devicemgt version 2022-07-18 18:13:36 +00:00
builder
afc6026c91 [maven-release-plugin] prepare for next development iteration 2022-06-28 12:13:00 +05:30
builder
f1563df28b [maven-release-plugin] prepare release v6.0.3 2022-06-28 12:12:55 +05:30
Rushdi
a28952dc80 fix merge conflicts for traccar 2022-05-30 17:33:38 +05:30
Pahansith Gunathilake
ff615bf81d Bump carbon device mgt version 2022-05-12 14:50:32 +00:00
Pahansith Gunathilake
2ae4576f31 Bump carbon devicemgt version 2022-05-12 14:47:53 +00:00
builder
76251948e6 [maven-release-plugin] prepare for next development iteration 2022-05-10 11:13:41 +05:30
builder
a6874c6ee1 [maven-release-plugin] prepare release v6.0.3 2022-05-10 11:13:37 +05:30
Pahansith Gunathilake
da0e87f552 Merge branch 'fix-test' into 'master'
Fix test failure

See merge request entgra/carbon-device-mgt-plugins!191
2022-05-10 05:38:25 +00:00
Pahansith Gunathilake
ece8e06994 Fix test failure 2022-05-10 11:05:02 +05:30
Pahansith Gunathilake
f150e1ceaa Update carbon device-mgt version 2022-05-10 04:27:34 +00:00
builder
dfb15eee54 [maven-release-plugin] prepare for next development iteration 2022-04-26 06:26:12 +00:00
builder
dbcbe131df [maven-release-plugin] prepare release v6.0.2 2022-04-26 06:26:07 +00:00
Pahansith Gunathilake
c462e5f4c3 Update pom.xml 2022-04-26 06:22:09 +00:00
Pahansith Gunathilake
b9d929f0a1 Bump dependency versions 2022-03-28 03:29:57 +00:00
Pahansith Gunathilake
687242a543 Bump dependency versions 2022-03-19 20:35:52 +00:00
builder
50662f6741 [maven-release-plugin] prepare for next development iteration 2022-03-18 04:28:03 +00:00
builder
2e5f5d86ed [maven-release-plugin] prepare release v6.0.1 2022-03-18 04:27:59 +00:00
Pahansith Gunathilake
f01d86029a Merge branch 'fix-build-failure' into 'master'
Fix test failure

See merge request entgra/carbon-device-mgt-plugins!190
2022-03-18 04:25:01 +00:00
Pahansith Gunathilake
0a374d3b25 Update pom.xml 2022-03-18 04:14:24 +00:00
Pahansith Gunathilake
5dafcf9887 Fix test failure 2022-03-10 13:52:22 +05:30
Pahansith Gunathilake
f0e75df784 Bump dependency versions 2022-03-05 15:13:39 +00:00
Pahansith Gunathilake
5e4299ad7e Update pom.xml 2022-01-25 05:46:05 +00:00
Pahansith Gunathilake
ee7bb6885e Bump carbon devicemgt dependency version 2022-01-25 05:27:47 +00:00
Pahansith Gunathilake
0247c0bbad Revert "Upgrade carbon device mgt dependency version"
This reverts commit 7b3cf61e26
2021-12-04 18:13:47 +00:00
Pahansith Gunathilake
7b3cf61e26 Upgrade carbon device mgt dependency version 2021-12-04 18:09:16 +00:00
Pahansith Gunathilake
559364e64a Merge branch 'fix/gitignore' into 'master'
Add .factorypath file to gitignore

See merge request entgra/carbon-device-mgt-plugins!189
2021-11-22 11:15:24 +00:00
Mohamed Rashd
a74e7ad2d6 Add .factorypath file to gitignore 2021-11-12 16:08:06 +05:30
Pahansith Gunathilake
f5d5861411 Bump carbon-devicemgt version 2021-10-07 12:05:40 +00:00
builder
d2b6585655 [maven-release-plugin] prepare for next development iteration 2021-10-05 15:44:19 +00:00
builder
bf48b1520b [maven-release-plugin] prepare release v6.0.0 2021-10-05 15:44:15 +00:00
Pahansith Gunathilake
9f98a875c4 Upgrade dependency version 2021-10-05 15:38:11 +00:00
Pahansith Gunathilake
7f2986a545 Update pom.xml to fix release issues 2021-10-05 08:52:34 +00:00
Inosh Perara
908f961f3f Merge branch 'kernel-4.6.x' into 'master'
Merge kernel 4.6.x with master

See merge request entgra/carbon-device-mgt-plugins!188
2021-10-04 10:04:16 +00:00
Pahansith Gunathilake
cddb92f5ce Merge branch 'kernel-4.6.x' into 'kernel-4.6.x'
Fix test failures

See merge request entgra/carbon-device-mgt-plugins!187
2021-10-04 04:38:28 +00:00
Pahansith
512b46ccdd Fix test failures 2021-10-03 21:27:30 +05:30
Pahansith Gunathilake
939f6f20b0 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
Merge branch 'master' into kernel-4.6.2

See merge request entgra/carbon-device-mgt-plugins!186
2021-08-03 06:58:02 +00:00
Amalka Subasinghe
1328954e1f Merge branch 'master' into kernel-4.6.2 2021-07-13 09:32:29 +05:30
Charitha Goonetilleke
bcd96fc167 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
scope-role-permission refactoring and webapp authorization

See merge request entgra/carbon-device-mgt-plugins!184
2021-06-28 13:58:12 +00:00
Amalka Subasinghe
43cf6b8e67 adding user roles to apis 2021-06-28 14:07:18 +05:30
Amalka Subasinghe
86737eaa1b added roles to the scopes 2021-06-26 13:55:27 +05:30
Charitha Goonetilleke
21b9a73b85 Merge branch 'master' into 'kernel-4.6.x'
Update .gitlab-ci.yml

See merge request entgra/carbon-device-mgt-plugins!183
2021-06-22 09:54:13 +00:00
Charitha Goonetilleke
81cdc8eee3 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x'
Updated to work with carbon kernel 4.6.2

See merge request entgra/carbon-device-mgt-plugins!182
2021-06-22 09:52:50 +00:00
Charitha Goonetilleke
0cc612073d Update .gitlab-ci.yml 2021-06-22 09:52:24 +00:00
Amalka Subasinghe
36d897072e Merge branch 'master' into kernel-4.6.2 2021-06-21 20:02:01 +05:30