From fc49076e5a942be05965d8565d148697b707839a Mon Sep 17 00:00:00 2001 From: Sergi Date: Wed, 10 Apr 2024 12:16:30 +0200 Subject: [PATCH 1/4] remove twitter add link to adbdt contact --- app/views/application/_footer.html.erb | 5 ++--- db/structure.sql | 21 +++++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/app/views/application/_footer.html.erb b/app/views/application/_footer.html.erb index 60bdedf52..723b1ade5 100644 --- a/app/views/application/_footer.html.erb +++ b/app/views/application/_footer.html.erb @@ -2,15 +2,14 @@
- <%= t('layouts.application.help') %> + <%= t('layouts.application.help') %> <%= link_to t('application.terms_conditions'), tnc_path, data: { target: '#modal', toggle: 'modal' } %>
<%= render 'application/menus/language_switcher' %>
- Twitter - Github + Githuub2
diff --git a/db/structure.sql b/db/structure.sql index 1a912a796..63e570e97 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1,24 +1,19 @@ SET statement_timeout = 0; SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; SET client_encoding = 'UTF8'; SET standard_conforming_strings = on; SELECT pg_catalog.set_config('search_path', '', false); SET check_function_bodies = false; SET xmloption = content; SET client_min_messages = warning; +SET row_security = off; -- --- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - +-- Name: public; Type: SCHEMA; Schema: -; Owner: - -- -CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; - - --- --- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: - --- - -COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; +-- *not* creating schema, since initdb creates it -- @@ -82,7 +77,7 @@ CREATE FUNCTION public.posts_trigger() RETURNS trigger SET default_tablespace = ''; -SET default_with_oids = false; +SET default_table_access_method = heap; -- -- Name: accounts; Type: TABLE; Schema: public; Owner: - @@ -1218,7 +1213,7 @@ CREATE UNIQUE INDEX unique_schema_migrations ON public.schema_migrations USING b -- Name: posts tsvectorupdate; Type: TRIGGER; Schema: public; Owner: - -- -CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE ON public.posts FOR EACH ROW EXECUTE PROCEDURE public.posts_trigger(); +CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE ON public.posts FOR EACH ROW EXECUTE FUNCTION public.posts_trigger(); -- @@ -1305,7 +1300,7 @@ ALTER TABLE ONLY public.active_storage_attachments -- PostgreSQL database dump complete -- -SET search_path TO "$user",public; +SET search_path TO "$user", public; INSERT INTO "schema_migrations" (version) VALUES ('1'), @@ -1378,3 +1373,5 @@ INSERT INTO "schema_migrations" (version) VALUES ('20230401114456'), ('20231120164231'), ('20231120164346'); + + From 47040f3a0483aa4d2f13c318da5bd8ec7b5e1d03 Mon Sep 17 00:00:00 2001 From: Sergi Date: Wed, 10 Apr 2024 12:19:04 +0200 Subject: [PATCH 2/4] fix typo --- app/views/application/_footer.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/application/_footer.html.erb b/app/views/application/_footer.html.erb index 723b1ade5..ad4c9dc2e 100644 --- a/app/views/application/_footer.html.erb +++ b/app/views/application/_footer.html.erb @@ -9,7 +9,7 @@ <%= render 'application/menus/language_switcher' %>
- Githuub2 + Github
From da96a7a532086c1c2a2c605fcfca11834724cc24 Mon Sep 17 00:00:00 2001 From: Sergi Date: Wed, 10 Apr 2024 12:26:02 +0200 Subject: [PATCH 3/4] updtate bdtonline url --- app/views/pages/about.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb index 60698e062..2e77f1afc 100644 --- a/app/views/pages/about.html.erb +++ b/app/views/pages/about.html.erb @@ -42,7 +42,7 @@ "pages.about.empower-text-1", showmap_link: link_to( t("pages.about.empower-showmap"), - "http://www.bdtonline.org", + "https://adbdt.org/unete-a-un-banco-de-tiempo/", { title: t("pages.about.empower-showmap-title") } ) ).html_safe %>

From b8bbe49368039034faa2c5e6a37cbb1dfa0014b5 Mon Sep 17 00:00:00 2001 From: Sergi Date: Wed, 10 Apr 2024 13:27:32 +0200 Subject: [PATCH 4/4] restore structure.sql from develop --- db/structure.sql | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/db/structure.sql b/db/structure.sql index 63e570e97..1a912a796 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -1,19 +1,24 @@ SET statement_timeout = 0; SET lock_timeout = 0; -SET idle_in_transaction_session_timeout = 0; SET client_encoding = 'UTF8'; SET standard_conforming_strings = on; SELECT pg_catalog.set_config('search_path', '', false); SET check_function_bodies = false; SET xmloption = content; SET client_min_messages = warning; -SET row_security = off; -- --- Name: public; Type: SCHEMA; Schema: -; Owner: - +-- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - -- --- *not* creating schema, since initdb creates it +CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; + + +-- +-- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: - +-- + +COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; -- @@ -77,7 +82,7 @@ CREATE FUNCTION public.posts_trigger() RETURNS trigger SET default_tablespace = ''; -SET default_table_access_method = heap; +SET default_with_oids = false; -- -- Name: accounts; Type: TABLE; Schema: public; Owner: - @@ -1213,7 +1218,7 @@ CREATE UNIQUE INDEX unique_schema_migrations ON public.schema_migrations USING b -- Name: posts tsvectorupdate; Type: TRIGGER; Schema: public; Owner: - -- -CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE ON public.posts FOR EACH ROW EXECUTE FUNCTION public.posts_trigger(); +CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE ON public.posts FOR EACH ROW EXECUTE PROCEDURE public.posts_trigger(); -- @@ -1300,7 +1305,7 @@ ALTER TABLE ONLY public.active_storage_attachments -- PostgreSQL database dump complete -- -SET search_path TO "$user", public; +SET search_path TO "$user",public; INSERT INTO "schema_migrations" (version) VALUES ('1'), @@ -1373,5 +1378,3 @@ INSERT INTO "schema_migrations" (version) VALUES ('20230401114456'), ('20231120164231'), ('20231120164346'); - -