Skip to content

Commit

Permalink
Next into test (#756)
Browse files Browse the repository at this point in the history
* zms-2871-2874-minus-deletion-by-location-delete-and-orthography-mail-and-notification-buttons

* fix(deps): update dependency phpoffice/phpspreadsheet to v1.29.6 (#738)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency squizlabs/php_codesniffer to v3.11.2 (#751)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency sass to v1.83.0 (#750)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* fix(deps): update dependency phpoffice/phpspreadsheet to v1.29.7 (#752)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* chore(deps): update dependency phpspec/prophecy-phpunit to v2.3.0 (#647)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

---------

Co-authored-by: matthias1996 <matthias.lorenz@muenchen.de>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: thomasafink <thomas.fink@muenchen.de>
  • Loading branch information
4 people authored Jan 9, 2025
1 parent 783c18c commit 9873c53
Show file tree
Hide file tree
Showing 15 changed files with 897 additions and 522 deletions.
10 changes: 5 additions & 5 deletions mellon/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

128 changes: 65 additions & 63 deletions zmsadmin/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions zmsadmin/templates/block/mail/form.twig
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@

<div class="form-actions">
<div class="right">
<button type="button" class="button button--diamond button-abort">schließen</button>
<button type="button" class="button button--default button-ok button-submit">abschicken</button>
<button type="button" class="button button--diamond button-abort">Schließen</button>
<button type="button" class="button button--default button-ok button-submit">Abschicken</button>
</div>
</div>
{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions zmsadmin/templates/block/notification/form.twig
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@

<div class="form-actions">
<div class="right">
<button type="button" class="button button--diamond button-abort">schließen</button>
<button type="button" class="button button--default button-ok button-submit">abschicken</button>
<button type="button" class="button button--diamond button-abort">Schließen</button>
<button type="button" class="button button--default button-ok button-submit">Abschicken</button>
</div>
</div>
{% endif %}
Expand Down
Loading

0 comments on commit 9873c53

Please sign in to comment.