Commit Graph

8035 Commits

Author SHA1 Message Date
Milan Perera
439ce4f1ec Fix apim handler test failures 2019-08-15 22:23:46 +02:00
Dharmakeerthi Lasantha
3d9813f97e Merge branch 'mssl-fix' into 'master'
Enable basic authentication in cert-mgt webapp

Closes product-iots#128

See merge request entgra/carbon-device-mgt!203
2019-08-15 18:53:11 +00:00
Milan Perera
b7757a65ce Enable basic authentication in cert-mgt webapp 2019-08-15 20:49:14 +02:00
Charitha Goonetilleke
9dfe4abaac Merge branch 'mssl-fix' into 'master'
Remove additional HTTP call from mssl handler

Closes product-iots#128

See merge request entgra/carbon-device-mgt!202
2019-08-15 15:14:23 +00:00
Milan Perera
1cf86ee958 Remove additional HTTP call from mssl handler
This fixes the entgra/product-iots#128
2019-08-15 17:08:45 +02:00
Charitha Goonetilleke
a1330daf24 Merge branch 'master' into 'master'
Fix CN extraction issue

See merge request entgra/carbon-device-mgt!199
2019-08-15 12:56:53 +00:00
Milan Perera
7cddb36fa2 Merge branch 'move-delete-device-api' into 'master'
Move permanently delete device API to device-mgt admin interface

See merge request entgra/carbon-device-mgt!201
2019-08-15 12:31:17 +00:00
Saad Sahibjan
1c825af79d Move delete device permanently to device-mgt admin API 2019-08-15 17:08:21 +05:30
Ruwan Yatawara
f9b9b084ae Merge branch 'master' into 'master'
Fixed issues with searching devices in a group

See merge request entgra/carbon-device-mgt!200
2019-08-15 10:27:39 +00:00
Ace
b260e5c086 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2019-08-15 15:15:22 +05:30
Ace
18218a351c Fixing issues with searching devices with groupID as a param 2019-08-15 15:12:42 +05:30
charitha
0d0daa5b8b Fix CN extraction issue 2019-08-15 14:09:37 +05:30
lasanthaDLPDS
a33a8081a7 Improve APPM error messages. 2019-08-15 13:50:25 +05:30
charitha
bb82eb7236 Fix issue in IoT device type loading 2019-08-13 00:08:58 +05:30
charitha
f434fafbe1 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-master 2019-08-12 13:12:27 +05:30
lasanthaDLPDS
4e23dbf5af Merge with upstream master 2019-08-08 16:35:52 +05:30
Saad Sahibjan
b48fb6a1b6 Merge branch 'master' into 'master'
Fix formatting issues

See merge request entgra/carbon-device-mgt!195
2019-08-05 13:15:54 +00:00
lasanthaDLPDS
9d9f420c83 Fix formatting issues 2019-08-05 18:39:22 +05:30
Dharmakeerthi Lasantha
7316553076 Merge branch 'application-mgt-new' into 'application-mgt-new'
Add copywrite notice to APPM UI

See merge request entgra/carbon-device-mgt!194
2019-08-05 01:21:16 +00:00
Jayasanka
3761d58cda Fix redirecting issue in APPM Store 2019-08-05 00:15:32 +05:30
Jayasanka
a3b796d749 Add copywrite notice to APPM UI 2019-08-05 00:13:54 +05:30
Dharmakeerthi Lasantha
96ad057c97 Merge branch 'application-mgt-new' into 'application-mgt-new'
Modify edit release component to update the release without refreshing

See merge request entgra/carbon-device-mgt!193
2019-08-03 18:12:52 +00:00
Jayasanka
e07197743a Modify edit release component to update the release without refreshing 2019-08-03 20:23:05 +05:30
lasanthaDLPDS
80081186fe Fix the unnecessary resource file creating. 2019-08-01 18:14:50 +05:30
Saad Sahibjan
70310c55fb Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix device loading issue in add new app in APPM UI

See merge request entgra/carbon-device-mgt!192
2019-07-31 08:27:53 +00:00
Jayasanka
2d2ffde0a4 Fix device loading issue in add new app in APPM UI 2019-07-31 13:55:22 +05:30
Saad Sahibjan
a3e372556e Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix installation error in APPM ui

See merge request entgra/carbon-device-mgt!191
2019-07-31 07:48:11 +00:00
Jayasanka
c8086f8b5c Fix installation error in APPM ui 2019-07-31 13:14:44 +05:30
Dharmakeerthi Lasantha
690c619e64 Merge branch 'application-mgt-new' into 'application-mgt-new'
Change APPM update responses

See merge request entgra/carbon-device-mgt!190
2019-07-31 07:34:10 +00:00
lasanthaDLPDS
af75a20bdf Change APPM update responses 2019-07-31 13:01:51 +05:30
Jayasanka
2558bdc172 Merge remote-tracking branch 'upstream/application-mgt-new' into application-mgt-new
# Conflicts:
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppUploadForm.js
2019-07-31 11:46:15 +05:30
Jayasanka
0f4eaa575c Add ui improvements to APPM
- Add breadcrumbs
- Fix tag spacing
- Add price type selection in New Release form
- Change edit button disable when release isn't in an editable state
- Add autofill functionality to edit release
- Add dynamic device types in add new app form
2019-07-31 11:37:12 +05:30
Jayasanka
02e3bca9ed Fix retired app loading issue in APPM UI 2019-07-31 11:37:12 +05:30
Jayasanka
c96a381cd7 Fix device loading issue in APPM store 2019-07-31 11:37:11 +05:30
lasanthaDLPDS
ff1fe51b01 Fix publisher logging issue 2019-07-31 11:37:11 +05:30
Jayasanka
9289bbcbe9 Get configuration with React Context in APPM publisher 2019-07-31 11:37:11 +05:30
Jayasanka
da5556064d Complete step form in add new app 2019-07-31 11:37:11 +05:30
Jayasanka
673a87b970 Create step form to add new app 2019-07-31 11:37:11 +05:30
Dharmakeerthi Lasantha
d757f7dbb7 Merge branch 'application-mgt-new' into 'application-mgt-new'
Update artifact download URL

See merge request entgra/carbon-device-mgt!189
2019-07-29 12:54:09 +00:00
Saad Sahibjan
6bf646a896 Update artifact download URL 2019-07-29 18:19:32 +05:30
Dharmakeerthi Lasantha
b3eaa6ae28 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix retired app loading issue in APPM UI

See merge request entgra/carbon-device-mgt!188
2019-07-29 11:39:45 +00:00
Jayasanka
bfe154e7c9 Fix retired app loading issue in APPM UI 2019-07-29 17:02:26 +05:30
Saad Sahibjan
1dc99b70c7 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix device loading issue in APPM store

See merge request entgra/carbon-device-mgt!187
2019-07-29 08:14:54 +00:00
Jayasanka
ab581e5147 Fix device loading issue in APPM store 2019-07-29 13:44:10 +05:30
Dharmakeerthi Lasantha
052859bfb4 Merge branch 'application-mgt-new' into 'application-mgt-new'
Fix publisher logging issue

See merge request entgra/carbon-device-mgt!186
2019-07-26 15:28:05 +00:00
lasanthaDLPDS
5847be9a30 Fix publisher logging issue 2019-07-26 20:56:00 +05:30
Dharmakeerthi Lasantha
7951267a69 Merge branch 'application-mgt-new' into 'application-mgt-new'
Get configuration with React Context in APPM store

See merge request entgra/carbon-device-mgt!185
2019-07-26 12:30:30 +00:00
Jayasanka
c49b8cc4f6 Get configuration with React Context in APPM publisher 2019-07-26 17:54:56 +05:30
Jayasanka
2dcbf92124 Complete step form in add new app 2019-07-26 16:09:31 +05:30
Jayasanka
69cad8c495 Create step form to add new app 2019-07-26 13:53:53 +05:30