Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,462 Commits 1 Branch 0 Tags
95e76dcafe945b62dc7bbaebde1a32434002464a
Commit Graph

44462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
b00b6b89a8 Add more ssencrypt tests 2017-11-22 17:59:02 -05:00
Brian Beggs
705aac7980 Merge pull request #16657 from edx/bbeggs/sorl-thumbnail 
Pin sorl-thumbnail to 12.3
 2017-11-22 16:48:59 -05:00
bmedx
ace88e7d5a Tag LMS Unit 3 tests that fail in Django 1.11 
Fixed some url reverse errors instead of marking since they were trivial
 2017-11-22 15:48:00 -05:00
bmedx
d827d47b48 Tag LMS Unit 2 tests that fail in Django 1.11 2017-11-22 15:47:22 -05:00
bmedx
5fbbf4979a Tag LMS Unit 1 tests that fail in Django 1.11 2017-11-22 15:46:45 -05:00
bmedx
d3e6836d9e Fixes to common/openedx tests that reference apps CMS doesn't use 2017-11-22 15:46:06 -05:00
Brian Beggs
423b932e9e Pin sorl-thumbnail to 12.3 2017-11-22 15:44:26 -05:00
David Ormsbee
94614db46e CoffeeScript tests migration: Remove implicit returns 2017-11-22 15:39:50 -05:00
David Ormsbee
0880502f26 CoffeeScript tests migration: Decaffeinate files 
This is running decaffeinate, with no additional cleanup.
 2017-11-22 15:39:50 -05:00
David Ormsbee
5c64da2f63 CoffeeScript tests migration: Rename files 
Step 1 in our migration steps is to rename the CoffeeScript files to
the JS files they will be replaced with, so that we can preserve file
history.
 2017-11-22 15:39:50 -05:00
Calen Pennington
aa0377b01e Merge pull request #16661 from cpennington/fix-linting-errors 
Fix linting errors from https://github.com/edx/edx-platform/pull/16615
 2017-11-22 15:37:14 -05:00
edx-pipeline-bot
c23b0fce1a Merge pull request #16659 from edx/release-mergeback-to-master 
Merge release back to master
 2017-11-22 15:26:40 -05:00
Calen Pennington
48abc492ae Fix linting errors from https://github.com/edx/edx-platform/pull/16615 2017-11-22 14:47:49 -05:00
Jeremy Bowman
4ba29b4707 Convert unicode to bytes for RSA encryption 2017-11-22 11:55:44 -05:00
Ned Batchelder
a2e2aace82 Merge pull request #16650 from edx/nedbat/fix-unused-imports 
Fix a number of unused-import pylint violations
 2017-11-22 11:17:07 -05:00
John Eskew
872df1e4bd Merge pull request #16647 from edx/jeskew/custom_template_loader_fixes 
Change template's deprecated '=' comparison to '=='.
 2017-11-22 09:22:06 -05:00
Ned Batchelder
c966707a86 Correct a mock that was at the wrong module 2017-11-22 08:03:22 -05:00
Matt Drayer
8d1053eef8 Merge pull request #16566 from edx/mattdrayer/ENT-686-5 
Better handling of data for OData API exception handling
 2017-11-22 07:39:52 -05:00
Matt Drayer
9b4be93628 Better handling of data for OData API exception handling 2017-11-21 23:41:06 -05:00
Calen Pennington
7aa1a3460b Merge pull request #16615 from edx/cale/schedules-admin-improvements 
Cale/schedules admin improvements
 2017-11-21 22:06:37 -05:00
Ned Batchelder
e23e3a0486 Fix a number of unused-import pylint violations 2017-11-21 19:57:06 -05:00
Sofiya Semenova
885162c2d2 Follow-up to email template for forum notifications after testing in stage 2017-11-21 16:43:20 -05:00
Calen Pennington
10970f3034 Allow searching for schedules with known errors in the admin site 2017-11-21 16:08:24 -05:00
Calen Pennington
3ff118eaac Dynamically generate the actions to update to specific experiences 2017-11-21 16:08:23 -05:00
Brian Mesick
c9c67e0827 Merge pull request #16644 from edx/bmedx/django111_fix_startup 
Fix Django 1.11 startup
 2017-11-21 15:36:07 -05:00
Matt Tuchfarber
26144b4a66 Add pricing data to program purchase button 2017-11-21 14:53:11 -05:00
Calen Pennington
6756f97d0c Limit schedule resolvers to active schedules 2017-11-21 14:25:57 -05:00
Calen Pennington
fabad1de4d Add actions and filtering to schedules admin page to allow it to function better as a support tool 2017-11-21 14:25:57 -05:00
Calen Pennington
45bbc2daa3 Allow searching by course_id in the schedules django admin page 2017-11-21 14:25:55 -05:00
sandroroux
98233c0a84 New management command for setting up a test environment. The command creates a ScheduleConfig and schedules if they don't exist (the schedule starts three days before the time the command is run). If a schedule already exists, the command updates the schedule's start time and upgrade deadline. The values set by the command will allow send_recurring_nudge to send three-day nudges. 2017-11-21 14:25:55 -05:00
John Eskew
6777e36617 Change template's deprecated '=' comparison to '=='. 2017-11-21 14:21:23 -05:00
Eric Fischer
3e9e97e6d8 Merge pull request #16635 from edx/efischer/EDUCATOR-1773 
No unicode in "from" value on Bulk Emails
 2017-11-21 13:01:42 -05:00
Christopher Lee
0d931107aa Merge pull request #16589 from edx/clee/LEARNER-2891 
Remove uneccessary aria labels in the student dashboard
 2017-11-21 12:52:31 -05:00
Jeremy Bowman
6457e76d02 Merge pull request #16612 from edx/jmbowman/PLAT-1199 
PLAT-1199 Stop using pycrypto
 2017-11-21 12:45:19 -05:00
bmedx
048b609f87 Fix Django 1.11 startup 2017-11-21 11:58:38 -05:00
Eric Fischer
19c580e52f No unicode in "from" value on Bulk Emails 
Until https://github.com/django-ses/django-ses/issues/137 is resolved, we need
to proactively search for and prevent unicode values in from_addr.

EDUCATOR-1773
 2017-11-21 11:32:31 -05:00
Jeremy Bowman
43a11af735 PLAT-1199 Stop using pycrypto 2017-11-21 11:25:48 -05:00
Michael Terry
96c737d1cb Fix focus loss when bookmarking a page in IE 
In IE, when a user presses the bookmark/remove-bookmark button,
the focus was lost on that button because we set disabled=true
while we do the operation. Set the focus back when we are done.

LEARNER-2896
 2017-11-21 11:16:48 -05:00
Jeremy Bowman
80d7cefd3c Merge pull request #16632 from edx/jmbowman/PLAT-1413 
PLAT-1413 Remove TEMPLATE_DEBUG setting
 2017-11-21 10:26:49 -05:00
Rabia Iftikhar
7316002f28 Merge pull request #16623 from edx/ri/edx-organizatios-update-version 
update edx-organizations version
 2017-11-21 12:18:01 +05:00
Jose Antonio Gonzalez
0b460bea38 Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip] 2017-11-21 09:15:09 +02:00
Farhanah Sheets
f79a7b6e0b Merge pull request #16634 from edx/fsheets/EDUCATOR-1559 
Discussion Add Post - Add Explicit Labeling of Discussion Checkboxes
 2017-11-20 16:03:12 -05:00
Farhanah Sheets
7c7a147e8d Merge pull request #16628 from edx/fsheets/EDUCATOR-1561 
Discussion Add Post - Update sr Label to Match Visual Label
 2017-11-20 16:02:42 -05:00
Troy Sankey
1e09a548b1 Merge pull request #16568 from edx/pwnage101/set_language_shim_PLAT-1353 
Avoid a django breaking change: set_language response code
 2017-11-20 15:08:11 -05:00
Troy Sankey
bff8c08245 Avoid a django breaking change: set_language response code 
In Django 1.10+, the set_language view (/i18n/setlang) will respond to
Ajax requests which do not contain a "next" parameter with status 204 No
Content instead of 304.  This commit adds the "next" parameter to the
request in order to ensure that upgrading to Django 1.10+ will not cause
the set_language view to change behavior.

PLAT-1353
 2017-11-20 15:02:13 -05:00
Jeremy Bowman
8b3f81f3b4 PLAT-1413 Remove TEMPLATE_DEBUG setting 2017-11-20 14:39:36 -05:00
Farhanah Sheets
70874502dd Add for/id attributes for explicit labeling of discussion checkboxes 2017-11-20 14:25:01 -05:00
Farhanah Sheets
c8c3b55390 Update sr label to match visual label 2017-11-20 13:55:59 -05:00
Robert Raposa
d9420fc029 Merge pull request #16626 from edx/robrap/lower-thresholds 
Lower thresholds.
 2017-11-20 13:49:35 -05:00
christopher lee
4e32bd5abb Fix aria label for course details on the course dashboard 2017-11-20 13:48:17 -05:00