[YONK-1845] Merge master into juniper branch. (openedx#2026)

* MCKIN-22396 Fix samesite cookie issue for Scorm Shell login flow (openedx#1879) * Adds django-cookies-sameseite middleware and settings to set SameSite=None for all secure cookies. * Fix `SameSite` cookie issue for LTI Provider. EW-449 (cherry picked from commit 28479a2) * Fix tests, conflicts resolved Co-authored-by: Jillian Vogel <jill@opencraft.com> Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu> * MCKIN-19584: add support for inline discussions translations (openedx#1863) * MCKIN-19584: add support for inline discussions translations (openedx#1830) * add support for inline discussions translations * mark js string for translation on discussions * ironwood fix * MCKIN-19840 EOC (End of course Journal) - None of the strings are translated in any language (openedx#1857) * MCKIN-19840 Add version bump for EOC 0.7.1 (openedx#1867) * MCKIN-23062 purge cohorts of deleted groups * MCKIN-23098 404 error on opening the module having EOC with no translations (openedx#1870) * MCKIN-23098 404 error on opening the module having EOC with no translations integrated * fix typo and chinese translation on discussions page (openedx#1875) * Fix mismatching versions for api integration * security fixes patch * MCKIN-23604 Match fork code with upstream (openedx#1880) * [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874) * MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871) * MCKIN-22507 Updated GW submission API to accept TA email id * Fixed typo * MCKIN-22509 VB * [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887) * MCKIN-22509 Added API to check/create anonymous user id (openedx#1882) * MCKIN-23249 Threw error if any of group has submissions (openedx#1884) * Added ignore condition for generated files * Release freeze (openedx#1895) * [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874) * MCKIN-22507 Updated GW submission API to accept TA email id (openedx#1871) * MCKIN-22507 Updated GW submission API to accept TA email id * Fixed typo * MCKIN-22509 VB * [MCKIN-22507] Review version bump for xblock-group-project-v2 (openedx#1887) * MCKIN-22509 Added API to check/create anonymous user id (openedx#1882) * MCKIN-23249 Threw error if any of group has submissions (openedx#1884) * Added ignore condition for generated files Co-authored-by: Piotr Surowiec <piotr@opencraft.com> Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com> Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com> Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com> * Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)" This reverts commit 5dad4f0. * Revert "[MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` (openedx#1874)" This reverts commit 5dad4f0. * MCKIN-23061 Fix enlarged buttons on studio (openedx#1892) * Revert "Updated subsections grade percentage to start rounding" This reverts commit fde830b. * MCKIN-22514 problem builder verion bump * [MCKIN-21879] Remove foreign keys from deprecated `progress-edx-platform-extensions` * [BB-2765] Add `reverse_sql` to `database_fixups/0002` migration * MCKIN-24492 version bump api-integration (openedx#1898) * MCKIN-21527 Problem Builder (FTE, Assessment, MCQ, MRQ) - On opening these modules, none of the text is translated on notifications dropdown. (openedx#1889) * MCKIN-21918 Inline discussion japanese buttons (openedx#1891) Co-authored-by: murad-hubib <murad.habib@arbisoft.com> * bump xblock problem-builder version to 3.5.1 (openedx#1899) * MCKIN-24501 api-integration version bump (openedx#1903) * Security patch from aug 26 (openedx#1894) Co-authored-by: Ned Batchelder <ned@edx.org> * sustaining xss security fixes 3 (openedx#1893) Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com> * Sustaining security fixes 4 & 5 (openedx#1901) Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com> * MCKIN-24663 sorting alphanumeric list (openedx#1908) * MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917) * MCKIN-24559 - Organization extensions VB (openedx#1905) Releasing `v2.0.6` * MCKIN-24565 - Organizations extensions VB (openedx#1907) Releasing `v2.0.7` * MCKIN-24511 Projects extension VB (openedx#1915) * Resolved conflits * Resloved conflicts * MCKIN-21919 Inline Discussion - The following strings are not translated in Korean Language (openedx#1906) * Resolved conflict * Resolved conflicts * MCKIN-24633 releasing problem builder v3.5.2 (openedx#1917) * MCKIN-25170 translation for review grade * MCKIN-24296 missing translations added (openedx#1926) * missing translations added (openedx#1927) * MCKIN-25091 fixed Discussion post Anonymously (openedx#1925) * VB for VR and eoc (openedx#1933) * MCKIN-25752 discussion and question posted translations (openedx#1934) * MCKIN-26123 Plateform Issues (openedx#1939) * MCKIN-26123 Plateform Issues (openedx#1940) * MCKIN-26123 Drag and Drop Version update (openedx#1942) * MCKIN-23104 version upgrade of EOC journal (openedx#1941) * MCKIN-26505 Version update of Problem Builder (openedx#1945) * MCKIN-26123 Drag&Drop Version Update (openedx#1947) * MCKIN-26589 Integrate translations of FIND DISCUSSIONS for main discussions page for all languages (openedx#1949) * [v1.54.0] complied mo files * MCKIN-24786 - api-integration version bump * MCKIN-26967 - EOC VB * MCKIN-23037 - Ooyala xblock version bump * MCKIN-27119 - Missing strings added * MCKIN-26468 - projects extensions VB (openedx#1951) Releasing `v3.0.4` * MCKIN-24382 Scorm VB (openedx#1966) * Scorm VB * MCKIN-26967 EOC VB * MCKIN-24385: bump xblock diagnostic feedback version to v0.4.0 (openedx#1971) * MCKIN-24468 McKA - Update Scorm xblock to Python 3.5 fix bug (openedx#1979) * MCKIN-24385 bump xblock-diagnosticfeedback version to v0.4.1 (openedx#1987) * MCKIN-26471 API integration VB (openedx#1995) * bump xblock scorm version to v3.2.1 (openedx#1996) * MCKIN-26850 EOC-journal version bump (openedx#2001) * MCKIN-24383 & 24384 VB for GP v2 and Adventure (openedx#1961) * MCKIN-24383 GW v2 version bump (openedx#2000) * vb gp (openedx#2002) * vb gp (openedx#2004) * MCKIN-28139 Pinned pyopenssl version to 18.0.0 * vb gp (openedx#2004) * MCKIN-28122 Traslations for all languages (openedx#2015) * MCKIN-28123 vb gp (openedx#2018) * Versions update. Co-authored-by: Moeez Zahid <moeezzahid1996@gmail.com> Co-authored-by: Jillian Vogel <jill@opencraft.com> Co-authored-by: Zachary Trabookis <ztraboo@clemson.edu> Co-authored-by: Saqib <msaqib52@gmail.com> Co-authored-by: Wasif ur Rehman <wasifarbisoft@users.noreply.github.com> Co-authored-by: Mudassir Hafeez <mudassir.hafeez@arbisoft.com> Co-authored-by: Shafqat Farhan <shafqat.farhan@arbisoft.com> Co-authored-by: ihtram <iulhaq@edx.org> Co-authored-by: Piotr Surowiec <piotr@opencraft.com> Co-authored-by: Nasir Hussain <nasirhjafri@gmail.com> Co-authored-by: Sohaib Aslam <sohaib.aslam@arbisoft.com> Co-authored-by: Agrendalath <piotr@surowiec.it> Co-authored-by: Mudassir Hafeez <41048311+mudassir-hafeez@users.noreply.github.com> Co-authored-by: murad-hubib <murad.habib@arbisoft.com> Co-authored-by: Ned Batchelder <ned@edx.org> Co-authored-by: Ali-D-Akbar <aliakbarit019@gmail.com> Co-authored-by: Naeem Ilyas <naeem-ilyas@live.com> Co-authored-by: Muhammad Usman <43761905+musmanmalik@users.noreply.github.com> Co-authored-by: Mudassir Hafeez <mudasir5761@gmail.com>
open-craft · Dec 16, 2020 · 47bb0c3 · 47bb0c3
1 parent 9edbeea
commit 47bb0c3
Show file tree

Hide file tree

Showing 43 changed files with 1,343 additions and 1,913 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -73,13 +73,13 @@ jobs:
      - restore_cache:
               name: Restores cache if any of the requirements file have not changed since the previous run
               key: >-
-                virtual-environment-cache-v9
+                virtual-environment-cache-v13
                 -{{ checksum "requirements/edx/development.txt" }}
                 -{{ checksum "requirements/edx/custom.txt" }}
 
      - restore_cache:
          name: Restores cache if the package.json file have not changed since the previous run
-         key: virtual-environment-cache-v9-{{ checksum "package.json" }}
+         key: virtual-environment-cache-v13-{{ checksum "package.json" }}
 
      # Mirror what paver install_prereqs does.
      # After a successful build, CircleCI will
@@ -106,15 +106,15 @@ jobs:
 
      - save_cache:
          key: >-
-           virtual-environment-cache-v9
+           virtual-environment-cache-v13
            -{{ checksum "requirements/edx/development.txt" }}
            -{{ checksum "requirements/edx/custom.txt" }}
 
          paths:
             - ~/virtualenvs/venv-3.5.2
 
      - save_cache:
-         key: virtual-environment-cache-v9-{{ checksum "package.json" }}
+         key: virtual-environment-cache-v13-{{ checksum "package.json" }}
          paths:
             - node_modules
 

diff --git a/conf/locale/ar/LC_MESSAGES/django.mo b/conf/locale/ar/LC_MESSAGES/django.mo
diff --git a/conf/locale/ar/LC_MESSAGES/django.po b/conf/locale/ar/LC_MESSAGES/django.po
@@ -17152,13 +17152,13 @@ msgstr "عرض كل المشاركات"
 #. Translators: This is a menu option for showing only unread forum threads
 #: lms/templates/discussion/_thread_list_template.html
 msgid "Unread posts"
-msgstr ""
+msgstr "المنشورات غير المقروءة"
 
 #. Translators: This is a menu option for showing only unanswered forum
 #. question threads
 #: lms/templates/discussion/_thread_list_template.html
 msgid "Unanswered posts"
-msgstr ""
+msgstr "المنشورات غير المُجاب عنها"
 
 #. Translators: This is a menu option for showing only forum threads flagged
 #. for abuse
@@ -25950,3 +25950,17 @@ msgid ""
 "distinct password(s) before reusing a previous password."
 msgstr "إنك تعيد استخدام كلمة مرور استخدمتها مؤخرًا. يجب"
 " أن يكون لديك {0} كلمة (كلمات) مرور مختلفة قبل إعادة استخدام كلمة مرور سابقة"
+
+#: lms/lib/utils.py:8
+#, python-format
+msgid ""
+"File type '%(detected_type)s' is not allowed. Allowed types are: "
+"'%(allowed_types)s'."
+msgstr "نوع الملف '%(detected_type)s' غير مسموح به. الأنواع المسموح بها هي: '%(allowed_types)s'."
+
+#: lms/lib/utils.py:13
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr "امتداد الملف '%(extension)s' غير مسموح به. الامتدادات المسموح بها هي: '%(allowed_extensions)s'."
diff --git a/conf/locale/de_DE/LC_MESSAGES/django.mo b/conf/locale/de_DE/LC_MESSAGES/django.mo
diff --git a/conf/locale/de_DE/LC_MESSAGES/django.po b/conf/locale/de_DE/LC_MESSAGES/django.po
@@ -27672,3 +27672,19 @@ msgid ""
 "distinct password(s) before reusing a previous password."
 msgstr "Sie verwenden ein Passwort, das Sie vor Kurzem bereits verwendet haben. Sie "
 "müssen {0} unterschiedliche Passwörter haben, bevor Sie ein vorheriges Passwort erneut verwenden"
+
+#: lms/lib/utils.py:8
+#, python-format
+msgid ""
+"File type '%(detected_type)s' is not allowed. Allowed types are: "
+"'%(allowed_types)s'."
+msgstr ""
+"Dateityp '%(detected_type)s' ist nicht erlaubt. Erlaubte Typen sind: '%(allowed_types)s'."
+
+#: lms/lib/utils.py:13
+#, python-format
+msgid ""
+"File extension '%(extension)s' is not allowed. Allowed extensions are: "
+"'%(allowed_extensions)s'."
+msgstr ""
+"Dateiendung '%(extension)s' ist nicht erlaubt. Erlaubte Endungen sind: '%(allowed_extensions)s'."
diff --git a/conf/locale/de_DE/LC_MESSAGES/djangojs.mo b/conf/locale/de_DE/LC_MESSAGES/djangojs.mo