Merge pull request 'merged :-)' (#589 ) from trailer-reservation into staging

Reviewed-on: #589
Merge pull request 'add trailer reservation funcitonality; Fixes #443 ' (#587 ) from trailer-reservation into staging
2024-06-10 20:00:07 +02:00 · 2024-06-10 19:58:13 +02:00 · 2024-06-10 19:08:17 +02:00 · 2024-06-10 19:07:55 +02:00 · 2024-06-10 19:07:05 +02:00 · 2024-06-10 15:49:43 +02:00
1 changed files with 4 additions and 0 deletions
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@ -279,4 +279,8 @@
            </details>
            <input class="btn btn-primary" type="submit" value="Ausfahrt beenden" />
        </form>
        <a href="/log/{{ log.id }}/delete"
           class="btn btn-alert w-full absolute bottom-0 left-0"
           style="border-radius: 0"
           onclick="return confirm('Willst du diesen Eintrag wirklich löschen? Die Daten gehen verloren');">Löschen</a>
    {% endmacro home %}
Author	SHA1	Message	Date
philipp	df007524ed	Merge pull request 'merged :-)' (#589 ) from trailer-reservation into staging All checks were successful CI/CD Pipeline / test (push) Successful in 10m1s Details CI/CD Pipeline / deploy-staging (push) Successful in 6m41s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #589	2024-06-10 20:00:07 +02:00
philipp	5720767af3	Merge pull request 'add trailer reservation funcitonality; Fixes #443 ' (#587 ) from trailer-reservation into staging Some checks failed CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details CI/CD Pipeline / test (push) Has been cancelled Details Reviewed-on: #587	2024-06-10 19:58:13 +02:00
philipp	1215bdbd84	Merge pull request 'delte-trip-btn' (#585 ) from delte-trip-btn into staging All checks were successful CI/CD Pipeline / test (push) Successful in 10m5s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m37s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #585	2024-06-10 19:08:17 +02:00
philipp	16687e39ab	remove unused attribute Some checks failed CI/CD Pipeline / test (push) Has been cancelled Details CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details	2024-06-10 19:07:55 +02:00
philipp	957c474389	add delete trip button in edit window; Fixes #449 Some checks failed CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details CI/CD Pipeline / test (push) Has been cancelled Details	2024-06-10 19:07:05 +02:00
philipp	734490efe7	Merge pull request 'use proper hydro license; add fluctuation' (#583 ) from proper-hydro into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m18s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m35s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #583	2024-06-10 15:49:43 +02:00
philipp	980fcc0c0c	Merge pull request 'thousand-km-trips' (#581 ) from thousand-km-trips into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m34s Details CI/CD Pipeline / deploy-staging (push) Successful in 6m15s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #581	2024-06-10 15:12:57 +02:00
philipp	84f23e6e55	Merge pull request 'fix boat select' (#579 ) from fix-boat-select into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m42s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m22s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #579	2024-06-10 11:01:39 +02:00
philipp	36193e3a64	Merge pull request 'cleaner cal' (#577 ) from cleaner-cal into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m1s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m28s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #577	2024-06-06 17:22:13 +02:00
philipp	c6e3458588	Merge pull request 'add-badge' (#575 ) from add-badge into staging All checks were successful CI/CD Pipeline / test (push) Successful in 8m55s Details CI/CD Pipeline / deploy-staging (push) Successful in 18m13s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #575	2024-06-06 10:48:30 +02:00
philipp	a0528c1c65	Merge pull request 'nicer-cal' (#573 ) from nicer-cal into staging All checks were successful CI/CD Pipeline / test (push) Successful in 10m22s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m19s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #573	2024-06-06 07:11:32 +02:00
philipp	5e4d708884	Merge pull request 'update-deps' (#571 ) from update-deps into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m55s Details CI/CD Pipeline / deploy-staging (push) Successful in 17m58s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #571	2024-06-05 15:07:04 +02:00
philipp	6e41758104	Merge pull request 'allow-event-triptype-update' (#569 ) from allow-event-triptype-update into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m30s Details CI/CD Pipeline / deploy-staging (push) Successful in 6m16s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #569	2024-06-04 08:32:54 +02:00
philipp	c916381fb0	Merge pull request 'fix-spaces' (#567 ) from fix-spaces into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m59s Details CI/CD Pipeline / deploy-staging (push) Successful in 6m43s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #567	2024-06-02 14:53:06 +02:00
philipp	7d44204533	Merge pull request 'remove debug println; better phrasing' (#565 ) from better-text into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m34s Details CI/CD Pipeline / deploy-staging (push) Successful in 6m10s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #565	2024-05-30 18:53:35 +02:00
philipp	145892104b	Merge pull request 'try' (#563 ) from better-text into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m53s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m43s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #563	2024-05-30 11:34:29 +02:00
philipp	6c0f0e6b04	Merge pull request 'better-text' (#562 ) from better-text into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m57s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m38s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #562	2024-05-30 11:12:03 +02:00
philipp	e004d81ca1	Merge pull request 'fix error' (#559 ) from fix-user-find-bug into staging All checks were successful CI/CD Pipeline / test (push) Successful in 10m14s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m28s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #559	2024-05-28 15:04:26 +02:00
philipp	41b5aff329	Merge pull request 'migrated-db' (#557 ) from migrated-db into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m18s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m44s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #557	2024-05-28 11:27:41 +02:00
philipp	76c8456380	Merge pull request 'rename role to manage_events' (#555 ) from reanme-to-event into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m43s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m26s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #555	2024-05-28 10:56:04 +02:00
philipp	95f43a73cf	Merge pull request 'reanme-to-event' (#553 ) from reanme-to-event into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m26s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m11s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #553	2024-05-28 10:06:48 +02:00
philipp	3d340bf803	Merge pull request 'case-insensitive-auth' (#549 ) from case-insensitive-auth into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m27s Details CI/CD Pipeline / deploy-staging (push) Successful in 6m54s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #549	2024-05-27 08:33:03 +02:00
philipp	ae096ad602	Merge pull request 'better spacing' (#547 ) from fix-spacing into staging All checks were successful CI/CD Pipeline / test (push) Successful in 10m7s Details CI/CD Pipeline / deploy-staging (push) Successful in 8m21s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #547	2024-05-26 18:47:51 +02:00
philipp	25d8b1ea7c	Merge pull request 'fix-spacing' (#545 ) from fix-spacing into staging All checks were successful CI/CD Pipeline / test (push) Successful in 10m18s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m50s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #545	2024-05-26 14:18:07 +02:00
philipp	410cd05acc	Merge pull request 'type' (#543 ) from type into staging All checks were successful CI/CD Pipeline / test (push) Successful in 10m25s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m52s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #543	2024-05-25 18:52:45 +02:00
philipp	972811c2cf	Merge pull request 'filter-logs' (#539 ) from filter-logs into staging All checks were successful CI/CD Pipeline / test (push) Successful in 10m8s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m35s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #539	2024-05-22 23:42:06 +02:00
philipp	e22d2d718e	Merge pull request 'fix-footer' (#537 ) from fix-footer into staging All checks were successful CI/CD Pipeline / test (push) Successful in 10m23s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m54s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #537	2024-05-22 22:51:39 +02:00
philipp	b55f122f1d	Merge pull request 'sanity-check-timing; fixes #488 ' (#535 ) from sanity-check-timing into staging Some checks failed CI/CD Pipeline / deploy-staging (push) Blocked by required conditions Details CI/CD Pipeline / deploy-main (push) Blocked by required conditions Details CI/CD Pipeline / test (push) Has been cancelled Details Reviewed-on: #535	2024-05-22 22:41:31 +02:00
philipp	d27489d714	Merge pull request 'automate-schnupper-mails' (#533 ) from automate-schnupper-mails into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m39s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m2s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #533	2024-05-22 08:51:39 +02:00
philipp	c340d1a916	Merge pull request 'reason-for-canceled-event' (#531 ) from reason-for-canceled-event into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m29s Details CI/CD Pipeline / deploy-staging (push) Successful in 5m29s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #531	2024-05-22 08:13:55 +02:00
philipp	e7732b9e96	Merge pull request 'fix-ci' (#528 ) from fix-ci into staging All checks were successful CI/CD Pipeline / test (push) Successful in 9m55s Details CI/CD Pipeline / deploy-staging (push) Successful in 7m20s Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #528	2024-05-22 00:24:22 +02:00
philipp	97dc9308bc	Merge pull request 'clippy' (#526 ) from clippy into staging Some checks failed CI/CD Pipeline / test (push) Failing after 1m2s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Has been skipped Details Reviewed-on: #526	2024-05-22 00:18:35 +02:00