Merge 6e7b41292a into 4f9cad88bd

Rename master to main
Add a tooltip to document the Settle button
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:42:02 +01:00
3 changed files with 6 additions and 4 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/settle_bills.html
+++ b/ihatemoney/templates/settle_bills.html
@ -19,7 +19,9 @@
            <td>
                <span id="settle-bill" class="ml-auto pb-2">
                    <a href="{{ url_for('.settle', amount = bill.amount, ower_id = bill.ower.id, payer_id = bill.receiver.id) }}" class="btn btn-primary">
                      <div data-toggle="tooltip" title='{{ _("Click here to record that the money transfer has been done") }}'>
                        {{ ("Settle") }}
                      </div>
                    </a>
                </span>
            </td>
Author	SHA1	Message	Date
Jojo144	3374e91cf0	Merge `6e7b41292a` 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	6e7b41292a	Add a tooltip to document the Settle button	2024-12-25 19:42:02 +01:00