Compare commits

...

7 Commits

Author SHA1 Message Date
github-actions[bot]
e1ada04d07 Merge pull request #11566 from firefly-iii/release-1768939586
🤖 Automatically merge the PR into the develop branch.
2026-01-20 21:06:33 +01:00
JC5
61cc480c03 🤖 Auto commit for release 'develop' on 2026-01-20 2026-01-20 21:06:26 +01:00
James Cole
889b25e85d Merge branch 'main' into develop 2026-01-20 21:02:06 +01:00
James Cole
f9f365153a Update build job. 2026-01-20 21:01:37 +01:00
github-actions[bot]
62c676157f Merge pull request #11565 from firefly-iii/release-1768939166
🤖 Automatically merge the PR into the develop branch.
2026-01-20 20:59:34 +01:00
JC5
24df659ecb 🤖 Auto commit for release 'develop' on 2026-01-20 2026-01-20 20:59:26 +01:00
James Cole
9180cdbc66 Add error box. 2026-01-20 20:55:35 +01:00
3 changed files with 19 additions and 2 deletions

View File

@@ -170,10 +170,15 @@ jobs:
npm run prod --workspace=v1
npm run build --workspace=v2
npm update
- name: Setup Mago
uses: nhedger/setup-mago@v1
- name: Run CI
run: |
rm -rf vendor composer.lock
composer update --no-dev --no-scripts --no-plugins -q
composer update --no-scripts --no-plugins -q
mago format --dry-run || true
mago lint --reporting-format=github || true
mago analyze --reporting-format=github || true
sudo chown -R runner:docker resources/lang
.ci/phpcs.sh || true
- name: Calculate variables

View File

@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2026-01-20',
'build_time' => 1768934374,
'build_time' => 1768939462,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 28, // field is no longer used.

View File

@@ -24,6 +24,18 @@
aria-expanded="false">{{ 'preferences_notifications'|_ }}</a></li>
</ul>
<div class="tab-content">
{% if errors.any %}
<div class="alert alert-danger" role="alert">
<ul>
{% for bag in errors.getBags %}
{% for error in bag.all %}
<li>{{ error }}</li>
{% endfor %}
{% endfor %}
</ul>
</div>
{% endif %}
<div class="tab-pane active" id="general">
{# general settings here #}
<div class="row">