almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-15 17:01:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: almet:3a7667072784aa3636c1faa713b4872995f633b0
Branches Tags
almet:main
almet:almet/showcase-en
almet:remove-currencies
almet:dependabot/pip/master/flask-limiter-gte-2.6-and-lt-4
almet:dependabot/pip/master/sqlalchemy-gte-1.3.0-and-lt-2.1
almet:dependabot/pip/master/werkzeug-gte-2-and-lt-4
almet:dependabot/pip/master/docutils-0.21.2
almet:dependabot/pip/master/flask-sqlalchemy-gte-2.4-and-lt-4
almet:tags
almet:stable-6.1
almet:almet/fix-api-members-edit
almet:almet/fix-translation-emails
almet:almet/test-ci
almet:Glandos/issue1054
almet:debug
almet:almet/rename-participants
almet:stable-4.1
almet:6.1.5
almet:6.1.4
almet:6.1.3
almet:6.1.2
almet:6.1.1
almet:6.1.0
almet:6.0.1
almet:6.0.0
almet:5.2.0
almet:5.1.1
almet:5.1.0
almet:5.0.1
almet:5.0.0
almet:4.1.5
almet:4.1.4
almet:4.2
almet:4.1.3
almet:4.1.2
almet:4.1.1
almet:4.1
almet:4.0
almet:3.0
almet:2.1
almet:2.0
almet:1.0
almet:0.9
...
compare: almet:30b7e10804df55935632fdaa21db99c4b52a9dd1
Branches Tags
almet:main
almet:almet/showcase-en
almet:remove-currencies
almet:dependabot/pip/master/flask-limiter-gte-2.6-and-lt-4
almet:dependabot/pip/master/sqlalchemy-gte-1.3.0-and-lt-2.1
almet:dependabot/pip/master/werkzeug-gte-2-and-lt-4
almet:dependabot/pip/master/docutils-0.21.2
almet:dependabot/pip/master/flask-sqlalchemy-gte-2.4-and-lt-4
almet:tags
almet:stable-6.1
almet:almet/fix-api-members-edit
almet:almet/fix-translation-emails
almet:almet/test-ci
almet:Glandos/issue1054
almet:debug
almet:almet/rename-participants
almet:stable-4.1
almet:6.1.5
almet:6.1.4
almet:6.1.3
almet:6.1.2
almet:6.1.1
almet:6.1.0
almet:6.0.1
almet:6.0.0
almet:5.2.0
almet:5.1.1
almet:5.1.0
almet:5.0.1
almet:5.0.0
almet:4.1.5
almet:4.1.4
almet:4.2
almet:4.1.3
almet:4.1.2
almet:4.1.1
almet:4.1
almet:4.0
almet:3.0
almet:2.1
almet:2.0
almet:1.0
almet:0.9

3 commits
3a76670727 ... 30b7e10804

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
3 changed files with 5 additions and 5 deletions
Show stats Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -2,9 +2,9 @@ name: CI
on: on:
push: push:
branches: [ 'master', 'stable-*' ] branches: [ 'main', 'stable-*' ]
pull_request: pull_request:
branches: [ 'master', 'stable-*' ] branches: [ 'main', 'stable-*' ]
jobs: jobs:
lint: lint:

4
.github/workflows/dockerhub.yml vendored
View file

@ -3,9 +3,9 @@ name: Docker build
on: on:
push: push:
tags: ['*'] tags: ['*']
branches: [ 'master', 'stable-*' ] branches: [ 'main', 'stable-*' ]
pull_request: pull_request:
branches: [ 'master', 'stable-*' ] branches: [ 'main', 'stable-*' ]
jobs: jobs:

2
ihatemoney/templates/forms.html
View file

@ -165,7 +165,6 @@
{% include "display_errors.html" %} {% include "display_errors.html" %}
{{ form.hidden_tag() }} {{ form.hidden_tag() }}
{{ input(form.date, inline=True) }} {{ input(form.date, inline=True) }}
{{ input(form.bill_type, inline=True) }}
{{ input(form.what, inline=True) }} {{ input(form.what, inline=True) }}
{{ input(form.payer, inline=True, class="form-control custom-select") }} {{ 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") }}'> <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" %} {% if g.project.default_currency != "XXX" %}
{{ input(form.original_currency, inline=True, class="form-control custom-select") }} {{ input(form.original_currency, inline=True, class="form-control custom-select") }}
{% endif %} {% endif %}
{{ input(form.bill_type, inline=True) }}
{{ input(form.external_link, inline=True) }} {{ input(form.external_link, inline=True) }}
</details> </details>
</fieldset> </fieldset>