Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DONE] Feature dressing video #1006

Merged
merged 56 commits into from
Jan 17, 2024
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
e1d96cd
feature_dressing_video
vsabatie Nov 23, 2023
2d86e0a
make lang
vsabatie Nov 23, 2023
4e3fd61
flake
vsabatie Nov 23, 2023
02a598a
unit test + pydoc
vsabatie Nov 27, 2023
3f8b4fd
Unit tests
vsabatie Nov 27, 2023
3548cfb
fix dark theme
vsabatie Nov 28, 2023
64cf9d9
some fixes
vsabatie Nov 30, 2023
5e8c259
Create migrations/__init__.py
vsabatie Dec 1, 2023
754b6d4
fix encode when add watermark only
vsabatie Dec 1, 2023
9487421
fix
vsabatie Dec 4, 2023
830e479
Remove field site
vsabatie Dec 4, 2023
c2094cc
add tests for dressing utilities
vsabatie Dec 4, 2023
817369d
fix
vsabatie Dec 4, 2023
4d17b82
Replace css by bootstrap classes
vsabatie Dec 5, 2023
8068b2c
add table-sm
vsabatie Dec 5, 2023
32d2005
Use path instead url
vsabatie Dec 5, 2023
a973973
fix
vsabatie Dec 5, 2023
3578ad7
fix flake
vsabatie Dec 5, 2023
b4ae3c4
remove id watermark
vsabatie Dec 5, 2023
5f4a163
fix
vsabatie Dec 12, 2023
e2a9e2b
fix flake
vsabatie Dec 12, 2023
0ca9f5a
fix
vsabatie Jan 8, 2024
07dc9e5
fix panel admin
vsabatie Jan 9, 2024
6a514b7
fix flake
vsabatie Jan 9, 2024
d01d349
[DONE] Patch elasticsearch options (#1009)
CartierPierre Dec 18, 2023
5c5153d
Auto-update configuration files
invalid-email-address Dec 18, 2023
36bef46
[DONE] Feature import external video, add mediacad platform (#1014)
LoicBonavent Dec 18, 2023
660234c
Fixup. Format code with Black
invalid-email-address Dec 18, 2023
b8e837e
[DONE] Fix jsi18n (#1011)
Badatos Jan 4, 2024
016d562
[WIP] Fix CSS z-index for audio enrichment slide to keep them over th…
gcondess Jan 9, 2024
f9e21c9
Fixup. Format code with Prettier
invalid-email-address Jan 9, 2024
1188c8b
make lang
vsabatie Nov 23, 2023
ae8bfe5
some fixes
vsabatie Nov 30, 2023
b13a8c4
fix lang
vsabatie Jan 9, 2024
72931d0
Merge branch 'develop' into feature_dressing_video
vsabatie Jan 9, 2024
26d8632
improve test settigns to add use docker setting - default to true (#1…
ptitloup Jan 11, 2024
dbf4d8d
Fixup. Format code with Black
invalid-email-address Jan 11, 2024
7d3aa29
[DONE] WebTV - Add private field (#1016)
vsabatie Jan 15, 2024
c3dc7db
make lang
vsabatie Nov 23, 2023
cb0cf0c
some fixes
vsabatie Nov 30, 2023
6042cfb
fix
vsabatie Dec 4, 2023
4be42d0
fix
vsabatie Dec 4, 2023
7e52579
[DONE] Feature import external video, add mediacad platform (#1014)
LoicBonavent Dec 18, 2023
d0ea93d
Fixup. Format code with Black
invalid-email-address Dec 18, 2023
80f1de3
make lang
vsabatie Nov 23, 2023
2f69514
some fixes
vsabatie Nov 30, 2023
b247c4a
fix lang
vsabatie Jan 9, 2024
1403439
conflits lang
vsabatie Jan 16, 2024
cfee71d
compilemessages
vsabatie Jan 16, 2024
070e4ea
Squashed commit of the following:
vsabatie Jan 16, 2024
9deb2d2
fix
vsabatie Jan 16, 2024
7567780
fix completion
vsabatie Jan 16, 2024
873b6cb
fix
vsabatie Jan 16, 2024
3477fa1
lang
vsabatie Jan 16, 2024
1837a16
fix
vsabatie Jan 17, 2024
21c7d4e
change Agreement required
vsabatie Jan 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix lang
vsabatie committed Jan 16, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit b247c4a4e08ca94312253d5be1b56c276e4684c1
18 changes: 7 additions & 11 deletions pod/locale/fr/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
@@ -1402,7 +1402,6 @@ msgstr "Contenu"

#: pod/completion/models.py pod/completion/templates/overlay/list_overlay.html
#: pod/dressing/models.py pod/dressing/templates/my_dressings.html
#: pod/dressing/templates/my_dressings.html
#: pod/dressing/templates/video_dressing.html
msgid "Position"
msgstr "Position"
@@ -2144,10 +2143,6 @@ msgstr "Appliquer"
msgid "The changes have been saved."
msgstr "Les modifications ont été sauvegardées."

#: pod/dressing/views.py
msgid "Edit the dressing"
msgstr "Éditer l'habillage"

#: pod/dressing/views.py
msgid "The dressing has been deleted."
msgstr "L’habillage a été supprimé."
@@ -2885,9 +2880,10 @@ msgstr ""
"enregistrement."

#: pod/import_video/views.py
#, python-format
msgid ""
"This video '%(name)s' was uploaded to Pod; its origin is %(type)s: <a href="
"\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"
"This video '%(name)s' was uploaded to Pod; its origin is %(type)s: <a "
"href=\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"
msgstr ""
"Cette vidéo « %(name)s » a été téléversée sur Pod ; son origine est "
"%(type)s : <a href=\"%(url)s\" target=\"_blank\">%(url)s</a><br><br>%(desc)s"
@@ -3379,7 +3375,6 @@ msgid "Heartbeats"
msgstr "Signaux"

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html
msgid "Send message"
msgstr "Envoyer un message"

@@ -3397,12 +3392,10 @@ msgid "Message"
msgstr "Message"

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html
msgid "You must be authenticated to send a message."
msgstr "Vous devez être authentifié pour envoyer un message."

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html pod/main/templates/aside.html
#: pod/live/templates/bbb/bbb_form.html pod/main/templates/aside.html
msgid "Submit"
msgstr "Envoyer"

@@ -8951,6 +8944,9 @@ msgstr "Résultats de la recherche"
msgid "Esup-Pod xAPI"
msgstr "xAPI Esup-Pod"

#~ msgid "Edit the dressing"
#~ msgstr "Éditer l'habillage"

#~ msgid "watermark"
#~ msgstr "filigrane"

47 changes: 15 additions & 32 deletions pod/locale/nl/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
@@ -1943,10 +1943,6 @@ msgstr ""
msgid "Deleting the dressing"
msgstr ""

#: pod/dressing/templates/dressing_delete.html
msgid "Deleting the dressing"
msgstr ""

#: pod/dressing/templates/dressing_delete.html
#, python-format
msgid "Deleting the dressing \"%(vtitle)s\""
@@ -2044,10 +2040,6 @@ msgstr ""
msgid "The changes have been saved."
msgstr ""

#: pod/dressing/views.py
msgid "Edit the dressing"
msgstr ""

#: pod/dressing/views.py
msgid "The dressing has been deleted."
msgstr ""
@@ -3147,7 +3139,6 @@ msgid "Heartbeats"
msgstr ""

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html
msgid "Send message"
msgstr ""

@@ -3162,12 +3153,10 @@ msgid "Message"
msgstr ""

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html
msgid "You must be authenticated to send a message."
msgstr ""

#: pod/live/templates/bbb/bbb_form.html
#: pod/live/templates/meeting/bbb_form.html pod/main/templates/aside.html
#: pod/live/templates/bbb/bbb_form.html pod/main/templates/aside.html
msgid "Submit"
msgstr ""

@@ -3543,6 +3532,14 @@ msgstr ""
msgid "To delete the event, please checked in and click send."
msgstr ""

#: pod/live/templates/live/event_delete.html
#: pod/meeting/templates/meeting/delete.html
#: pod/playlist/templates/playlist/delete.html
#: pod/recorder/templates/recorder/record_delete.html
#: pod/video/templates/videos/video_delete.html
msgid "Agree required"
msgstr ""

#: pod/live/templates/live/event_edit.html
#: pod/live/templates/live/event_immediate_edit.html
msgid ""
@@ -3662,12 +3659,6 @@ msgstr ""
msgid "Past events"
msgstr ""

#: pod/live/templates/meeting/bbb_form.html
msgid ""
"You can send a message (100 characters maximum) to the speakers/trainers. "
"They will receive it in few seconds."
msgstr ""

#: pod/live/utils.py
#, python-format
msgid "Registration of event #%(content_id)s"
@@ -5440,18 +5431,6 @@ msgstr ""
msgid "occurrences"
msgstr ""

#: pod/meeting/templates/meeting/webinary_options_modal_form.html
msgid "Enable the chat"
msgstr ""

#: pod/meeting/templates/meeting/webinary_options_modal_form.html
msgid "enable_chat"
msgstr ""

#: pod/meeting/templates/meeting/webinary_options_modal_form.html
msgid "Show chat"
msgstr ""

#: pod/meeting/utils.py
#, python-format
msgid "A new Big Blue Button recording for '%(name)s' meeting is available"
@@ -6525,8 +6504,8 @@ msgstr ""
#: pod/video/templates/videos/video-element.html
msgid ""
"To view this video please enable JavaScript, and consider upgrading to a web "
"browser that <a href=\"https://videojs.com/html5-video-support/\" target="
"\"_blank\">supports HTML5 video</a>"
"browser that <a href=\"https://videojs.com/html5-video-support/\" "
"target=\"_blank\">supports HTML5 video</a>"
msgstr ""

#: pod/recorder/templates/recorder/link_record.html
@@ -7025,6 +7004,10 @@ msgid ""
"platform."
msgstr ""

#: pod/video/models.py
msgid "Select one or more groups who can upload video to this channel."
msgstr ""

#: pod/video/models.py
msgid "Additionals channels tab"
msgstr ""