 ben8andben8
|
3fc08cbd4e
|
Merge branch 'cherry-pick-d4252c12' into 'master'
Merge branch '103-verschiedene-lernmodi' into 'master'
Closes #103
See merge request enrichment-2024/qivip!51
|
2025-04-18 18:07:03 +02:00 |
|
|
ben8
|
4cf6f45daf
|
Merge branch 'cherry-pick-d4252c12' into 'master'
Merge branch '103-verschiedene-lernmodi' into 'master'
Closes #103
See merge request enrichment-2024/qivip!51
|
2025-04-18 14:13:18 +00:00 |
|
|
ben8
|
d2ad0f041f
|
Edit question_host.html
|
2025-04-18 14:11:57 +00:00 |
|
|
ben8
|
bcdfebf791
|
Merge branch '103-verschiedene-lernmodi' into 'master'
Resolve "verschiedene Lernmodi"
Closes #103
See merge request enrichment-2024/qivip!47
(cherry picked from commit d4252c1297)
5b4c76a1 Zwischenstand Lernmodus
4209dcbc Merge branch 'master' into 103-verschiedene-lernmodi
9fb9ab91 Lernfunktion
e22ea409 Lernmodus verbessert und Testmodus entfernt
2052a702 Merge branch 'master' into '103-verschiedene-lernmodi'
Co-authored-by: ben8 <ben_ollech@bessermailer.de>
|
2025-04-18 14:00:29 +00:00 |
|
|
ben8
|
937fd4a2e4
|
Merge branch 'revert-d4252c12' into 'master'
Revert "Merge branch '103-verschiedene-lernmodi' into 'master'"
See merge request enrichment-2024/qivip!50
|
2025-04-18 13:51:58 +00:00 |
|
|
ben8
|
a9343f285a
|
Revert "Merge branch '103-verschiedene-lernmodi' into 'master'"
This reverts merge request !47
|
2025-04-18 13:48:23 +00:00 |
|
|
ben8
|
d4252c1297
|
Merge branch '103-verschiedene-lernmodi' into 'master'
Resolve "verschiedene Lernmodi"
Closes #103
See merge request enrichment-2024/qivip!47
|
2025-04-18 13:28:25 +00:00 |
|
|
ben8
|
2052a702f0
|
Merge branch 'master' into '103-verschiedene-lernmodi'
# Conflicts:
# django/templates/play/game/question_host.html
|
2025-04-18 13:28:04 +00:00 |
|
|
ben8
|
a0292ce409
|
Startbutton-min.1Frage
|
2025-04-18 15:25:29 +02:00 |
|
|
Juhn-Vitus Saß
|
73cd52ea3d
|
Merge branch '76-die-lange-der-zeit-pro-frage-anpassen' into 'master'
Resolve "Die Länge der Zeit Pro Frage anpassen."
Closes #76
See merge request enrichment-2024/qivip!36
|
2025-04-18 11:01:34 +00:00 |
|
|
Juhn-Vitus Saß
|
ffe636c6c7
|
Merge branch 'master' into '76-die-lange-der-zeit-pro-frage-anpassen'
# Conflicts:
# django/library/forms.py
|
2025-04-18 11:00:52 +00:00 |
|
|
ben8
|
e22ea40910
|
Lernmodus verbessert und Testmodus entfernt
|
2025-04-18 12:48:35 +02:00 |
|
|
Juhn-Vitus Saß
|
e269264f03
|
Front End einbindung von Zeitauswahl
|
2025-04-18 12:05:50 +02:00 |
|
|
ben8
|
9fb9ab9198
|
Lernfunktion
|
2025-04-14 23:39:43 +02:00 |
|
|
ben8
|
4209dcbc2d
|
Merge branch 'master' into 103-verschiedene-lernmodi
|
2025-04-14 20:26:34 +02:00 |
|
|
ben8
|
70be6396aa
|
Merge branch '101-zwischenseite-nach-spielen-z-b-lernmodus-klassisches-moderieren' into 'master'
Resolve "Zwischenseite nach Spielen z.B. Lernmodus, klassisches Moderieren, ..."
Closes #101
See merge request enrichment-2024/qivip!45
|
2025-04-14 18:24:48 +00:00 |
|
|
ben8
|
5b4c76a1c8
|
Zwischenstand Lernmodus
|
2025-04-14 20:23:47 +02:00 |
|
|
ben8
|
9d9e1527f4
|
Merge branch '102-verbesserung-der-anti-spring-funktion-bei-library' into 'master'
Resolve "Verbesserung der "Anti-Spring" Funktion bei library!"
Closes #102
See merge request enrichment-2024/qivip!46
|
2025-04-14 13:12:44 +00:00 |
|
|
ben8
|
70741a5a34
|
#102 fix Springen
|
2025-04-14 15:12:16 +02:00 |
|
|
ben8
|
8022602fc5
|
Zwischenauswahl_Spielmodus
|
2025-04-14 14:44:55 +02:00 |
|
|
ben8
|
f0dcc2baad
|
vorrübergehende_Lösung-Suchleiste
|
2025-04-13 18:30:45 +02:00 |
|
|
ben8
|
2221c99ad7
|
Merge branch '99-suchleiste-design' into 'master'
Resolve "Suchleiste design abstand"
Closes #99
See merge request enrichment-2024/qivip!43
|
2025-04-13 16:17:21 +00:00 |
|
|
ben8
|
d84b44252e
|
Darstellung Suchleiste
|
2025-04-13 18:16:58 +02:00 |
|
|
ben8
|
5a719de8ee
|
Merge branch '55-quiz-zu-deinen-favoriten' into 'master'
Resolve "Quiz zu deinen Favoriten"
Closes #55
See merge request enrichment-2024/qivip!39
|
2025-04-13 15:33:20 +00:00 |
|
|
ben8
|
7c8c142e34
|
Richtige Sortierung!
|
2025-04-13 17:31:38 +02:00 |
|
|
ben8
|
093b0a7f83
|
Merge branch 'master' into 55-quiz-zu-deinen-favoriten
|
2025-04-13 17:07:11 +02:00 |
|
|
ben8
|
a4442fe12e
|
Merge branch '98-betreten-form-reparieren' into 'master'
Resolve "Betreten form reparieren!"
Closes #98
See merge request enrichment-2024/qivip!42
|
2025-04-13 15:01:52 +00:00 |
|
|
ben8
|
a59df8dd62
|
#98 plus besser Darstellung der Suchleiste
|
2025-04-13 17:01:28 +02:00 |
|
|
ben8
|
80390de6dc
|
Merge branch '96-suchleiste-uberall-anzeigen' into 'master'
Resolve "Suchleiste überall anzeigen"
Closes #96
See merge request enrichment-2024/qivip!41
|
2025-04-13 11:10:27 +00:00 |
|
|
ben8
|
5f05964b1b
|
Suchleiste_überall #96
|
2025-04-13 13:09:39 +02:00 |
|
|
ben8
|
7e321af48c
|
404 Fehler Seite-vorbereitet!
|
2025-04-13 12:44:12 +02:00 |
|
|
ben8
|
d53240c710
|
Favoriten_nur_wenn_angemeldet!
|
2025-04-11 20:29:55 +02:00 |
|
|
ben8
|
1f3b551b94
|
Favoriten
|
2025-04-11 19:31:12 +02:00 |
|
|
ben8
|
2a7e39bbd0
|
Favoritenfunktion! #55
|
2025-04-11 18:18:34 +02:00 |
|
|
ben8
|
04ce8104fe
|
Fehler_behonben
|
2025-04-10 20:29:28 +02:00 |
|
|
ben8
|
7ce0e6e9dd
|
Zwischenstand_Favoriten
|
2025-04-10 19:55:11 +02:00 |
|
|
ben8
|
b0782868b8
|
Merge branch '10-die-tags-loschen' into 'master'
Resolve "die "Tags" Löschen"
Closes #10
See merge request enrichment-2024/qivip!38
|
2025-04-10 14:10:13 +00:00 |
|
|
ben8
|
a39c944f10
|
tags_gelöcscht+status_versteckt_entfernt
|
2025-04-10 16:09:51 +02:00 |
|
|
ben8
|
655e2a2e5d
|
Merge branch '67-spiel-starten-button-in-den-bearbeitungsmodus-hinzufugen' into 'master'
Resolve "Spiel Starten Button in den Bearbeitungsmodus hinzufügen!!!!!!!!!!!!!!!!!!"
Closes #67
See merge request enrichment-2024/qivip!37
|
2025-04-10 13:54:02 +00:00 |
|
|
ben8
|
087d4cdddd
|
#67 Spiel_button_beiEditInterface_und_kldesignchanges
|
2025-04-10 15:47:47 +02:00 |
|
|
ben8
|
77714d22a9
|
Zeit_bisher_im_Backend #76
|
2025-04-10 14:43:43 +02:00 |
|
|
nik8
|
f405016f96
|
zwischenstand
|
2025-04-09 14:22:46 +02:00 |
|
|
ben8
|
145d339ae1
|
Merge branch '80-kleine-design-verbesserungen' into 'master'
Resolve "kleine Design Verbesserungen!"
Closes #80
See merge request enrichment-2024/qivip!35
|
2025-04-07 17:37:50 +00:00 |
|
|
ben8
|
4e6de6fe85
|
Design
|
2025-04-07 19:36:42 +02:00 |
|
|
juhnsa
|
c4489c2301
|
Ergaenzung zu #68
|
2025-04-07 17:36:19 +02:00 |
|
|
ben8
|
bb60197c46
|
Merge branch '68-design-quizkopieren-plus-hinweis-wenn-quiz-kopiert' into 'master'
Resolve "Design Quizkopierbutton"
Closes #68
See merge request enrichment-2024/qivip!32
|
2025-04-07 15:15:13 +00:00 |
|
|
Juhn-Vitus Saß
|
a89847f818
|
Merge branch '45-fehlermeldungen-in-play-app-wenn-spiel-nicht-gefunden-wurde' into 'master'
Resolve "Fehlermeldungen in Play App, wenn Spiel nicht gefunden wurde"
Closes #45
See merge request enrichment-2024/qivip!33
|
2025-04-07 15:01:34 +00:00 |
|
|
juhnsa
|
071e76b3af
|
Error message when quiz not found
|
2025-04-07 17:00:20 +02:00 |
|
|
Juhn-Vitus Saß
|
295c3aa6d5
|
Merge branch 'initial-game-logic' into 'master'
Initial game logic
Closes #33, #43, #52, and #66
See merge request enrichment-2024/qivip!31
|
2025-04-07 14:00:03 +00:00 |
|
|
ben8
|
2fab7683e1
|
hübscherer_button
|
2025-04-07 15:27:27 +02:00 |
|