From 3796076413dcd1051ed734007dd33d7b72d879cb Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Sun, 11 Apr 2021 17:52:21 +0200 Subject: [PATCH 01/59] Remove obsolete isort flags (#740) --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 22fe9fe5..cbdaf80d 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ changedir = {toxinidir} [testenv:black] commands = black --check --target-version=py36 . - isort -c -rc . + isort -c . changedir = {toxinidir} [testenv:flake8] From 5454c68a7c3f92b2181adaa16263ba4569d3b590 Mon Sep 17 00:00:00 2001 From: "Weblate (bot)" Date: Sun, 11 Apr 2021 19:25:26 +0200 Subject: [PATCH 02/59] Translations update from Weblate (#741) * Added translation using Weblate (Telugu) Co-authored-by: Pratyush Kongalla * Deleted translation using Weblate (Telugu) Co-authored-by: Pratyush Kongalla Co-authored-by: Glandos From 958a85148f07ae4fbe13e4090dec5126a3b396aa Mon Sep 17 00:00:00 2001 From: Alexis Metaireau Date: Mon, 12 Apr 2021 21:23:25 +0200 Subject: [PATCH 03/59] Navbar change (#739) * Changed the navbar element spacing to make it look more even. * Put history and settings in a submenu Co-authored-by: Joshua --- ihatemoney/templates/layout.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ihatemoney/templates/layout.html b/ihatemoney/templates/layout.html index f79270e4..cae707c2 100644 --- a/ihatemoney/templates/layout.html +++ b/ihatemoney/templates/layout.html @@ -42,14 +42,12 @@

#! money?

+ +
+ {{ _("More options") }} + {% if g.project.default_currency != "XXX" %} + {{ input(form.original_currency, inline=True, class="form-control custom-select") }} + {% endif %} + {{ input(form.external_link, inline=True) }} +
{{ form.submit(class="btn btn-primary") }} From e9afc539c8f0e5a110ee2f79ecaf6368aa89a31c Mon Sep 17 00:00:00 2001 From: Glandos Date: Thu, 8 Jul 2021 14:41:39 +0200 Subject: [PATCH 55/59] slightly more margin for details --- ihatemoney/templates/forms.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ihatemoney/templates/forms.html b/ihatemoney/templates/forms.html index 4b10902f..9e2625bc 100644 --- a/ihatemoney/templates/forms.html +++ b/ihatemoney/templates/forms.html @@ -142,7 +142,7 @@
-
+
{{ _("More options") }} {% if g.project.default_currency != "XXX" %} {{ input(form.original_currency, inline=True, class="form-control custom-select") }} From 3f9303d5b53a928e636bbf16335a4bebbeb19306 Mon Sep 17 00:00:00 2001 From: Glandos Date: Thu, 8 Jul 2021 14:42:05 +0200 Subject: [PATCH 56/59] badges for selectors, and payees in column --- ihatemoney/templates/forms.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ihatemoney/templates/forms.html b/ihatemoney/templates/forms.html index 9e2625bc..320c337e 100644 --- a/ihatemoney/templates/forms.html +++ b/ihatemoney/templates/forms.html @@ -127,17 +127,20 @@
-
-
-

{{ _("Everybody") }} | {{_("Nobody")}}

- {% for key, value, checked in form.payed_for.iter_choices() | sort(attribute='1') %} -

+

+

+ {{ _("Everybody") }} + {{_("Nobody")}} +

+
+ {% for key, value, checked in form.payed_for.iter_choices() | sort(attribute='1') %} +

- {% endfor %} + {% endfor %}
From ccad5ac8593b2ea1905e468baf1a5c624a7bcd81 Mon Sep 17 00:00:00 2001 From: Glandos Date: Thu, 8 Jul 2021 14:46:54 +0200 Subject: [PATCH 57/59] align translation with existing tokens --- ihatemoney/templates/forms.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ihatemoney/templates/forms.html b/ihatemoney/templates/forms.html index 320c337e..46458c7e 100644 --- a/ihatemoney/templates/forms.html +++ b/ihatemoney/templates/forms.html @@ -129,8 +129,8 @@

- {{ _("Everybody") }} - {{_("Nobody")}} + {{ _("Everyone") }} + {{_("Noone")}}

{% for key, value, checked in form.payed_for.iter_choices() | sort(attribute='1') %} From 526db044b2c84cb588263a62b3b47d514b9c2628 Mon Sep 17 00:00:00 2001 From: Glandos Date: Fri, 9 Jul 2021 09:00:35 +0200 Subject: [PATCH 58/59] Use "No one" instead of "Noone", that is really too old. --- ihatemoney/templates/forms.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ihatemoney/templates/forms.html b/ihatemoney/templates/forms.html index 46458c7e..afc364f9 100644 --- a/ihatemoney/templates/forms.html +++ b/ihatemoney/templates/forms.html @@ -130,7 +130,7 @@

{{ _("Everyone") }} - {{_("Noone")}} + {{_("No one")}}

{% for key, value, checked in form.payed_for.iter_choices() | sort(attribute='1') %} From 98c30f091407b13555ae33151067c39fff344c76 Mon Sep 17 00:00:00 2001 From: Glandos Date: Sat, 10 Jul 2021 10:12:45 +0200 Subject: [PATCH 59/59] bump minimal WTForms version --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index dbb01022..bd1139a8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ install_requires = Flask-RESTful~=0.3 Flask-SQLAlchemy~=2.4 Flask-WTF~=0.14,>=0.14.3 # See b76da172652da94c1f9c4b2fdd965375da8a2c3f - WTForms>=2.2.1,<2.4 + WTForms>=2.3.1,<2.4 Flask>=1.1,<3.0 itsdangerous>=1.1,<3.0 Jinja2>=3.0,<4.0