Merge branch 'develop' into 'feature/mediaproxy-cache-pagination-and-search'
# Conflicts: # CHANGELOG.md
No related branches found
No related tags found
Showing
- CHANGELOG.md 3 additions, 2 deletionsCHANGELOG.md
- src/store/modules/normalizers.js 25 additions, 26 deletionssrc/store/modules/normalizers.js
- src/views/settings/components/Authentication.vue 11 additions, 1 deletionsrc/views/settings/components/Authentication.vue
- src/views/settings/components/Frontend.vue 10 additions, 0 deletionssrc/views/settings/components/Frontend.vue
- src/views/settings/components/Inputs.vue 7 additions, 1 deletionsrc/views/settings/components/Inputs.vue
- src/views/settings/components/Instance.vue 21 additions, 1 deletionsrc/views/settings/components/Instance.vue
- src/views/settings/components/JobQueue.vue 30 additions, 0 deletionssrc/views/settings/components/JobQueue.vue
- src/views/settings/components/MRF.vue 0 additions, 3 deletionssrc/views/settings/components/MRF.vue
- src/views/settings/components/Other.vue 20 additions, 0 deletionssrc/views/settings/components/Other.vue
- src/views/settings/components/inputComponents/SenderInput.vue 98 additions, 0 deletions...views/settings/components/inputComponents/SenderInput.vue
- src/views/settings/components/inputComponents/SpecificMultipleSelect.vue 5 additions, 3 deletions...ngs/components/inputComponents/SpecificMultipleSelect.vue
- src/views/settings/components/inputComponents/index.js 1 addition, 0 deletionssrc/views/settings/components/inputComponents/index.js
- src/views/settings/components/tabs.js 9 additions, 9 deletionssrc/views/settings/components/tabs.js
- src/views/settings/styles/main.scss 13 additions, 0 deletionssrc/views/settings/styles/main.scss
- test/modules/normalizers/parseTuples.test.js 39 additions, 25 deletionstest/modules/normalizers/parseTuples.test.js
- test/modules/normalizers/wrapUpdatedSettings.test.js 2 additions, 2 deletionstest/modules/normalizers/wrapUpdatedSettings.test.js
Loading
Please register or sign in to comment