diff --git a/.gitignore b/.gitignore
index a1885706..9ae5ef30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,5 @@ sw.*
*.swp
master.m3u8
+tv-media
+tv-media/
diff --git a/assets/scss/globals.scss b/assets/scss/globals.scss
index 8357de86..261a3298 100644
--- a/assets/scss/globals.scss
+++ b/assets/scss/globals.scss
@@ -55,7 +55,7 @@
.duration {
float: right;
- margin-right: 1em;
+ margin-right: .5em;
}
.form-control, .tags-list ul li div input, .custom-select, .custom-control-label::before {
@@ -152,7 +152,11 @@
padding: 0 10px 0 0;
}
-.browser-div .ps {
+.player-browser-scroll {
+ height: calc(100% - 50px);
+}
+
+.browser-div .media-browser-scroll {
height: 100%;
}
diff --git a/nuxt.config.js b/nuxt.config.js
index 40ed673d..5da58164 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -81,6 +81,16 @@ export default {
baseURL: process.env.API_URL
},
+ dayjs: {
+ locales: ['en', 'de'],
+ defaultLocale: 'en',
+ defaultTimeZone: 'Europe/Berlin', // TODO: use timezon like this.$dayjs().tz()
+ plugins: [
+ 'utc',
+ 'timezone'
+ ]
+ },
+
styleResources: {
scss: [
'@/assets/css/_variables.scss',
diff --git a/pages/logging.vue b/pages/logging.vue
index 4468b59b..cebdf49b 100644
--- a/pages/logging.vue
+++ b/pages/logging.vue
@@ -60,8 +60,8 @@ export default {
filters: {
formatStr (text) {
return text
- .replace(/("\[.*")/g, '$1')
- .replace(/("\/.*")/g, '$1')
+ .replace(/(".*")/g, '$1')
+ .replace(/(?$1')
.replace(/(\/[\w\d.\-/]+\n)/g, '$1')
.replace(/((tcp|https?):\/\/[\w\d.:]+)/g, '$1')
.replace(/(\[\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}[0-9,.]+\])/g, '$1')
diff --git a/pages/media.vue b/pages/media.vue
index e9a5d290..559a2cef 100644
--- a/pages/media.vue
+++ b/pages/media.vue
@@ -31,7 +31,7 @@