From 09f5583d313801d42f5b930fd5eac28699302148 Mon Sep 17 00:00:00 2001 From: Nulo Date: Thu, 28 Oct 2021 15:32:13 -0300 Subject: [PATCH 1/3] Makefile: setear ENV_FILE en hain Requiere de https://0xacab.org/sutty/haini.sh/-/merge_requests/33. Pasa RAILS_GROUPS y otras variables. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 18914f43..1f0ca914 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ commit ?= origin/rails## Commit desde el que actualizar env ?= staging## Entorno del nodo delegado sutty ?= $(SUTTY)## Dirección local delegate ?= $(DELEGATE)## Cambia el nodo delegado -hain ?= $(HAINISH)## Ubicación de Hainish +hain ?= ENV_FILE=.env $(HAINISH)## Ubicación de Hainish # El nodo delegado tiene dos entornos, production y staging. # Dependiendo del entorno que elijamos, se van a generar los assets y el From 2844ca9f5f08c0d307734e5d52b2c7e63b989ec7 Mon Sep 17 00:00:00 2001 From: Nulo Date: Thu, 28 Oct 2021 16:06:31 -0300 Subject: [PATCH 2/3] .env.example: setear RAILS_ENV=development --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index f79ff3a4..fb086224 100644 --- a/.env.example +++ b/.env.example @@ -2,7 +2,7 @@ RAILS_GROUPS=assets DELEGATE=athshe.sutty.nl HAINISH=../haini.sh/haini.sh DATABASE= -RAILS_ENV= +RAILS_ENV=development IMAP_SERVER= DEFAULT_FROM= EXCEPTION_TO= From f2a0654ebcb2fd63992a7c146d48b36f45d8a832 Mon Sep 17 00:00:00 2001 From: Nulo Date: Tue, 30 Nov 2021 16:45:19 +0000 Subject: [PATCH 3/3] =?UTF-8?q?Permitir=20clickear=20en=20el=20p=C3=A1rraf?= =?UTF-8?q?o=20de=20ejemplo=20para=20subir=20multimedia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/editor.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/editor.scss b/app/assets/stylesheets/editor.scss index e0886533..30fab60a 100644 --- a/app/assets/stylesheets/editor.scss +++ b/app/assets/stylesheets/editor.scss @@ -71,6 +71,10 @@ strong, em, del, u, sub, sup, small { background: #0002; } a { background: #13fefe50; } [data-editor-selected] { outline: #f206f9 solid thick; } + p[data-multimedia-inner] { + // Ignorar clicks en el párrafo placeholder + pointer-events: none; + } } *[data-editor-loading] {