Commit Graph

9682 Commits

Author SHA1 Message Date
Kyle McCormick
672f4465fc docs: slightly improve ./cms root folder readme 2022-01-04 15:07:04 -05:00
Kyle McCormick
5e30c725a1 fix: check CMS_CFG before STUDIO_CFG; prefer the latter 2022-01-04 15:07:04 -05:00
edX Transifex Bot
3cbc5b9cdc chore(i18n): update translations 2021-12-26 16:35:34 -05:00
connorhaugh
4d834b977f feat: add flags to studio for editors work (#29536)
Description
In order to support ongoing editor work we need to open blocks in the course_authoring MFE from studio. We are gating that rollout behind a flag. This work does that for each of the new blocks, as well as provides urls to do so.

Supporting information
List of flags:
new_core_editors.use_new_text_editor
new_core_editors.use_new_video_editor
new_core_editors.use_new_problem_editor

Documentation of those flags:
Planned Removal Work: https://openedx.atlassian.net/browse/TNL-9370
2021-12-21 10:55:23 -05:00
Ned Batchelder
66eae81add docs: comments about how pytest finds settings (#29623)
It took a while for me to understand why my setup.cfg setting was only
applying to some tests.  Hopefully these comments will save someone else
some confusion.
2021-12-21 10:47:59 -05:00
Jillian Vogel
1974bacadd refactor: deprecates runtime.xqueue in favor of the XQueueService
* Deprecates ModuleSystem.xqueue property
* Adds new XQueueService to provide the deprecated property values to the LMS runtime
  (Studio does not need the XQueueService.)
* Adds tests for new service and updates the ModuleSystemShim tests in LMS and Studio
* Fixes existing tests.
2021-12-20 15:41:42 +01:00
Jillian Vogel
e378e42bfa refactor: deprecate user-related ModuleSystem attributes
Deprecates these ModuleSystem attributes in favor of the user service:

* user_location
* get_real_user
* get_user_role

Related changes:

* Stores the user location into DjangoXBlockUserService's optional attribute as request_country_code
* Uses the student model's user_by_anonymous_it to fetch the (cached) real user
* Updates affected tests
2021-12-20 15:41:25 +01:00
Julia Eskew
05ff94a993 feat: Change the text of the Studio button to add an HTML component
to read "Text" and display a text icon instead of a "</>" icon.
2021-12-16 11:59:10 -05:00
Ned Batchelder
e39f9c503a build: suppress Django deprecation warnings (#29528)
Suppress them both in tests (via setup.py and pytest.ini)
and in management command & application runs
(via logsettings.py).

Developers aren't looking at these warnings; they'll be dealt with in a
formal process for upgrading Django.  Suppress them for now so that
important information isn't lost in the noise.
2021-12-15 10:45:12 -05:00
Jawayria
293edae5e6 Merge pull request #29573 from edx/jawayria/fix-url-cms
fix: replace 'django.conf.url()' with 'django.urls.re_path()'
2021-12-15 13:55:13 +05:00
Jawayria
13d502353a Merge pull request #29574 from edx/jawayria/fix-ugettext-cms1
fix: replace 'ugettext' with 'gettext' in cms
2021-12-15 13:54:57 +05:00
Jawayria
c1276cd122 Merge pull request #29577 from edx/jawayria/fix-ugettext-cms2
fix: replace 'ugettext' with 'gettext' in cms
2021-12-15 13:54:42 +05:00
Jawayria
323dd7184b Merge pull request #29578 from edx/jawayria/fix-ugettext-cms3
fix: replace 'ugettext' with 'gettext' in cms
2021-12-15 13:54:27 +05:00
Jawayria
c320d5cd1b fix: replace 'django.conf.url()' with 'django.urls.re_path()' 2021-12-14 19:53:24 +05:00
Jawayria
a1ff38819a fix: replace 'ugettext' with 'gettext' in cms 2021-12-14 19:51:13 +05:00
Jawayria
d1cd6e8b60 fix: replace 'ugettext' with 'gettext' in cms 2021-12-14 19:49:04 +05:00
Jawayria
70ae3e531a fix: replace 'ugettext' with 'gettext' in cms 2021-12-13 20:30:32 +05:00
Jawayria
79c0561935 fix: replace 'ugettext' with 'gettext' in cms 2021-12-13 20:25:05 +05:00
Jawayria
770230c366 Merge pull request #29419 from edx/jawayria/bom-2606-26
chore: Applied lint-amnesty on cms/djangoapps/contentstore/views
2021-12-13 14:47:20 +05:00
Jawayria
e8ba3bb6d3 Merge pull request #29420 from edx/jawayria/bom-2606-27
chore: Applied lint-amnesty on cms/djangoapps/contentstore
2021-12-13 12:47:04 +05:00
Jawayria
50bdf49a9d Merge pull request #29421 from edx/jawayria/bom-2606-28
chore: Applied lint-amnesty on cms
2021-12-13 12:46:54 +05:00
Jawayria
e8e2c9d3b0 Merge pull request #29422 from edx/jawayria/bom-2606-23
chore: Applied lint-amnesty on cms/djangoapps/contentstore
2021-12-13 12:46:40 +05:00
Jawayria
59df46ab52 Merge pull request #29423 from edx/jawayria/bom-2606-24
chore: Applied lint-amnesty on cms/djangoapps/contentstore/tests
2021-12-13 12:46:16 +05:00
Jawayria
4fdadbe147 Merge pull request #29424 from edx/jawayria/bom-2606-25
chore: Applied lint-amnesty on cms/djangoapps/contentstore/views
2021-12-13 12:45:56 +05:00
Jawayria
d2e2a39008 chore: Applied lint-amnesty on cms/djangoapps/contentstore/views 2021-12-10 19:21:28 +05:00
Jawayria
0e63c20f64 chore: Applied lint-amnesty on cms/djangoapps/contentstore 2021-12-10 19:20:37 +05:00
Jawayria
2cc55be846 chore: Applied lint-amnesty on cms 2021-12-10 19:18:53 +05:00
Jawayria
83ee27abaf chore: Applied lint-amnesty on cms/djangoapps/contentstore 2021-12-10 19:17:29 +05:00
Jawayria
c42e356f95 chore: Applied lint-amnesty on cms/djangoapps/contentstore/tests 2021-12-10 19:16:43 +05:00
Jawayria
02ee9ae2cc chore: Applied lint-amnesty on cms/djangoapps/contentstore/views 2021-12-10 19:15:29 +05:00
Jawayria
59631c4825 chore: Applied lint-amnesty on cms/djangoapps 2021-12-10 19:14:36 +05:00
Alex Bender
40cf9d654e fix: import+export management commands 2021-12-09 10:01:34 -05:00
edX requirements bot
bb20b17428 Python Requirements Update (#29516)
* chore: Updating Python Requirements

* fix: fix pylint issues

Co-authored-by: Mohammad Ahtasham ul Hassan <mohammad.ahtasham@arbisoft.com>
2021-12-08 14:13:27 +05:00
Zainab Amir
acf5add774 feat: add marketing email option on registration (#29397) 2021-12-07 17:16:28 +05:00
Abdurrehman
6c6cf0ad0b feat: external plugin integration in instructor dashboard (#29376)
* feat: external plugin integration fixes
2021-12-07 15:54:00 +05:00
Kshitij Sobti
9f4bc9900b feat: add discussions context to course blocks API (#29300)
Add a new course blocks transformer that adds discussion context for units.
2021-12-07 11:10:48 +05:00
edX Transifex Bot
ed73fd3b29 chore(i18n): update translations 2021-12-06 02:41:48 +05:00
Shafqat Farhan
84cba23c0b feat: VAN-666 - Reject new password that is detected as vulnerable on password reset 2021-12-03 19:19:21 +05:00
Ben Warzeski
2f4fedc237 feat: update min grade cutoff from 997 to 99 (#29475) 2021-12-01 10:29:29 -05:00
Jillian Vogel
ad5ad72273 [BD-13] Deprecate ModuleSystem.render_template (fixed) (#29354)
* refactor: deprecates ModuleSystem.render_template

in favor of the added MakoSystem render_template method.

Related changes:
* Adds the MakoService to the StudioEditModuleRuntime,
  PreviewModuleSystem, LmsModuleSystem, and XBlockRuntime
* MakoService constructor takes a `namespace_prefix` string, so that the
  CMS PreviewModuleSystem can render to LMS templates, without needing
  the special render_from_lms helper method.
* ModuleSystem.render_template becomes a read-only property, so the
  constructor calls and test module systems are updated accordingly.
* Adds tests for the MakoService and module system shims.

(cherry picked from commit 457f959356)

* refactor: use MakoService.render_template to remove deprecation warnings

from block code.

(cherry picked from commit 8d62d337f5)

* refactor: use MakoService.render_template to remove deprecation warnings

from test code.

(cherry picked from commit 26b43465a4)

* test: Adds a test to verify the bug introduced by the previous changes

The AuthoringMixin is automatically added to all XBlocks (see
settings.XBLOCK_MIXINS), and AuthoringMixin.visibility_view expects the
"mako" service.

This test verifies the bug by testing the PureXBlock, which does not
require the "mako" service, and so fails when the visibility_view is
rendered.

* fix: AuthoringMixin needs mako service

which fixes the visibility_view for XBlocks which don't explicitly
require the mako service.

Also removes the unneeded class property _services_requested from
AuthoringMixin and StudioEditableBlock. This property is better provided
by the XBlockMixin class.
2021-11-29 14:42:52 -05:00
edX Transifex Bot
0a73ac9089 chore(i18n): update translations 2021-11-29 02:41:27 +05:00
Kshitij Sobti
c8bd924e23 feat: Add support for using the discussions MFE UI instead of existing UI [BD-38] [TNL-9228] (#29285)
* feat: Add support for using the discussions MFE UI instead of existing UI

Adds a new course waffle flag that when set along with the discussions MFE URL shows the discussions MFE UI instead of the regular UI.

* test: add tests

* squash!: more consistent url name
2021-11-23 14:56:25 +05:00
Uzair Rasheed
f74c0e51cb Merge pull request #29364 from edx/allow-login-if-email-opt-in-enabled
feat: allow login if email opt-in is enabled
2021-11-22 13:02:11 +05:00
Abdurrehman
25f1640c58 fix: ALLOW_PUBLIC_ACCOUNT_CREATION flag does not show/hide signup btn above footer (#29261) 2021-11-22 11:31:54 +05:00
Kshitij Sobti
e8e8f4acbe feat!: Change the way tabs are ordered [BD-38] [TNL-9174] [BB-5076] (#29262)
* feat!: Change the way tabs are ordered
The change imposes a new ordering for tabs based on their new priority. When reordering tabs, this ordering will be maintained.

* fix: Apply suggestions from code review

Co-authored-by: Farhaan Bukhsh <farhaan@opencraft.com>

* fix: review feedback

Co-authored-by: Farhaan Bukhsh <farhaan@opencraft.com>
2021-11-22 11:17:30 +05:00
uzairr
f02fe4c203 feat: allow login if email opt-in is enabled
allow login to in-active users if email opt-in is enabled

Fixes: VAN-768
2021-11-22 10:53:33 +05:00
edX Transifex Bot
2e2701d82a chore(i18n): update translations 2021-11-22 02:41:48 +05:00
Ahtisham Shahid
78e115a05c fix: updated cache policy for import_status endpoint (#29342)
* fix: updated cache policy for import_status endpoint
2021-11-17 19:40:17 +05:00
Justin Lapierre
f6f3a79a15 Revert "[BD-13] Deprecate ModuleSystem.render_template" 2021-11-16 15:16:08 -05:00
Piotr Surowiec
4bf829dcbd fix: do not remove comments from XML during course import (#28557)
This is a follow-up to edx#1087, which reverted this change.
According to the PR comments, parsing strings with XML comments inside them was
causing errors. This does not seem to be the case anymore - these strings are
just hidden when the block is rendered, but they are not breaking XBlocks.
This also handles (ignores) the comments that could be added directly to the
LibraryContentBlock in the XML export by users.
2021-11-16 12:42:08 -05:00