Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
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
Michael Cornwell
b65546abb2 Added IE11 fix for discussion cohorts bug. 2017-11-20 06:40:14 -06:00
Jose Antonio Gonzalez
bc16a70c63 Add recover password endpoint 2017-11-18 09:37:42 +02: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
Alex Dusenbery
c28427fd09 EDUCATOR-1590 | Message context usernames should come from django models. 2017-11-16 12:19:16 -05:00
Jose Antonio Gonzalez
f38e5ab939 add DEFAULT_MOBILE_AVAILABLE flag 2017-11-16 16:50:37 +02:00
Carol Tong
ebe857373a Merge pull request #16483 from edx/carol/DOC-3822 
DOC-3822 Make 2 steps more obvious in credit eligible email
 2017-11-16 09:44:36 -05:00
ayub-khan
6fb44898f8 update translations 2017-11-16 16:03:38 +05:00
Gabe Mulley
a4095e49b2 fix discussion notifications emails 2017-11-15 21:06:46 -05:00
Michael Terry
8270cda12b Merge pull request #16577 from mikix/mikix/notes-a11y 
Fix low contrast on Notes page
 2017-11-15 16:29:27 -05:00
Michael Terry
7622898d33 Merge pull request #16573 from mikix/mikix/design-link-fixes 
Fix some broken links in CSS comments
 2017-11-15 15:24:47 -05:00
Carol Tong
b58de56ad3 DOC-3822 Make 2 steps more obvious in credit eligible email 2017-11-15 15:15:13 -05:00
John Eskew
1bf74c7d32 Add disabled request limits implemented in Django 1.11 2017-11-15 14:19:31 -05:00
John Eskew
461fadb2b9 Remove unused direct reference to specific course in common settings. 2017-11-15 14:02:26 -05:00
Michael Terry
c5882520ec Fix low contrast on Notes page 
In the edxnotes view, a few bits of text had low contrast (page
subtitle, tab label, and a link). Now they are each a little darker.

LEARNER-3203
 2017-11-15 13:33:14 -05:00
Michael Terry
5646762ef5 Fix some broken links in CSS comments 
ux.edx.org/elements -> ux.edx.org/design_elements
 2017-11-15 13:08:08 -05:00
Gabe Mulley
6f20cd5cf2 support a GA tracking pixel 2017-11-15 08:35:35 -05:00
Waheed Ahmed
a119d5b977 Added tag enterprise tickets functionality. 
New support form should tag enterprise tickets.

LEARNER-2862
 2017-11-15 16:24:12 +05:00
Tasawer Nawaz
25b75467be Merge pull request #16554 from edx/tasawer/learner-2736/integrate-zendesk-with-single-support-form 
integrate Zendesk with new single support form
 2017-11-15 13:06:07 +05:00
Matt Tuchfarber
c16d8db1dd Merge pull request #16549 from edx/tuchfarber/program_marketing_tweaks_2 
Fix URLs in program marketing page
 2017-11-14 17:35:23 -05:00
Uzair Rasheed
aa1f3df369 Merge pull request #16513 from edx/uzairr/LEARNER-2981-program-detail-fragment 
Create program detail fragment for mobile app
 2017-11-15 02:08:00 +05:00
Christopher Lee
c411b6b8f8 Merge pull request #16565 from edx/clee/LEARNER-2892 
Make redundant course dashboard course link unfocusable
 2017-11-14 14:29:06 -05:00
Sofiya Semenova
3b6e5f89c6 Merge pull request #16562 from edx/sofiya/wl-email-response-notifications 
White label support for email response notifications
 2017-11-14 14:02:05 -05:00
Christopher Lee
6dcce5a80e Merge pull request #16552 from edx/clee/LEARNER-2894 
Remove aria-label for fields in Account Settings and Profile
 2017-11-14 13:41:48 -05:00
christopher lee
b7ff46c325 Make redundant course dashboard course link unfocusable 2017-11-14 13:11:24 -05:00
Alex Dusenbery
b35450decc EDUCATOR-1729 | Control forum notifications with SiteConfiguration, too. 2017-11-14 12:59:46 -05:00
Brian Mesick
dad73637aa Merge pull request #16495 from edx/bmedx/django111_startup_fixes 
Changes necessary for Django 1.11 tests to start
 2017-11-14 12:19:21 -05:00
sanfordstudent
4d0ce28fa9 Merge pull request #16560 from edx/sstudent/EDUCATOR-1624 
EDUCATOR-1624 logging
 2017-11-14 11:20:42 -05:00
Brian Mesick
7ccc498800 Merge pull request #16561 from edx/bmedx/django111_select_related 
Remove use of non-relational fields in select_related queries
 2017-11-14 11:04:41 -05:00
Tasawer Nawaz
a89042ab7c integrate zendesk with new single support form 
LEARNER-2736
 2017-11-14 20:43:08 +05:00
Sofiya Semenova
a1692f2b7b White label support for email response notifications 2017-11-14 10:22:59 -05:00
bmedx
09e5156543 Remove use of non-relational fields in select_related queries 
These changes should not change the actual queries at all, and those
will throw errors in Django 1.11.
 2017-11-14 10:10:08 -05:00