Merge branch 'main' into #885-media-viewer

# Conflicts:
#	src/app/+item-page/item-page.module.ts
#	src/app/+item-page/simple/item-types/shared/item.component.ts
#	src/app/app.component.scss
#	src/environments/mock-environment.ts
This commit is contained in:
Dániel Péter Sipos
2021-03-26 16:57:07 +01:00
672 changed files with 54289 additions and 13976 deletions

View File

@@ -110,8 +110,6 @@ export const environment: Partial<GlobalConfig> = {
async: true,
time: false
},
// Google Analytics tracking id
gaTrackingId: '',
// Log directory
logDirectory: '.',
// NOTE: will log all redux actions and transfers in console
@@ -194,9 +192,31 @@ export const environment: Partial<GlobalConfig> = {
undoTimeout: 10000 // 10 seconds
}
},
theme: {
name: 'default',
},
themes: [
{
name: 'full-item-page-theme',
regex: 'items/aa6c6c83-3a83-4953-95d1-2bc2e67854d2/full'
},
{
name: 'error-theme',
regex: 'collections/aaaa.*'
},
{
name: 'handle-theme',
handle: '10673/1233'
},
{
name: 'regex-theme',
regex: 'collections\/e8043bc2.*'
},
{
name: 'uuid-theme',
uuid: '0958c910-2037-42a9-81c7-dca80e3892b4'
},
{
name: 'base',
},
],
mediaViewer: {
image: true,
video: true