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

56651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Awais Jibran
09bd76b47a Merge pull request #25810 from edx/aj/branding/update-edx-ace-email-logo-height 
Adjust height/width as per new logo.
 2020-12-09 16:03:13 +05:00
Ali Akbar
eafd163980 Merge pull request #25807 from edx/aakbar/PROD-2206 
disable xsslint
 2020-12-09 15:08:48 +05:00
Awais Jibran
d44a31247a Adjust height/width as per new logo. 2020-12-09 14:42:04 +05:00
Ali-D-Akbar
3aa0f7e2e8 disable xsslint 2020-12-09 12:41:47 +05:00
Max Sokolski
22a88de1ea In the LMS, bookmarks associated to deleted units are not deleted 2020-12-09 04:51:09 +02:00
Dillon Dumesnil
354c9ada5f Merge pull request #25804 from edx/ddumesnil/aa-471 
AA-471: Removing the export_staff_users command
 2020-12-08 12:40:36 -08: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
Dillon Dumesnil
38a7e0b5a8 AA-471: Removing the export_staff_users command 2020-12-08 19:37:26 +00:00
Ned Batchelder
0578174378 Merge pull request #25760 from open-craft/mtyaka/squash-warning 
Register pytest mongo marker to avoid warning.
 2020-12-08 13:20:27 -05:00
alangsto
1def252129 adding course waffle for proctoring info panel (#25803) 
updated for feedback
 2020-12-08 13:05:57 -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
Bianca Severino
9172935ca5 Merge pull request #25792 from edx/bseverino/idv-course-key 
Fix query string being passed into IDV flow
 2020-12-08 09:39:53 -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
Adam Stankiewicz
f64c3cf947 bump edx-enterprise to 3.13.7 (#25801) 2020-12-08 09:07:28 -05:00
Michael Terry
639d043675 Merge pull request #25765 from edx/mikix/upgrade-sidebar 
AA-383: add verified mode info to course_home outline API
 2020-12-08 08:43:38 -05:00
Awais Jibran
0cbfbd5272 Merge pull request #25798 from edx/aj/update-edge-logo-height 
Update Edge footer logo height
 2020-12-08 14:35:59 +05:00
Awais Jibran
f146ca0600 Edge logo height 2020-12-08 13:44:36 +05:00
Muhammad Ammar
eee2cab9a8 Merge pull request #25793 from edx/ammar/update-edx-enterprise-to-3.13.6 
update edx-enterprise to 3.13.6
 2020-12-08 12:23:05 +05:00
muhammad-ammar
2aebb31c7f update edx-enterprise to 3.13.6 2020-12-08 02:46:59 +05:00
Zachary Hancock
e2d9c34d5c Expose proctoring waffle to edx-proctoring templates (#25704) 
* pass proctoring waffle flag on render
 2020-12-07 16:30:26 -05:00
Ned Batchelder
db9bd85308 Merge pull request #25788 from edx/nedbat/pin-random2 
Pin the third-party random2 library
 2020-12-07 16:21:59 -05:00
Bianca Severino
8805914b52 Fix query string being passed into IDV flow 2020-12-07 16:21:44 -05:00
Awais Jibran
685e061d6c Merge pull request #25768 from edx/aj/branding/progress-page 
Update progress page headings
 2020-12-08 00:00:26 +05:00
Ned Batchelder
a52baf605c Pin the third-party random2 library 2020-12-07 12:57:05 -05:00
David Joy
a9f1a03787 Pin requirements to temporarily fix instructor task registration (#25787) 
* Pin requirements to temporarily fix instructor task registration

We ran into an issue where instructor tasks were not being registered with celery correctly, resulting in: https://openedx.atlassian.net/browse/CR-2982

The cause wasn’t clear, so we started reverting some recent, suspect PRs.  When we reverted #25746, the issue went away.

The revert PR was this one: https://github.com/edx/edx-platform/pull/25766

So that we can unpause our deployment pipelines, we’re temporarily pinning the versions of the four packages upgraded in #25746 so we can continue to investigate.

* Result of make upgrade, propagating constraints out to other requirements files
 2020-12-07 12:48:23 -05:00
edx-pipeline-bot
fe3cdb1209 Merge pull request #25786 from edx/private_to_public_4fed713 
Mergeback PR from private to public.
 2020-12-07 20:30:23 +05:00
Bianca Severino
49bbb771c5 Merge pull request #25764 from edx/bseverino/idv-log 
Provide better logging for 400 errors on IDV photo submission
 2020-12-07 09:19:20 -05:00
Manjinder Singh
28e6a3e43d ARCHBOM-1536: Adding edx/event-routing-backed to requriments and eventtracking app to installed_apps (#25706) 
* ARCHBOM-1536: Adding edx/event-routing-backed library in requirements

* Adding eventtracking app to INSTALLED_APPS
 2020-12-07 09:05:30 -05:00
Zainab Amir
2d3c6c05e1 Update page title to H1 (#25783) 
Rebrand related work for:
- VAN-160
- VAN-186
 2020-12-07 18:41:55 +05:00
adeel khan
bca0b5e2fb Merge pull request #25775 from edx/adeel/van_168_vertically_center_align_labels 
Center align vertically label fields.
 2020-12-07 15:52:42 +05:00
adeel khan
bea629d9d7 Merge pull request #25773 from edx/adeel/van_170_reduce_tos_and_honorcode_fontsize 
Reduce tos/honorcode font size
 2020-12-07 15:52:21 +05:00
adeel khan
fd40bf04f5 Merge pull request #25774 from edx/adeel/van_179_password_assistance_page_title_update 
Update page title to h1
 2020-12-07 15:52:02 +05:00
Ali Akbar
4fed713ce9 Merge pull request #208 from edx/IM/security-fixes 
IM security fixes
 2020-12-07 15:39:20 +05:00
edX cache uploader bot
b9738dec18 Updating Bokchoy testing database cache (#25780) 2020-12-07 15:01:29 +05:00
Sameen Fatima
3c5af1f4ab upgrade edx-enterprise 3.13.5 (#25778) 2020-12-07 13:34:31 +05:00
Awais Jibran
b1bf227286 Update progress page headings. 2020-12-07 13:14:39 +05:00
Adeel Khan
4144ae2dc9 Center align vertically label fields. 
VAN-168
 2020-12-06 22:33:32 +05:00
Adeel Khan
acdf8d7511 Update page title to h1 
VAN-179
 2020-12-06 21:54:48 +05:00
Adeel Khan
68d869dc09 Reduce tos/honorcode font size 
VAN-170
 2020-12-06 21:35:03 +05:00
Feanil Patel
cc37350546 Merge pull request #25766 from edx/revert-25746-jenkins/upgrade-python-requirements-3c9f87c 
Revert "Python Requirements Update"
 2020-12-04 15:13:42 -05:00
Ned Batchelder
761306114d New LOGIN_ISSUE_SUPPORT_LINK setting 
The login page had a hard-coded support.edx.org URL.  This changes it to
a configurable setting. BTR-32.
 2020-12-04 14:55:27 -05:00
Feanil Patel
79d8dad9b9 Revert "Python Requirements Update" 2020-12-04 14:33:43 -05:00
Michael Terry
ae561256cb AA-383: add verified mode info to course_home outline API 
Adds can_show_course_sock and verified_mode values to the outline
API serialization. And adds a utility method to generate the
verified_mode dictionary, shared with the courseware API.
 2020-12-04 14:26:38 -05:00
Bianca Severino
d9bd1c3f0b Add logging for 400 errors when submitting IDV photos 2020-12-04 13:57:02 -05:00
Feanil Patel
ea7ec0c198 Add in required toggle_tickets parameter. (#25763) 
* Add in required toggle_tickets parameter.

Co-authored-by: Kyle McCormick <kmccormick@edx.org>
 2020-12-04 13:10:09 -05:00
Dillon Dumesnil
99c6753eed Merge pull request #25761 from edx/ddumesnil/aa-454 
AA-454 and AA-470: Update language and bug fix for highlights
 2020-12-04 08:40:48 -08:00
David Ormsbee
8dfa21ef6f Merge pull request #25762 from edx/revert-25722-robrap/ARCHBOM-1636-upgrade-supercsv 
Revert "ARCHBOM-1636: upgrade supercsv"
 2020-12-04 11:26:59 -05:00
David Ormsbee
d930d10065 Revert "ARCHBOM-1636: upgrade supercsv" 2020-12-04 10:37:56 -05:00
Dillon Dumesnil
9e2eab506f AA-454 and AA-470: Update language and bug fix for highlights 
Since Course Highlights aren't necessarily weekly (self-paced courses),
update the language to be more generic. And then includes a bug fix to
not send highlights to learners after they have unenrolled from a course.
 2020-12-04 15:26:47 +00:00