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

17298 Commits

Author SHA1 Message Date
Sofiya Semenova
ea488f84ed Merge pull request #16633 from edx/sofiya/ed-1560 
Educator 1560 - Clean up labelling in the Discussion Add Post form
 2017-11-27 13:47:54 -05:00
Michael Terry
ffc838250d Merge pull request #16605 from mikix/mikix/border-a11y 
Show current tab even in high contrast mode
 2017-11-27 12:14:29 -05:00
sanfordstudent
b6d9dfb2ab Merge pull request #16652 from edx/add-persistent-grade-override-table-in-admin 
Add `PersistentSubsectionGradeOverride` table in django admin
 2017-11-27 11:12:34 -05:00
Sofiya Semenova
3244fc0d67 Educator 1560 - Clean up labelling in the Discussion Add Post form 2017-11-27 11:12:05 -05:00
Jeremy Bowman
139fa895d1 Merge pull request #16662 from edx/jmbowman/more_ssencrypt_tests 
Add more ssencrypt tests
 2017-11-27 10:29:41 -05:00
Awais Jibran
baa967ca66 Add PersistentSubsectionGradeOverride table in django admin 
EDUCATOR-1624
 2017-11-27 10:11:57 -05:00
Brian Mesick
9911c8d068 Merge pull request #16649 from edx/bmedx/django111_tag_test_failures_lms_1 
Tag LMS Unit 1 tests that fail in Django 1.11
 2017-11-27 09:15:53 -05:00
Brian Mesick
3d5fef7882 Merge pull request #16655 from edx/bmedx/django111_tag_test_failures_lms_2 
Tag LMS Unit 2 tests that fail in Django 1.11
 2017-11-27 09:15:26 -05:00
raeeschachar
5196f4b108 Fix header logo link to MKTG root. 
In courseware, banner Logo links to Dashboard, footer logo
links to home page.

LEARNER-2881
 2017-11-24 18:26:26 +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 Ulhaq
da675e52dc Learner certificates should not be findable before the available date 
LEARNER-3298
 2017-11-23 14:14:05 +05: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
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
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
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
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
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
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
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
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
c8c3b55390 Update sr label to match visual label 2017-11-20 13:55:59 -05:00
christopher lee
4e32bd5abb Fix aria label for course details on the course dashboard 2017-11-20 13:48:17 -05:00
Sofiya Semenova
14c1f5bd00 Merge pull request #16616 from edx/sofiya/clean 
Don't get the site object unless the message is going to be sent
 2017-11-20 10:32:21 -05:00
Eric Fischer
b78d5061fc Merge pull request #16597 from edx/efischer/EDU-1685-followup 
Follow up to #16473
 2017-11-20 10:05:36 -05:00
John Eskew
a4474385ec Merge pull request #16606 from edx/jeskew/remove_default_manager_access 
Add a proper get_queryset() method to remove _default_manager access.
 2017-11-17 17:07:06 -05:00
Sofiya Semenova
e77137c2f9 Don't get the site object unless the message is going to be sent 2017-11-17 15:33:20 -05:00
Harry Rein
6a2f46e061 Merge pull request #16592 from edx/fix-footer-scope-to-fix-btn-styling 
Scope base build to footer only.
 2017-11-17 13:45:05 -05:00
Sofiya Semenova
1d08f71336 Merge pull request #16599 from edx/sofiya/ed-1590-2 
ed-1590 Templates for email forum notifications
 2017-11-17 13:36:26 -05:00
John Eskew
9292741fdd Add a proper get_queryset() method to remove _default_manager access. 
Remove the now-unused custom model manager for coupons.
 2017-11-16 22:05:08 -05:00
Ayub khan
f097b7149c Merge pull request #16588 from edx/update_translations_16_nov 
Update translations
 2017-11-17 02:38:23 +05:00
Michael Terry
b2d534da61 Show current tab even in high contrast mode 
In the dashboard header and the course navigation bar, the current
tab is supposed to be the only one with a bottom border.  But in
high contrast mode in Windows, all of them were assigned a bottom
border color.

So instead of toggling the color when active, toggle the border
style, since Windows overrides our color choice anyway.

LEARNER-3219
 2017-11-16 16:33:50 -05:00
Sofiya Semenova
821db8aa11 ed-1590 Templates for email forum notifications 2017-11-16 15:26:56 -05:00
John Eskew
ee36534fde Merge pull request #16574 from edx/jeskew/add_request_limits_for_django110 
Add request limits to LMS/CMS Django settings.
 2017-11-16 13:13:46 -05:00
Eric Fischer
71aaf6127e Follow up to #16473 
This rule needs an !important in order to override the inline style
 2017-11-16 13:08:18 -05:00
Harry Rein
b6f55c24b9 Scope base build to footer only. 2017-11-16 12:20:48 -05:00
Alex Dusenbery
2fbdb8f6b3 EDUCATOR-1590 | Test that we can actually render the forum emails. 2017-11-16 12:19:16 -05:00