Skip to content
This repository was archived by the owner on Jul 13, 2021. It is now read-only.

Commit 84b1b96

Browse files
authored
Merge master into 9.x (#1947)
* Docker (#1930) * Fixing cloze feedback (#1931) * Drop zone unfinished copy list (#1925) * Add unfinished copy list * [DropzoneBundle] Add closing copy and reminder buttons * [DropzoneBundle] Translation editing * [DropzoneBundle] Translation editing * [DropzoneBundle] Adding link to drop confirmation page in reminder body text * Fixes answer schema (#1933) * [ExoBundle] fixes answers migration (#1934) * [ExoBundle] fixes cloze migration (#1935) * path-pjax * [ExoBundle] fixes cloze migration * Revert "path-pjax" This reverts commit e6849d3. * Fixes tests for exo (#1938) * Dutch7 (#1932) * Latest changes to Dutch files * Latest changes to import in Weblate * [ExoBundle] fixes cloze migrations (#1941) * [ExoBundle] fixes migrations * fixes * fixes * fix * fixes * fixes cloze answers migration * Cloze paper end (#1944) * [ExoBundle] fixes migrations * fixes * fixes * fix * Fixing cloze migration
1 parent 78e8f5d commit 84b1b96

File tree

37 files changed

+558
-264
lines changed

37 files changed

+558
-264
lines changed

.docker/mysql/my.conf

-3
This file was deleted.

.docker/web/Dockerfile

-65
This file was deleted.

.docker/web/config/php.ini

-7
This file was deleted.

.docker/web/entrypoint.sh

-26
This file was deleted.

.docker/web/files/apache2/claroline-ssl.conf

-5
This file was deleted.

.docker/web/files/apache2/claroline.conf

-15
This file was deleted.

docker-compose.yml

-59
This file was deleted.

main/core/Resources/translations/log.nl.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ group: Groep
55
log_add_user: Gebruiker toevoegen
66
log_change_right: Verandering van rechten
77
log_change_set: Lijst van de bewerkte eigenschappen
8-
log_context: Context :
8+
log_context: 'Contekst :'
99
log_copy: Kopie
1010
log_copy_source: Bron van de kopie
1111
log_create: Maken

plugin/agenda/Resources/translations/agenda.fr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ picker:
123123
switch_mode: Changer de mode
124124
remove_event: Supprimer un évènement
125125
remove_event_confirm: Êtes-vous sûr de vouloir supprimer cet évènement ?
126-
send_message_content: Vous avez reçu une invitation à rejoindre un évènement de la part de %Sender%.<br> Cette évènement se déroule du %Start% au %End% avec comme description: %Description%.<br><a href="%JoinAction%" class="btn btn-success">Participer</a> <a href="%MaybeAction%" class="btn btn-primary">Peut-être</a> <a href="%ResignAction%" class="btn btn-danger">Ne participe pas</a>
126+
send_message_content: Vous avez reçu une invitation à rejoindre un évènement de la part de %Sender%. Cet évènement se déroule du %Start% au %End% avec comme description: %Description%.<br><a href="%JoinAction%" class="btn btn-success">Participer</a> <a href="%MaybeAction%" class="btn btn-primary">Peut-être</a> <a href="%ResignAction%" class="btn btn-danger">Ne participe pas</a>
127127
send_message_object: Invitation à un évènement: %EventName%
128128
start_date: Date de début
129129
show_task_only: Ne montrer que les tâches
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
blog_post_need_title: 'Gelieve de titel van het artikel te vermelden.'
2+
blog_post_need_content: 'Gelieve de inhoud van het artikel te vermelden.'

0 commit comments

Comments
 (0)