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

48417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christie Rice
cc39aff697 Merge pull request #19686 from edx/crice/INCR-11_mailsnake 
INCR-11 Unpin mailsnake and run make upgrade
 2019-01-30 16:17:38 -05:00
Dillon-Dumesnil
b75ff17f4b Merge pull request #19685 from edx/ddumesnil/remove-review-xblock 
Remove review xblock from edx-platform
 2019-01-30 15:56:12 -05:00
Michael Youngstrom
6a43ae2a5d Merge pull request #19672 from edx/youngstrom/balance-shards 
Bump bokchoy shards and rebalance to decrease test times
 2019-01-30 15:44:32 -05:00
Christie Rice
b9150de7d0 INCR-11 Unpin mailsnake and run make upgrade 2019-01-30 14:54:25 -05:00
Christie Rice
ccd546d494 Merge pull request #19680 from edx/crice/INCR-2 
INCR-2 Unpin glob2 and run make upgrade
 2019-01-30 14:48:43 -05:00
Michael Youngstrom
0f3d0b69d6 Rebalance bokchoy sharding 2019-01-30 14:16:58 -05:00
Dillon Dumesnil
226fa767bc Remove review xblock from edx-platform 2019-01-30 10:20:01 -05:00
Stu Young
13cad83c8f Merge pull request #19692 from edx/estute/fix-typo-in-jenkinsfile 
fix typo in python jenkinsfile
 2019-01-30 09:51:12 -05:00
Stuart Young
31d0ab9321 fix typo in python jenkinsfile 2019-01-30 09:49:49 -05:00
Jansen Kantor
6f4bbf6a01 Merge pull request #19676 from edx/jkantor/failed-cert 
fail a certificate if grades are modified to failing
 2019-01-29 17:07:00 -05:00
jansenk
726fb0f6f0 fail a certificate if grades are modified to failing 2019-01-29 15:57:15 -05:00
Christie Rice
ead9f10f17 INCR-2 Unpin glob2 and run make upgrade 2019-01-29 14:54:03 -05:00
Ned Batchelder
2426fa115a Merge pull request #19678 from edx/nedbat/no-track-pulls 
The track-pulls key is obsolete
 2019-01-29 12:38:39 -05:00
Ned Batchelder
6049d5cc4f The track-pulls key is obsolete 2019-01-29 11:52:58 -05:00
Brian Mesick
c948f335bd Merge pull request #19665 from edx/bmedx/PLAT-2411 
Use correct language code in retirement emails
 2019-01-28 16:45:31 -05:00
Matt Hughes
22c07f85b5 Merge pull request #19643 from edx/matthugs/proctoring-a11y-screen-real-estate 
Improve screen real estate usage of proctoring courseware banner
 2019-01-28 16:13:00 -05:00
Audrey
0589037545 Merge pull request #19661 from edx/aekao/REVEM-136/tearDownBundlingTest 
Tearing down data from bundling test
 2019-01-28 16:04:55 -05:00
Audrey Kao
3b4c4c30cb Tearing down data from bundling test, see REVEM-136 2019-01-28 15:00:28 -05:00
Calen Pennington
daf6fd3330 Merge pull request #19599 from cpennington/fbe-adrs 
Add ADRs for FBE decisions
 2019-01-28 14:40:48 -05:00
Matt Hughes
12b5da3ae3 Improve screen real estate usage of proctoring courseware banner 
The banner took up too much room with the browser
zoomed in. This adds a button to hide/show much of the copy, reducing the
portion of the page on zoomed-in desktop browsers stickily obscuring
courseware. The toggle's initial state is set according to browser
width.

update semantic structure of some proctoring banner elements

JIRA:EDUCATOR-3899

JIRA:EDUCATOR-3900
 2019-01-28 14:11:41 -05:00
bmedx
43e1bf8e3c Use correct language code in retirement emails 2019-01-28 13:33:39 -05:00
Michael Youngstrom
b75052b9ec Merge pull request #19671 from edx/youngstrom/bump-bokchoy-timeout 
Bump timeout for bokchoy
 2019-01-28 13:17:51 -05:00
Calen Pennington
4ac3caab23 Add ADRs for FBE decisions 
REVMI-39
 2019-01-28 13:16:53 -05:00
Michael Youngstrom
f49f097937 Bump timeout for bokchoy 2019-01-28 13:10:04 -05:00
Jeff Witt
13bfc7dc1b Update 09_play_pause_control.js 
change title attribute to aria-label on Play button for better screen reader UX
 2019-01-28 11:47:39 -05:00
Julia Eskew
48073300e7 Merge pull request #19106 from open-craft/clemente/fix-courseenrollment-admin-querydict 
Fix error when saving CourseEnrollment in admin
 2019-01-28 11:14:04 -05:00
Michael Youngstrom
30f70aba35 Merge pull request #19670 from edx/youngstrom/update-oep-2-link 
Fix broken link to oep2 in openedx.yml
 2019-01-28 10:39:17 -05:00
Michael Youngstrom
49081f8a8c Fix broken link to oep2 2019-01-28 10:28:00 -05:00
Kyle McCormick
f6d53ab2d1 EDUCATOR-3934 Remove #-of-learners message for writable gradebook 2019-01-28 09:55:51 -05:00
Daniel Clemente Laboreo
e0b0c375be Fix error when saving CourseEnrollment in admin 2019-01-28 14:42:41 +02:00
Agha Awais
b239fd5aab Merge pull request #19520 from edx/awais/lett_2_bc_courseware_problems 
Courseware problems bokchoy tests
 2019-01-26 20:44:25 +05:00
noraiz-anwar
a0acbd616b logs to debug EDUCATOR-3965 2019-01-25 23:31:24 +05:00
Calen Pennington
2f0cd83ed2 Merge pull request #19658 from edx/revert-19642-fbe-improve-course-api-performance 
Revert "Allow courses api to return data incrementally"
 2019-01-25 13:01:20 -05:00
Calen Pennington
805f32a357 Revert "Allow courses api to return data incrementally" 2019-01-25 12:56:57 -05:00
Calen Pennington
c9ed838991 Merge pull request #19642 from cpennington/fbe-improve-course-api-performance 
Allow courses api to return data incrementally
 2019-01-25 11:31:24 -05:00
Calen Pennington
2527efd822 Prefetch CourseOverview.image_set when loading the course_api 2019-01-25 10:30:09 -05:00
Calen Pennington
0d273e9506 Prefetch course modes used in has_access calls in course api 2019-01-25 10:30:09 -05:00
Calen Pennington
a842921e1f Cache org-site lookups in the RequestCache 2019-01-25 10:30:09 -05:00
Calen Pennington
a3541d6e46 Allow courses api to return data incrementally 
Prior to this commit, the course api (/api/courses/v1/courses/)
performed all the work necessary to return all courses available
to the user, and then only actually returned on page's worth of those
courses.

With this change, the api now does the work incrementally, computing
only the data needed to fetch the courses up to and including the page
being returned. This still increases approximately linearly as
the page number accessed being increases, but should be more cache-friendly.
One side effect of this is that the max_page reported by pagination
will be an overestimate (it will include pages that are removed due
to a users access restrictions).

This change also changes the sort-order of courses being returned by the
course_api. By sorting by course-id, rather than course-number, we
can sort in the database, rather than in Python, and defer loading data
from the end of the list until it is requested.

REVMI-90
 2019-01-25 10:30:09 -05:00
Agha Awais
fbb46b1cf7 Courseware problems bokchoy tests 2019-01-25 14:49:00 +00:00
Nadeem Shahzad
75977e9bb1 Merge pull request #19654 from edx/revert-19653-revert-19627-nadeem/OPS-3687 
Move award program certificates tasks to background_process queue (OPS-3687)
 2019-01-25 18:55:14 +05:00
nadeemshahzad
bc09bdf35a Move award program certificates tasks to background_process queue (OPS-3687) 2019-01-25 12:47:46 +00:00
DawoudSheraz
37920b5d30 Merge pull request #19655 from edx/dsheraz/educator_3901 
create access denied fragment when HTTP request is null
 2019-01-25 17:32:04 +05:00
DawoudSheraz
e820888154 create access denied fragment when HTTP request is null 2019-01-25 16:38:50 +05:00
Agha Awais
49cd4202df Merge pull request #19594 from edx/awais/lett_2_bc_html_editor_II 
Remaining bokchoy tests for HTML editor(II)
 2019-01-25 11:31:16 +05:00
Calen Pennington
ee75db2703 Add a test that shows how bad course api query counts are 2019-01-24 22:54:01 -05:00
Agha Awais
840ff1751a Remaining bokchoy tests for HTML editor(II) 2019-01-24 20:38:34 +00:00
Simon Chen
003f2450d9 Merge pull request #19652 from edx/schen/name_update 
Grading: Update the test variable name to correct name
 2019-01-24 14:54:35 -05:00
Simon Chen
e155c08df4 Grading: Update the test variable name to reflect what is being named in the actual logic 2019-01-24 13:00:14 -05:00
noraiz-anwar
9d6ce86e9c fix discussion page layout 2019-01-24 22:56:56 +05:00