diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67824ac31e..9d42288e13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ stages: - lint - build - test + - deploy lint: stage: lint @@ -33,3 +34,13 @@ build: artifacts: paths: - dist/ + +docs-deploy: + stage: deploy + image: alpine:latest + only: + - develop@pleroma/pleroma-fe + before_script: + - apk add curl + script: + - curl -X POST -F"token=$DOCS_PIPELINE_TRIGGER" -F'ref=master' https://git.pleroma.social/api/v4/projects/673/trigger/pipeline diff --git a/docs/CONFIGURATION.md b/docs/CONFIGURATION.md index a7dcd91565..3536353725 100644 --- a/docs/CONFIGURATION.md +++ b/docs/CONFIGURATION.md @@ -1,7 +1,7 @@ # Pleroma-FE configuration and customization for instance administrators -* *For user configuration, see USER_GUIDE.md* -* *For local development server configuration, see HACKING.md* +* *For user configuration, see [Pleroma-FE user guide](USER_GUIDE.md)* +* *For local development server configuration, see [Hacking, tweaking, contributing](HACKING.md)* ## Where configuration is stored diff --git a/docs/USER_GUIDE.md b/docs/USER_GUIDE.md index 18b6c5601b..076bfb1c3b 100644 --- a/docs/USER_GUIDE.md +++ b/docs/USER_GUIDE.md @@ -1,3 +1,5 @@ +# Pleroma-FE user guide + > Be prepared for breaking changes, unexpected behavior and this user guide becoming obsolete and wrong. > If there was no insanity @@ -6,8 +8,6 @@ > > --Catbag -# Pleroma-FE user guide - Pleroma-FE user interface is modeled after Qvitter which is modeled after older Twitter design. It provides a simple 2-column interface for microblogging. While being simple by default it also provides many powerful customization options. ## Posting, reading, basic functions. diff --git a/src/App.vue b/src/App.vue index 8d7f6c79cf..dbe842ec4f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -53,6 +53,15 @@ :title="$t('nav.preferences')" /> + { + this.resettingForm = false + }) + } + }, + isFormVisible (val) { if (val) { - this.$nextTick(() => this.$el.querySelector('textarea').focus()) + this.$nextTick(() => this.$el && this.$el.querySelector('textarea').focus()) } } }, diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue index 3f8eec69b6..d3a823896b 100644 --- a/src/components/post_status_modal/post_status_modal.vue +++ b/src/components/post_status_modal/post_status_modal.vue @@ -1,6 +1,7 @@