Skip to content

Commit 144e2cf

Browse files
committed
Merge branch 'master' into chris/FAL-4282-max-blocks-per-content
2 parents b620588 + 42acb53 commit 144e2cf

File tree

136 files changed

+3364
-2072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+3364
-2072
lines changed

README.rst

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Cloning and Setup
4040
4141
2. Use the version of Node specified in the ``.nvmrc`` file.
4242

43-
The current version of the micro-frontend build scripts supports node 20.
43+
The current version of the micro-frontend build scripts supports the version of Node found in ``.nvmrc``.
4444
Using other major versions of node *may* work, but this is unsupported. For
4545
convenience, this repository includes an ``.nvmrc`` file to help in setting the
4646
correct node version via `nvm <https://github.com/nvm-sh/nvm>`_.
@@ -97,7 +97,7 @@ Troubleshooting
9797
9898
* If tutor-mfe is not starting the authoring MFE in development mode (eg. `tutor dev start authoring` fails), it may be due to
9999
using a tutor version that expects the MFE name to be frontend-app-course-authoring (the previous name of this repo). To fix
100-
this, you can rename the cloned repo directory to frontend-app-course-authoring. More information can be found in
100+
this, you can rename the cloned repo directory to frontend-app-course-authoring. More information can be found in
101101
`this forum post <https://discuss.openedx.org/t/repo-rename-frontend-app-course-authoring-frontend-app-authoring/13930/2>`__.
102102

103103

@@ -175,10 +175,6 @@ Feature: New Proctoring Exams View
175175
Requirements
176176
------------
177177

178-
* ``edx-platform`` Django settings:
179-
180-
* ``ZENDESK_*``: necessary if automatic ZenDesk ticket creation is desired
181-
182178
* `edx-exams <https://github.com/edx/edx-exams>`_: for this feature to work, the ``edx-exams`` IDA must be deployed and its API accessible by the browser
183179

184180
Configuration
@@ -196,7 +192,6 @@ In Studio, a new item ("Proctored Exam Settings") is added to "Other Course Sett
196192
* Enable proctored exams for the course
197193
* Allow opting out of proctored exams
198194
* Select a proctoring provider
199-
* Enable automatic creation of Zendesk tickets for "suspicious" proctored exam attempts
200195

201196
Feature: Advanced Settings
202197
==========================
@@ -239,7 +234,7 @@ Configuration
239234

240235
In additional to the standard settings, the following local configuration items are required:
241236

242-
* ``ENABLE_TAGGING_TAXONOMY_PAGES``: must be enabled (which it is by default) in order to actually enable/show the new
237+
* ``ENABLE_TAGGING_TAXONOMY_PAGES``: must be enabled (which it is by default) in order to actually enable/show the new
243238
Tagging/Taxonomy functionality.
244239

245240

@@ -273,7 +268,7 @@ Troubleshooting
273268
========================
274269

275270
* ``npm ERR! gyp ERR! build error`` while running npm install on Macs with M1 processors: Probably due to a compatibility issue of node-canvas with M1.
276-
271+
277272
Run ``brew install pkg-config pixman cairo pango libpng jpeg giflib librsvg`` before ``npm install`` to get the correct versions of the dependencies.
278273
If there is still an error, look for "no package [...] found" in the error message and install missing package via brew.
279274
(https://github.com/Automattic/node-canvas/issues/1733)

0 commit comments

Comments
 (0)