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.

Sign up for GitHub

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

Jump to bottom

Update from main (production) #1386

Merged
merged 7 commits into from
Jan 15, 2024
Merged

Update from main (production) #1386

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1891f4b
fix: Arabic translation placeholders in progress page
amirtds Nov 17, 2023
28452ab
Merge pull request #1385 from appsembler/fix/arabic-translation-place…
amirtds Nov 21, 2023
e3ef74d
use temp Overhangio fork of py2neo
bryanlandia Dec 12, 2023
8cc1918
use py2neo-history package on PyPI to get older release
bryanlandia Dec 14, 2023
d066909
Merge pull request #1387 from appsembler/bugfix/py2neo-eol
bryanlandia Dec 14, 2023
a1d67c8
Sync Dockerfile.tutor with latest server-vars.yml for Tahoe prod
bryanlandia Jan 2, 2024
8ee7fb4
Merge pull request #1388 from appsembler/chore/dockerfile-sync-configs
bryanlandia Jan 2, 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
Binary file modified conf/locale/ar/LC_MESSAGES/django.mo
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion conf/locale/ar/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16825,7 +16825,7 @@ msgstr "استعراض عملية التقييم في Studio"

#: lms/templates/courseware/progress.html
msgid "Course Progress for '{username}' ({email})"
msgstr "تقدم الدورة ل '{اسم المستخدم}' ({عنوان البريد الالكتروني})"
msgstr "تقدم الدورة ل '{username}' ({email})"

#: lms/templates/courseware/progress.html
msgid "View Certificate"
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ pillow==7.1.2 # via -r requirements/edx/base.in, edx-enterprise, edx
pkgconfig==1.5.1 # via xmlsec
polib==1.1.0 # via edx-i18n-tools
psutil==1.2.1 # via -r requirements/edx/paver.txt, edx-django-utils
-e git+https://github.com/technige/py2neo[email protected]#egg=py2neo==3.1.2 # via -r requirements/edx/github.in # via -r requirements/edx/base.in
py2neo-history==3.1.2
pycontracts==1.8.12 # via -r requirements/edx/base.in, edx-user-state-client
pycountry==19.8.18 # via -r requirements/edx/base.in
pycparser==2.20 # via -r requirements/edx/../edx-sandbox/shared.txt, cffi
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ pkgconfig==1.5.1 # via -r requirements/edx/testing.txt, xmlsec
pluggy==0.13.1 # via -r requirements/edx/testing.txt, diff-cover, pytest, tox
polib==1.1.0 # via -r requirements/edx/testing.txt, edx-i18n-tools
psutil==1.2.1 # via -r requirements/edx/testing.txt, edx-django-utils
-e git+https://github.com/technige/py2neo[email protected]#egg=py2neo==3.1.2 # via -r requirements/edx/github.in # via -r requirements/edx/testing.txt
py2neo-history==3.1.2
py==1.8.1 # via -r requirements/edx/testing.txt, pytest, tox
pycodestyle==2.6.0 # via -r requirements/edx/testing.txt, flake8
pycontracts==1.8.12 # via -r requirements/edx/testing.txt, edx-user-state-client
Expand Down
1 change: 0 additions & 1 deletion requirements/edx/github.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ git+https://github.com/edx/openedx-chem.git@ff4e3a03d3c7610e47a9af08eb648d8aabe2
git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2
-e git+https://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev
-e git+https://github.com/jazkarta/edx-jsme.git@690dbf75441fa91c7c4899df0b83d77f7deb5458#egg=edx-jsme
-e git+https://github.com/technige/[email protected]#egg=py2neo==3.1.2

# The latest 2.0.0 release doesn't yet support Django 2.2, this commit from master does
-e git+https://github.com/jsocol/django-ratelimit.git@72edbe8949fbf6699848e5847645a1998f121d46#egg=ratelimit
Expand Down
4 changes: 3 additions & 1 deletion requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ pkgconfig==1.5.1 # via -r requirements/edx/base.txt, xmlsec
pluggy==0.13.1 # via -r requirements/edx/coverage.txt, diff-cover, pytest, tox
polib==1.1.0 # via -r requirements/edx/base.txt, -r requirements/edx/testing.in, edx-i18n-tools
psutil==1.2.1 # via -r requirements/edx/base.txt, edx-django-utils
-e git+https://github.com/technige/[email protected]#egg=py2neo==3.1.2 # via -r requirements/edx/github.in # via -r requirements/edx/base.txt
# modified from https://github.com/openedx/edx-platform/pull/33453
# for earlier pip version in use on Juniper release
py2neo-history==3.1.2
py==1.8.1 # via pytest, tox
pycodestyle==2.6.0 # via -r requirements/edx/testing.in, flake8
pycontracts==1.8.12 # via -r requirements/edx/base.txt, edx-user-state-client
Expand Down
Loading