Merge 553422372f into 4f9cad88bd

Rename master to main
Move the bill type field in the More options section
2025-05-15 17:01:49 +02:00 · 2024-12-28 02:12:30 +01:00 · 2024-12-28 00:50:27 +01:00 · 2024-12-25 19:49:10 +01:00
3 changed files with 5 additions and 5 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -2,9 +2,9 @@ name: CI

 on:
  push:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
  pull_request:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]

 jobs:
  lint:
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@ -3,9 +3,9 @@ name: Docker build
 on:
  push:
    tags: ['*']
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]
  pull_request:
-    branches: [ 'master', 'stable-*' ]
+    branches: [ 'main', 'stable-*' ]


 jobs:
--- a/ihatemoney/templates/forms.html
+++ b/ihatemoney/templates/forms.html
@ -165,7 +165,6 @@
    {% include "display_errors.html" %}
    {{ form.hidden_tag() }}
    {{ input(form.date, inline=True) }}
-    {{ input(form.bill_type, inline=True) }}
    {{ input(form.what, inline=True) }}
    {{ input(form.payer, inline=True, class="form-control custom-select") }}
    <div data-toggle="tooltip" data-placement="top" title='{{ _("Simple operations are allowed, e.g. (18+36.2)/3") }}'>
@ -201,6 +200,7 @@
        {% if g.project.default_currency != "XXX" %}
            {{ input(form.original_currency, inline=True, class="form-control custom-select") }}
        {% endif %}
+        {{ input(form.bill_type, inline=True) }}
        {{ input(form.external_link, inline=True) }}
    </details>
    </fieldset>
Author	SHA1	Message	Date
Jojo144	30b7e10804	Merge `553422372f` into `4f9cad88bd`	2024-12-28 02:12:30 +01:00
Alexis Métaireau	4f9cad88bd	Rename master to main Some checks failed CI / lint (push) Has been cancelled Details CI / docs (push) Has been cancelled Details Docker build / test (push) Has been cancelled Details CI / test (mariadb, minimal, 3.11) (push) Has been cancelled Details CI / test (mariadb, normal, 3.11) (push) Has been cancelled Details CI / test (mariadb, normal, 3.9) (push) Has been cancelled Details CI / test (postgresql, minimal, 3.11) (push) Has been cancelled Details CI / test (postgresql, normal, 3.11) (push) Has been cancelled Details CI / test (postgresql, normal, 3.9) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.10) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.11) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.12) (push) Has been cancelled Details CI / test (sqlite, minimal, 3.9) (push) Has been cancelled Details CI / test (sqlite, normal, 3.10) (push) Has been cancelled Details CI / test (sqlite, normal, 3.11) (push) Has been cancelled Details CI / test (sqlite, normal, 3.12) (push) Has been cancelled Details CI / test (sqlite, normal, 3.8) (push) Has been cancelled Details CI / test (sqlite, normal, 3.9) (push) Has been cancelled Details Docker build / build_upload (push) Has been cancelled Details	2024-12-28 00:50:27 +01:00
Jojo144	553422372f	Move the bill type field in the More options section	2024-12-25 19:49:10 +01:00