Commit Graph

6818 Commits

Author SHA1 Message Date
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
Amalka Subasinghe
bfbbe3c733 added androoid feature 2021-06-09 15:25:12 +05:30
Amalka Subasinghe
b52210a87c updated pom versions to 6.0.0-SNAPSHOT 2021-06-08 12:20:53 +05:30
Amalka Subasinghe
f623450571 fixed component activation issue 2021-06-07 18:40:31 +05:30
Amalka Subasinghe
ac26f7b6b8 updated to work with carbon kernel 4.6.2 2021-06-07 15:42:17 +05:30
Charitha Goonetilleke
8e7d6eeb67 Merge branch 'geo-view' into 'master'
Add geo view API

See merge request entgra/carbon-device-mgt-plugins!181
2021-06-06 08:17:29 +00:00
charithag
328786c5f2 Geo view test case fixes 2021-05-28 16:21:25 +05:30
Saad Sahibjan
72aca888bc Merge branch 'dummy-master' into 'master'
Fix parameters of getAppSubscribedDevices.

See merge request entgra/carbon-device-mgt-plugins!180
2021-05-07 12:26:35 +00:00
MalshaPiumini
3b120f3922 Fix parameters of getAppSubscribedDevices. 2021-05-07 17:42:28 +05:30
Dharmakeerthi Lasantha
c077b4a452 Merge branch 'master' into 'master'
Upgrade dependency versions

See merge request entgra/carbon-device-mgt-plugins!179
2021-03-17 06:06:18 +00:00
tcdlpds@gmail.com
4a1c8c5731 Upgrade dependency versions 2021-03-17 11:34:17 +05:30
Entgra Builder
55b4861e01 [maven-release-plugin] prepare for next development iteration 2021-03-03 14:33:24 +00:00
Entgra Builder
d44da9f1e5 [maven-release-plugin] prepare release v5.0.15 2021-03-03 14:33:19 +00:00
Dharmakeerthi Lasantha
aee75d56fe Merge branch 'master' into 'master'
Prepare for the release

See merge request entgra/carbon-device-mgt-plugins!178
2021-03-03 14:30:04 +00:00
tcdlpds@gmail.com
ed973fd25b Upgrade device-mgt core dependency version 2021-03-03 19:48:30 +05:30
tcdlpds@gmail.com
aea02572e7 Add device-mgt provider service methods 2021-03-03 19:39:34 +05:30
Entgra Builder
a9ad60e767 [maven-release-plugin] prepare for next development iteration 2021-02-23 23:07:18 +00:00
Entgra Builder
124305c558 [maven-release-plugin] prepare release v5.0.14 2021-02-23 23:07:13 +00:00
Dharmakeerthi Lasantha
087fdb6428 Merge branch 'master' into 'master'
Upgrade device-mgt core version

See merge request entgra/carbon-device-mgt-plugins!177
2021-02-23 23:04:21 +00:00
tcdlpds@gmail.com
cefc1540ea Upgrade device-mgt core version 2021-02-23 21:09:22 +05:30
Entgra Builder
a09bacd08c [maven-release-plugin] prepare for next development iteration 2021-02-23 03:19:22 +00:00
Entgra Builder
b949f2d9fa [maven-release-plugin] prepare release v5.0.13 2021-02-23 03:19:17 +00:00
Dharmakeerthi Lasantha
58a926bd87 Merge branch 'master' into 'master'
Upgrade device-mgt core version

See merge request entgra/carbon-device-mgt-plugins!176
2021-02-23 03:16:13 +00:00
tcdlpds@gmail.com
f511bae255 Upgrade device-mgt core version 2021-02-23 08:44:17 +05:30
Entgra Builder
b7ce375e76 [maven-release-plugin] prepare for next development iteration 2021-02-22 03:29:25 +00:00
Entgra Builder
f08139a6b3 [maven-release-plugin] prepare release v5.0.12 2021-02-22 03:29:20 +00:00
Dharmakeerthi Lasantha
bb57084ab4 Merge branch 'master' into 'master'
Fix build failure

See merge request entgra/carbon-device-mgt-plugins!175
2021-02-22 03:26:16 +00:00
tcdlpds@gmail.com
001ff2cc58 Fix build failure 2021-02-22 08:53:07 +05:30
Dharmakeerthi Lasantha
64734f8aff Merge branch 'master' into 'master'
Upgrade device-mgt-core version

See merge request entgra/carbon-device-mgt-plugins!174
2021-02-22 03:01:41 +00:00
tcdlpds@gmail.com
42d38b6cdb Upgrade device-mgt-core version 2021-02-22 07:22:54 +05:30
Entgra Builder
32d9cbde4d [maven-release-plugin] prepare for next development iteration 2021-02-11 08:55:59 +00:00
Entgra Builder
f267bbdf1b [maven-release-plugin] prepare release v5.0.11 2021-02-11 08:55:54 +00:00
Dharmakeerthi Lasantha
c18cf2529b Merge branch 'master' into 'master'
Upgrade device-mgt core version

See merge request entgra/carbon-device-mgt-plugins!173
2021-02-11 08:52:31 +00:00
tcdlpds@gmail.com
bfad1d8ebc Upgrade device-mgt core version 2021-02-11 14:18:44 +05:30
Dharmakeerthi Lasantha
21b2e599a8 Merge branch 'master' into 'master'
Add device mgt service methods

See merge request entgra/carbon-device-mgt-plugins!172
2021-02-10 05:46:59 +00:00
tcdlpds@gmail.com
977dbfe645 Add device mgt service methods 2021-02-10 00:34:58 +05:30
Dharmakeerthi Lasantha
9f5a58ea34 Merge branch 'master' into 'master'
Fix build failure

See merge request entgra/carbon-device-mgt-plugins!171
2020-12-15 02:30:00 +00:00
tcdlpds@gmail.com
4a0089df75 Fix build failure 2020-12-15 07:58:06 +05:30
Inosh Perara
61f788caef Merge branch 'master' into 'master'
Accommodating for interface changes in core.

See merge request entgra/carbon-device-mgt-plugins!170
2020-12-07 09:24:29 +00:00