Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
57,043 Commits 1 Branch 0 Tags
ea5194d96702a4e77bde7159f53d734cfec32124
Commit Graph

9283 Commits

Author SHA1 Message Date
David Ormsbee
ea5194d967 Merge pull request #25537 from open-craft/shimulch/bb-3158 
[MCKIN-26432] [BB-3158] Add Unit to breadcrumbs navigation
 2021-01-19 13:07:45 -05:00
Ali Akbar
38e2a5242e Merge pull request #216 from edx/IM/security-fixes-7 
Incident Management Security Fixes 7
 2021-01-19 19:26:45 +05:00
Ahtisham Shahid
b03fb3f3fc Fixed size of lti component in studio (#26075) 2021-01-15 20:22:59 +05:00
Shimul Chowdhury
e339cc1b07 Add Unit & Nested blocks to breadcrumbs 
hide links that has no url

Hide sequence nav in nested pages

Improve doc
 2021-01-15 18:49:01 +06:00
stvn
7a599311c3 Merge PR #26050 debug/search/indexing 
* Commits:
  Increase logging verbosity on update_search_index task
 2021-01-13 11:52:09 -08:00
stvn
a40feee9c7 Increase logging verbosity on update_search_index task 
to gain insight into CR-3119/TNL-7866.
We know that one or more errors are occuring during this job, but it's
not obvious what these errors are.
 2021-01-13 10:04:08 -08:00
David Ormsbee
098e047fce Merge pull request #25987 from edx/ormsbee/tnl-7636-xblock-access 
Check sequence-level gating in render_xblock (TNL-7636)
 2021-01-13 09:35:56 -05:00
David Ormsbee
5a149f0fe3 Enable timed/special exams and pre-reqs in devstack. 
These are common and useful enough features that it makes sense to
enable it for developers by default.
 2021-01-12 11:30:58 -05:00
Nizar
1e872d4e10 Adds support for enabling custom tinymce plugins in Studio's HTML editor (#25695) 2021-01-11 11:28:20 -05:00
azanbinzahid
469dc71f6d PROD-2003 2021-01-11 14:32:50 +05:00
azanbinzahid
3f1985361c PROD-1996 2021-01-11 14:32:50 +05:00
azanbinzahid
6e56d6e63c PROD-1994 2021-01-11 14:32:50 +05:00
azanbinzahid
98561cbae1 PROD-1937 2021-01-11 14:32:50 +05:00
azanbinzahid
39c0d96b14 PROD-1936 2021-01-11 14:32:50 +05:00
azanbinzahid
73a7ce0416 PROD-1935 2021-01-11 14:32:50 +05:00
Usman Khalid
9e38b17202 Convert ErrorModule and NonStaffErrorModule to XBlocks. (#25570) 2021-01-07 10:51:33 -05:00
Kyle McCormick
7d2f8de03b Add type annotations to backfill_orgs_and_org_courses 2021-01-06 16:00:41 -05:00
Kyle McCormick
599d663779 Add option to backfill org data as inactive 
Add an `--inactive` option to the
`bulk_add_orgs_and_org_courses` management
command, which causes the backfill to set
`active=False` on all rows created in the
Organization and OrganizationCourse tables.

This will lower the potential data
integrity risk to production systems
such as courses.edx.org.

Upgrade edx-organizations to 6.6.0

TNL-7774
 2021-01-06 16:00:41 -05:00
Kyle McCormick
70f910935c Improve backfill_orgs_and_org_courses output formatting (#25880) 
The output was previously surfaced via `log.info` calls.
Given that the command is reporting on thousands of records,
that ended up being very difficult to parse.
Instead, print one organization or org-course linkage
per line.

Add example run of command with output to command
class docstring.

TNL-7774
 2021-01-06 13:23:19 -05:00
Peter Pinch
285ec771bf fix: Remove CAS settings (#25330) 
part of DEPR-6
 2021-01-06 08:15:35 -05:00
Usman Khalid
75391262da [BD-04] Convert SplitTest XModule to XBlock. (#25696) 2021-01-05 09:55:14 -05:00
stvn
39acbf2f21 Implement a new configuration system for discussions plugins 
Additional details available in the attached decisions document.

Co-authored-by: Kshitij Sobti <kshitij@sobti.in>
Co-authored-by: stvn <stvn@mit.edu>
 2020-12-17 18:23:46 -08:00
Robert Raposa
de16529ab6 Merge pull request #25885 from regisb/regisb/fix-deprecated-waffle-usage 
[BD-21] Fix deprecated waffle usage
 2020-12-17 12:41:40 -05:00
Ned Batchelder
3abd0e8e62 Update the Open edX logo urls (#25898) 
The old URLs now serve the new logo, but at the old pixel size.  These
URLs serve the new logo at a natural pixel size.
 2020-12-16 15:30:55 -05:00
Muhammad Soban Javed
bd601cf3a6 Update celery routing for celery 4+ (#25567) 
* Update celery routing

- Used routing function instead of class
- Move task queues dictionary to Django settings
- Removed routing_key parameter
- Refactored routing for singleton celery instantiation

Co-authored-by: Awais Qureshi <awais.qureshi@arbisoft.com>
 2020-12-16 13:40:47 +05:00
Kyle McCormick
8b1162e6ae Clean up deprecated edx-platform imports of edxmako & util (#25684) 2020-12-15 09:04:03 -05:00
Régis Behmo
f29e415353 Fix deprecated usage of WaffleFlag.namespaced_flag_name 
As of edx-toggles==1.2.0, the `WaffleFlag.namespaced_flag_name`
attribute is deprecated in favour of `WaffleFlag.name`.
 2020-12-15 12:28:57 +01:00
Robert Raposa
1118f2d049 Merge pull request #25861 from edx/robrap/update-features-toggle-annotations 
update FEATURES toggle annotation names
 2020-12-11 13:01:27 -05:00
Robert Raposa
54044232b8 update FEATURES toggle annotation names 
Update toggle_name annotations from "XXX"
to "FEATURES['XXX']" to match the name
used by the toggle state endpoint so they
don't seem like two different toggles.
 2020-12-11 11:16:19 -05:00
Kyle McCormick
f5134e1201 Fix typo in backfill_orgs_and_org_courses dry-run call (#25859) 
Also, add test to confirm fix of typo.

TNL-7774
 2020-12-11 11:13:35 -05:00
Raul Gallegos
5279975483 [TNL-7771][LX-1409] sets blockstore values timeouts to avoid S3 links expiration (#25830) 2020-12-11 09:35:45 -05:00
Tim McCormack
0c57a02119 Enforce a Celery singleton across cms and lms by using shared module (#25840) 
This should prevent the issues we've seen recently where cms modules are
imported by the running lms process, resulting in two celery instances
being created and tasks intermittently being registered to the wrong
instance (and therefore effectively lost.)

In commit ab6bf348d4/PR #25822 we tried to ensure that only one or the
other of the instances was created by adding a startup check.
Unfortunately, there's an external shared library that refers directly
to the lms celery, causing a startup failure in cms, so we had to revert
it. Rather than waiting to fix that library, this commit collapses
the two instances together so that there is only ever one.
 2020-12-10 17:54:31 +00:00
Feanil Patel
68e4732590 Merge pull request #25829 from edx/feanil/enable_history_panel 
Enable keeping some request history in the debug toolbar.
 2020-12-10 11:28:17 -05:00
Tim McCormack
a9bcf22169 Revert "Only instantiate one celery app per process." 2020-12-10 14:14:42 +00:00
Feanil Patel
cdbbe077c2 Enable keeping some request history. 
This makes it easire to debug things like POST requests that would
otherwise not be easily debugged during development.
 2020-12-09 16:47:23 -05:00
Feanil Patel
ab6bf348d4 Only instantiate one celery app per process. 
Ticket: BOM-2086

Currently there are parts of the LMS that import content from the CMS
APP and vice-versa.  When this happens, we end up with 2 instances of
the celery app and some tasks get registered to the wrong one. The
tasks that were getting registered to the wrong one are never able to
run and result in lots of production errors on celery workers.

The timing of the CMS celery app instantiation is non deterministic
so different tasks get lost depending on when it's imported by some
code in the LMS.

As long as SERVICE_VARIANT is set, this code should prevent the
instantiation of both celery apps.
 2020-12-09 14:13:40 -05:00
Justin Lapierre
dfe15503ce Merge pull request #25012 from open-craft/farhaan/bb-2961-ora-button-support 
[BB-2961] [BD-05] [TNL-7577] Added open response button to the component tray
 2020-12-09 07:55:52 -05:00
Ned Batchelder
eb82e64b51 Merge pull request #25809 from raccoongang/rg/fix/bookmarks_deletion 
In the LMS, bookmarks associated to deleted units are not deleted
 2020-12-09 06:19:27 -05:00
Max Sokolski
22a88de1ea In the LMS, bookmarks associated to deleted units are not deleted 2020-12-09 04:51:09 +02:00
Ned Batchelder
2dd618e3a2 Merge pull request #25756 from edx/nedbat/settable-support-link 
New LOGIN_ISSUE_SUPPORT_LINK setting
 2020-12-08 15:07:13 -05:00
Ned Batchelder
702975613e Merge pull request #25751 from open-craft/farhaan/bb-3269-file-upload-to-work-correctly 
[BTR-38] [BB-3269] Add openassessment url to CMS
 2020-12-08 12:11:11 -05:00
Kyle McCormick
739e8a1e71 Stringify keys in backfill_orgs_and_org_courses (#25802) 
The command was failing when it encountered both Old Mongo
and Split Mongo course keys, as it tried to `sort` the keys,
but Opaque Keys are only comparable if they are of the same
type. The solution is to convert them to strings before sorting.
The edx-organizations code that instruments the backfill knows
to parse them back into CourseKeys.
 2020-12-08 09:36:46 -05:00
Farhaan Bukhsh
aa18d88fa9 Fix test with updated ORA template 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-08 00:58:23 +05:30
Giovanni Cimolin da Silva
1d979dad8b Merge branch 'master' into farhaan/bb-2961-ora-button-support 2020-12-07 15:01:55 -03:00
Farhaan Bukhsh
4c61ba28bc Added the condition for the first template to be blank assessment. 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-07 14:36:03 -03:00
Farhaan Bukhsh
92a561e085 Removed unnecessary checks in test case 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-07 14:36:02 -03:00
Farhaan Bukhsh
9c434cc8b2 Changed the order of the button 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-07 14:36:02 -03:00
Farhaan Bukhsh
4ad50ef5d9 Adding proper indentation for pep8 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-07 14:36:01 -03:00
Farhaan Bukhsh
95a219f395 Added improved comments 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-07 14:36:01 -03:00
Farhaan Bukhsh
48595cd38d Added tests for ORA button 
Signed-off-by: Farhaan Bukhsh <farhaan@opencraft.com>
 2020-12-07 14:36:00 -03:00