From 2ce39afee9aa14c8b92fb61f4734ed4497776969 Mon Sep 17 00:00:00 2001 From: Rossi-Luciano Date: Mon, 8 Jun 2026 11:20:37 -0300 Subject: [PATCH 1/3] fix: resolve conflicting migrations in markup_doc Merge migration 0005 unifying branches 0003_remove_articledocxmarkup_dateiso_and_more and 0004_articledocxmarkup_xref_status, which were blocking the Django startup. Co-Authored-By: Claude Sonnet 4.6 --- markup_doc/migrations/0005_merge_20260608_1321.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 markup_doc/migrations/0005_merge_20260608_1321.py diff --git a/markup_doc/migrations/0005_merge_20260608_1321.py b/markup_doc/migrations/0005_merge_20260608_1321.py new file mode 100644 index 0000000..9dd90ec --- /dev/null +++ b/markup_doc/migrations/0005_merge_20260608_1321.py @@ -0,0 +1,14 @@ +# Generated by Django 6.0.5 on 2026-06-08 13:21 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('markup_doc', '0003_remove_articledocxmarkup_dateiso_and_more'), + ('markup_doc', '0004_articledocxmarkup_xref_status'), + ] + + operations = [ + ] From b23b2e655ff67f15de56b42b1b956a5de472b853 Mon Sep 17 00:00:00 2001 From: Rossi-Luciano Date: Mon, 8 Jun 2026 11:20:43 -0300 Subject: [PATCH 2/3] feat: replace Wagtail branding with SciELO on welcome page Replace Wagtail logo, links, and text references with SciELO equivalents on the welcome page. Adds logo-scielo-signature.png to static assets. Co-Authored-By: Claude Sonnet 4.6 --- core/home/static/img/logo-scielo-signature.png | Bin 0 -> 3182 bytes core/home/templates/home/welcome_page.html | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 core/home/static/img/logo-scielo-signature.png diff --git a/core/home/static/img/logo-scielo-signature.png b/core/home/static/img/logo-scielo-signature.png new file mode 100644 index 0000000000000000000000000000000000000000..5f5e840acf52c1a0ef246fdc8e94922ecdebf309 GIT binary patch literal 3182 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 LBDTi*Nc?{Qnn7Qw literal 0 HcmV?d00001 diff --git a/core/home/templates/home/welcome_page.html b/core/home/templates/home/welcome_page.html index dcacaf3..9bb8b88 100644 --- a/core/home/templates/home/welcome_page.html +++ b/core/home/templates/home/welcome_page.html @@ -1,9 +1,9 @@ -{% load i18n wagtailcore_tags %} +{% load i18n wagtailcore_tags static %}
@@ -23,15 +23,15 @@
-

{% trans "Welcome to your new Wagtail site!" %}

-

{% trans 'Please feel free to join our community on Slack, or get started with one of the links below.' %}

+

{% trans "Welcome to SciELO!" %}

+

{% trans 'Get started with one of the links below.' %}