Commit Graph

9514 Commits

Author SHA1 Message Date
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
Ruwan Yatawara
2942091150 Merge branch 'master' into 'master'
Fixing null pointer during APIM scope validation

See merge request entgra/carbon-device-mgt!579
2020-06-19 13:21:51 +00:00
Ace
f8c00375d7 Fixing null pointer during APIM scope validation 2020-06-19 18:15:37 +05:30
Saad Sahibjan
b66e804091 Retrieve enrollment config from general config and support serilnumber based config with user based 2020-06-19 15:22:32 +05:30
charitha
485179e16f Add IoT-Node-IP response header 2020-06-18 11:06:59 +05:30
charitha
48e2cb69a0 Add IoT-Node-IP response header 2020-06-18 11:05:46 +05:30
Charitha Goonetilleke
e20b0459a2 Merge branch 'master' into 'master'
Execute device detail retriever and monitoring task for all tenant

See merge request entgra/carbon-device-mgt!575
2020-06-13 05:32:17 +00:00
Saad Sahibjan
07e56d68f5 Set tenant through tenant domain auto resolve method 2020-06-13 10:27:23 +05:30
Dharmakeerthi Lasantha
aee7450d5e Merge branch 'improvements' into 'master'
Add file types to upload bean class

See merge request entgra/carbon-device-mgt!576
2020-06-12 15:23:34 +00:00
Shamalka Navod
d054c2a383 Add file types to upload bean class 2020-06-12 15:23:34 +00:00
Saad Sahibjan
da5a1caf2b Execute device detail retreiver and monitoring task for all tenant 2020-06-12 20:43:17 +05:30
Dharmakeerthi Lasantha
f97e3d0ee7 Merge branch 'master' into 'master'
Update Select bean

See merge request entgra/carbon-device-mgt!574
2020-06-12 12:42:21 +00:00
Kaveesha
90c45dc387 Update Select bean 2020-06-12 17:26:29 +05:30
Dharmakeerthi Lasantha
d89277a8e7 Merge branch 'improvements' into 'master'
Improve policy bean classes

See merge request entgra/carbon-device-mgt!573
2020-06-12 11:42:54 +00:00
Shamalka Navod
eb107f5051 Improve policy bean classes 2020-06-12 11:42:54 +00:00
Charitha Goonetilleke
38ed2e040e Merge branch 'restructure' into 'master'
Update webapp directory location

See merge request entgra/carbon-device-mgt!571
2020-06-12 11:26:47 +00:00
Dharmakeerthi Lasantha
c489c39107 Merge branch 'master' into 'master'
Update Item bean by adding Nullable value

See merge request entgra/carbon-device-mgt!572
2020-06-12 07:07:48 +00:00
Kaveesha
4fde345a23 Update Item bean by adding Nullable value 2020-06-12 11:13:55 +05:30
charitha
607291ac91 Update webapp directory location 2020-06-11 16:20:23 +05:30
Dharmakeerthi Lasantha
93acdf8bbe Merge branch 'improvements' into 'master'
Add InputList bean

See merge request entgra/carbon-device-mgt!570
2020-06-10 20:34:16 +00:00