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

17257 Commits

Author SHA1 Message Date
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
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
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
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
Sanford Student
898129b5c0 EDUCATOR-1624 logging 2017-11-14 10:07:24 -05:00
Clinton Blackburn
3a005c492f Disabled anonymous access for tabs that require enrollment 2017-11-14 08:00:16 -05:00
uzairr
fa6a5f99a5 Create program detail fragment for mobile app 
To extract the program detail information edX mobile team has to
parse all the un-necassary details which takes time that ultimately
slows down app.To avoid it,a detail fragment is created that will
be used in the mobile app as well as on the web.

LEARNER-2981
 2017-11-14 07:53:12 +00:00
Troy Sankey
73318eccf7 Merge pull request #16526 from edx/pwnage101/teams_mgmt_commands 
teams and student management commands cleanup for django 1.11
 2017-11-13 18:11:56 -05:00
christopher lee
629170d978 Remove aria-label for fields 2017-11-13 16:55:06 -05:00
Matt Tuchfarber
056c30b1b0 Fix URLs in program marketing page 
Change course about page to be dynamically built and change "Enroll Now" button on courses to use the upgrade url instead of the course about url.
 2017-11-13 16:01:08 -05:00
bmedx
d3bbb86fe3 Shims to fix test collection errors 2017-11-13 15:45:34 -05:00
bmedx
f3f8d8ec96 Changes necessary for Django 1.11 tests to start 
- Certificates management commands updates
- Moving reverse calls in tests into setUp from class definition
- Import shuffling
- Consolidating cryptograhpy version to 1.9
 2017-11-13 15:45:32 -05:00
Alex Dusenbery
8eb1900299 EDUCATOR-1571 | Send discussion notification on first response; add a CourseWaffleFlag for discussion notifications. 2017-11-13 10:45:45 -05:00
Adeel Khan
3f61f50de0 Adds error handling for password reset 
This patch enables handling of UserAPIInternalError on password
reset , instead of throwing 500 to user. We are showing user
a message if UserAPIInternalError is raised.

LEARNER-2571
 2017-11-10 14:41:15 +05:00
Troy Sankey
877c9fafc3 teams management commands cleanup for django 1.11 2017-11-09 15:39:04 -05:00
Troy Sankey
b07402e751 remove unused optparse imports 2017-11-09 15:38:54 -05:00
Matt Tuchfarber
5ca2ea9aad Merge pull request #16523 from edx/tuchfarber/program_marketing_tweaks 
Make FAQ responses allow HTML and fix banner image sizing.
 2017-11-09 15:29:08 -05:00