From a53100ef6e76d25abaa7c3418e3852d15987d1c2 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 21 Nov 2019 16:07:43 +0100 Subject: [PATCH] Added a demo mode to show or hide instance warnings that data is deleted Signed-off-by: Thomas Citharel --- CHANGELOG.md | 1 + config/config.exs | 1 + js/src/App.vue | 7 ++++++- js/src/graphql/config.ts | 1 + js/src/types/config.model.ts | 1 + js/src/views/User/Login.vue | 4 ++-- lib/mobilizon/config.ex | 3 +++ lib/mobilizon_web/resolvers/config.ex | 1 + lib/mobilizon_web/schema/config.ex | 1 + lib/mobilizon_web/templates/email/email.html.eex | 2 ++ schema.graphql | 3 ++- 11 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81a7e0cb9..4326eeb6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ In order to move participant stats to the event table for existing events, you n - Add a different welcome message when coming from registration - Link to participation page from event page when you are an organizer - Added a warning on login that everything is deleted regularily +- Added a demo mode to show or hide instance warnings that data is deleted - Updated Occitan translations (Quentin) - Updated French translations (Gavy, Zilverspar, ty kayn) - Updated Swedish translations (Anton Strömkvist) diff --git a/config/config.exs b/config/config.exs index 9682b34c3..8899ceaed 100644 --- a/config/config.exs +++ b/config/config.exs @@ -18,6 +18,7 @@ config :mobilizon, :instance, version: "1.0.0-dev", hostname: System.get_env("MOBILIZON_INSTANCE_HOST") || "localhost", registrations_open: System.get_env("MOBILIZON_INSTANCE_REGISTRATIONS_OPEN") || false, + demo: System.get_env("MOBILIZON_INSTANCE_DEMO_MODE") || false, repository: Mix.Project.config()[:source_url], allow_relay: true, # Federation is to be activated with Mobilizon 1.0.0-beta.2 diff --git a/js/src/App.vue b/js/src/App.vue index 6bdc00e88..f8d4db623 100644 --- a/js/src/App.vue +++ b/js/src/App.vue @@ -1,7 +1,7 @@