Jose Antonio Gonzalez
5150a96005
fix pep8
2017-11-24 14:59:41 +02:00
Jose Antonio Gonzalez
0171e79764
fix pylint [ci skip]
2017-11-24 14:07:28 +02:00
Jose Antonio Gonzalez
2e45a9b136
Merge remote-tracking branch 'upstream/master' into proversity/add-recover-password-endpoint [ci skip]
2017-11-24 13:13:44 +02:00
Michael Cornwell
0b3a0bd992
Fixing eslint issue.
2017-11-23 11:07:04 -06:00
Michael Cornwell
dfc190a593
Fixing eslint issues.
2017-11-23 10:54:28 -06:00
Michael Cornwell
7792aa2c25
Fixing eslint issues.
2017-11-23 10:29:08 -06:00
Michael Cornwell
faa15a24d9
Fixed eslint issues.
2017-11-23 10:16:43 -06:00
Ayub khan
dd2f90fb47
Merge pull request #16666 from edx/LEARNER-2653-update-django-wiki-version
...
LEARNER-2653 Update django-wiki version
2017-11-23 17:10:51 +05:00
Ayub khan
4aeb7f1058
Merge pull request #16667 from edx/Update_pull_translations_Nov_23
...
Updated pull Translations
2017-11-23 17:09:37 +05:00
ayub-khan
9e619e4244
Updated Translations
2017-11-23 16:02:47 +05:00
Ahsan Ul Haq
6e72065032
Merge pull request #16620 from edx/ahsan/LEARNER-3298-Learner-certificates-should-not-be-findable-before-available-date
...
Learner certificates should not be findable before the available date
2017-11-23 15:39:49 +05:00
ayub-khan
992832ca0b
update django-wiki version
2017-11-23 14:32:53 +05:00
Ahsan Ulhaq
da675e52dc
Learner certificates should not be findable before the available date
...
LEARNER-3298
2017-11-23 14:14:05 +05:00
Matjaz Gregoric
dcb77ff7ae
Merge pull request #16510 from open-craft/mtyaka/lms-internal-root-url
...
Introduce LMS_INTERNAL_ROOT_URL.
2017-11-23 09:21:15 +01:00
Matjaz Gregoric
d403e5f8b1
Introduce LMS_INTERNAL_ROOT_URL.
...
The LMS and edx-enterprise currently communicate via REST APIs, even
though they are all running within the same service.
Currently API URLs are constructed using LMS_ROOT_URL, but that is
problematic on some systems where the external LMS_ROOT_URL is not
accessible from the private network, or routing internal requests via
the external URL is not desireable.
This patch introduces a new setting variable LMS_INTERNAL_ROOT_URL which
defaults to the value of LMS_ROOT_URL for backwards compatibility.
The LMS and edx-enterprise will use LMS_INTERNAL_ROOT_URL to construct
API URLs instead of LMS_ROOT_URL.
2017-11-23 08:17:38 +01:00
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
Daniel Clemente Laboreo
c914527431
Make the "about course" page adapt to small screens
2017-11-22 22:50:32 +02: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
