Commit Graph

9083 Commits

Author SHA1 Message Date
Inosh Perara
d8f6e6765a Merge branch 'master' into 'tenant-improve'
Add OTP managing functionality

See merge request entgra/carbon-device-mgt!602
2020-07-26 05:33:33 +00:00
tcdlpds@gmail.com
709a7ab592 Add OTP managing functionality 2020-07-25 07:56:38 +05:30
inoshperera
a7af883962 Add tenant create API 2020-07-23 20:45:30 +05:30
Inosh Perara
0fec9f1db3 Merge branch 'tenant-improve' into 'tenant-improve'
Add one time token bean

See merge request entgra/carbon-device-mgt!600
2020-07-23 15:14:28 +00:00
Dharmakeerthi Lasantha
21010b7996 Merge branch 'migration' into 'master'
Migrate APPM Store UI from antd v3 to v4

Closes product-iots#579

See merge request entgra/carbon-device-mgt!585
2020-07-22 17:44:17 +00:00
inoshperera
3208870840 Add one time token bean 2020-07-22 21:27:56 +05:30
Dharmakeerthi Lasantha
951d0dd743 Merge branch 'publisher-icons' into 'master'
Change Legacy Icons to antd's v4 icons in APPM publisher

Closes product-iots#590

See merge request entgra/carbon-device-mgt!587
2020-07-22 02:10:03 +00:00
Ace
4c59a73051 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-07-21 08:23:48 +05:30
Ace
c1c736b607 Adding fix for policy application upon adding devices to group 2020-07-21 08:23:30 +05:30
Dharmakeerthi Lasantha
e9ade00e70 Merge branch 'master' into 'master'
Add scope for Send notification

See merge request entgra/carbon-device-mgt!598
2020-07-18 19:30:40 +00:00
Kaveesha
854714e827 Add scope for Send notification 2020-07-19 00:06:16 +05:30
Ace
4b58b46d8b Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-07-18 15:53:07 +05:30
Ace
3ea16eaf7d Adding capability for policies to be added/removed automatically when devices are added/removed from a group 2020-07-18 15:52:41 +05:30
Dharmakeerthi Lasantha
0c2a7fe0dd Merge branch 'new-improvements' into 'master'
Fix issues of getting default token

See merge request entgra/carbon-device-mgt!597
2020-07-18 00:51:15 +00:00
shamalka
2ec29701a1 Fix get default token issues 2020-07-17 23:52:25 +05:30
Dharmakeerthi Lasantha
2adda8ba6d Merge branch 'master' into 'master'
Construct API endpoint to get default token

See merge request entgra/carbon-device-mgt!596
2020-07-17 14:03:45 +00:00
tcdlpds@gmail.com
45e753f68f Construct API endpoint to get default token 2020-07-17 19:31:38 +05:30
Inosh Perara
571f8f3ecb Merge branch 'master' into 'master'
Handle change of device name

See merge request entgra/carbon-device-mgt!593
2020-07-17 12:12:55 +00:00
Dharmakeerthi Lasantha
3a0787ee7b Merge branch 'master' into 'master'
Improve proxy handler

See merge request entgra/carbon-device-mgt!595
2020-07-17 11:44:29 +00:00
tcdlpds@gmail.com
44ba40fe7d Improve proxy handler 2020-07-17 17:13:12 +05:30
Dharmakeerthi Lasantha
35782a79fc Merge branch 'support-4.1.8' into 'master'
Add API to get default token by using client ID and secret

See merge request entgra/carbon-device-mgt!592
2020-07-17 08:35:02 +00:00
Dharmakeerthi Lasantha
8e66dd1df7 Merge branch 'master' into 'master'
Add Default Token Handling Servlet

See merge request entgra/carbon-device-mgt!594
2020-07-17 08:33:10 +00:00
tcdlpds@gmail.com
1f94415f7f Add API to get default token by using client ID and secret 2020-07-17 12:06:33 +05:30
inoshperera
43a6c710ad Handle change of device name 2020-07-17 08:11:44 +05:30
tcdlpds@gmail.com
e0eb4316f4 Add Default Token Handling Servlet 2020-07-17 06:25:54 +05:30
Dharmakeerthi Lasantha
e9a2018972 Merge branch 'master' into 'master'
Upgrade the npm version of maven build

Closes product-iots#567

See merge request entgra/carbon-device-mgt!577
2020-07-16 15:09:23 +00:00
Saad Sahibjan
42ec923700 Merge branch 'master' into 'master'
Create default roles and assign permissions

See merge request entgra/carbon-device-mgt!590
2020-07-14 06:18:38 +00:00
Saad Sahibjan
4c6f630afd Merge branch 'application-mgt-new' into 'master'
Update APPM life-cycle permissions

See merge request entgra/carbon-device-mgt!591
2020-07-14 06:18:33 +00:00
Dharmakeerthi Lasantha
b8e17857e0 Merge branch 'master' into 'master'
Fix incorrect instantiations of Provider Services

See merge request entgra/carbon-device-mgt!584
2020-07-14 01:54:07 +00:00
Charitha Goonetilleke
211c1e326a Fix incorrect instantiations of Provider Services 2020-07-14 01:54:06 +00:00
tcdlpds@gmail.com
adc2f15893 Update APPM lifecycle permissions 2020-07-12 08:04:49 +05:30
tcdlpds@gmail.com
3d38bd5570 Create default roles and assign permissions
When adding new tenant and if the server has configured to add default roles and assign permissions, this PR facilitates to achieve it.
2020-07-11 21:20:21 +05:30
Dharmakeerthi Lasantha
338413bf1b Merge branch 'master' into 'master'
Update Item bean

Closes product-iots#595

See merge request entgra/carbon-device-mgt!589
2020-07-07 14:52:46 +00:00
Kaveesha
b3278d010f Update Item bean 2020-07-07 19:49:35 +05:30
anjula-sack
111e32e97d Change Legacy Icons to antd's v3 icons in APPM publisher 2020-07-05 13:25:08 +05:30
anjula-sack
4f8d29456b Migrate APPM Publisher UI from antd v3 to v4 2020-06-28 15:42:01 +05:30
anjula-sack
080aeb39e0 Migrate APPM Store UI from antd v3 to v4 2020-06-26 21:19:15 +05:30
Dharmakeerthi Lasantha
b3f395b284 Merge branch 'master' into 'master'
Retrieve enrollment config from general config and support serilnumber based config with user based

See merge request entgra/carbon-device-mgt!578
2020-06-25 04:12:13 +00:00
charitha
eeacb455d5 Fix incorrect instantiations of Provider Services 2020-06-24 21:38:35 +05:30
charitha
30fb93d511 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-06-24 14:58:47 +05:30
Dharmakeerthi Lasantha
4ff9a9222c Merge branch 'new-improvements' into 'master'
Fix role delete

See merge request entgra/carbon-device-mgt!582
2020-06-23 14:54:13 +00:00
charitha
2fef389f27 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2020-06-23 10:43:27 +05:30
Entgra Builder
a9a39a5055 [maven-release-plugin] prepare for next development iteration 2020-06-22 10:06:05 +00:00
shamalka
add8570f65 Fix role delete 2020-06-22 15:36:05 +05:30
Entgra Builder
f34bddff2f [maven-release-plugin] prepare release v4.1.10 2020-06-22 10:05:57 +00:00
Dharmakeerthi Lasantha
0f9fee8437 Merge branch 'copyright' into 'master'
Change the copyright year in APPM Publisher and Store

See merge request entgra/carbon-device-mgt!581
2020-06-22 09:15:19 +00:00
Inosh Perara
f47f6bfde7 Merge branch 'master' into 'master'
Persit multiple locations in bulk

See merge request entgra/carbon-device-mgt!580
2020-06-22 09:09:13 +00:00
anjula-sack
2dbbf5bc79 Change the copyright year in APPM Publisher and Store 2020-06-22 11:48:19 +05:30
inoshperera
9ea055853a Persit multiple locations in bulk 2020-06-22 09:17:59 +05:30
anjula-sack
e85d3af9c0 Upgrade the npm version of mvn build 2020-06-19 19:08:35 +05:30