Merge remote-tracking branch 'remotes/origin/master' into submission

# Conflicts:
#	src/app/core/data/browse-items-response-parsing-service.ts
#	src/app/shared/shared.module.ts
This commit is contained in:
Giuseppe Digilio
2019-03-08 16:30:39 +01:00
41 changed files with 1760 additions and 188 deletions

View File

@@ -142,6 +142,15 @@ module.exports = {
label: 'Nederlands',
active: false,
}],
// Browse-By Pages
browseBy: {
// Amount of years to display using jumps of one year (current year - oneYearLimit)
oneYearLimit: 10,
// Limit for years to display using jumps of five years (current year - fiveYearLimit)
fiveYearLimit: 30,
// The absolute lowest year to display in the dropdown (only used when no lowest date can be found for all items)
defaultLowerLimit: 1900
},
item: {
edit: {
undoTimeout: 10000 // 10 seconds