groove/audiobookshelf
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf.git synced 2026-07-26 19:21:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix: correct merge errors

Browse source
This commit is contained in:
benonymity 2022-08-20 12:01:00 -04:00
parent 92c393d2b6
commit f64c74519b
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/pages/config/index.vue
View file

@ -309,7 +309,7 @@ export default {
coverAspectRatio: 'Prefer to use square covers over standard 1.6:1 book covers', coverAspectRatio: 'Prefer to use square covers over standard 1.6:1 book covers',
enableEReader: 'E-reader is still a work in progress, but use this setting to open it up to all your users (or use the "Experimental Features" toggle just for use by you)', enableEReader: 'E-reader is still a work in progress, but use this setting to open it up to all your users (or use the "Experimental Features" toggle just for use by you)',
scannerPreferOverdriveMediaMarker: 'MP3 files from Overdrive come with chapter timings embedded as custom metadata. Enabling this will use these tags for chapter timings automatically', scannerPreferOverdriveMediaMarker: 'MP3 files from Overdrive come with chapter timings embedded as custom metadata. Enabling this will use these tags for chapter timings automatically',
shareStats: 'Allow users to share latest listening activity with other users on an opt-in basis' shareStats: 'Allow users to share latest listening activity with other users on an opt-in basis',
scannerUseSingleThreadedProber: 'The old scanner used a single thread. Leaving it in to use as a comparison for now.', scannerUseSingleThreadedProber: 'The old scanner used a single thread. Leaving it in to use as a comparison for now.',
scannerMaxThreads: 'Number of concurrent media files to scan at a time. Value of 1 will be a slower scan but less CPU usage. <br><br>Value of 0 defaults to # of CPU cores for this server times 2 (i.e. 4-core CPU will be 8)' scannerMaxThreads: 'Number of concurrent media files to scan at a time. Value of 1 will be a slower scan but less CPU usage. <br><br>Value of 0 defaults to # of CPU cores for this server times 2 (i.e. 4-core CPU will be 8)'
}, },

1
server/controllers/MiscController.js
View file

@ -285,6 +285,7 @@ class MiscController {
} }
} }
res.json(userData) res.json(userData)
}
validateCronExpression(req, res) { validateCronExpression(req, res) {
const expression = req.body.expression const expression = req.body.expression