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

44023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
cc6e3219ed Merge pull request #16774 from edx/jmbowman/PLAT-1801 
PLAT-1801 Preserve new user login behavior under Django 1.10+
 2017-12-05 14:16:35 -05:00
Nimisha Asthagiri
aabba91087 Merge pull request #16770 from edx/pacing/refactor-common-code 
Move ACE Common code out of Schedules
 2017-12-05 14:03:29 -05:00
Nimisha Asthagiri
7245f7696e Fix quality issues in ace_common 2017-12-05 11:38:16 -05:00
Nimisha Asthagiri
7ef443f7ce Update usages to ace_common 2017-12-05 11:38:16 -05:00
Nimisha Asthagiri
c6ee8eb68d Move ACE Common code out of Schedules 2017-12-05 11:36:14 -05:00
David Ormsbee
94c5cce70c Merge pull request #16771 from edx/ormsbee/fix_asset_watch_args 
Fix watch_assets call from paver update_assets.
 2017-12-05 11:15:52 -05:00
Tyler Hallada
26d42de464 Merge pull request #16773 from edx/thallada/schedules-no-escape-txt 
Schedules: turn off HTML escaping for email text fields
 2017-12-05 11:07:09 -05:00
Jeremy Bowman
103c723c6d PLAT-1801 Preserve new user login behavior under Django 1.10+ 2017-12-05 10:20:25 -05:00
Awais Jibran
08ca211017 Merge pull request #16782 from edx/aj/fix-unicode-error 
Handle Unicode chars with AlreadyRunningError exception
 2017-12-05 19:43:21 +05:00
Awais Jibran
4431cec4d0 Handle Unicode chars with AlreadyRunningError exception 
Changed AlreadyRunningError to be able to throw unicode error message, in case of accented characters resulted from language translation
EDUCATOR-1730
 2017-12-05 18:13:25 +05:00
Ayub khan
571be1f543 Merge pull request #16779 from edx/LEARNER-3399 
Learner-3399 fix for certificates
 2017-12-05 18:03:18 +05:00
Noraiz Anwar
dd78ea591f Merge pull request #16776 from edx/noraiz/update-ora-EDUCATOR-1847 
update ORA to 2.1.5
 2017-12-05 17:11:40 +05:00
Asad Iqbal
14cb287ed0 Merge pull request #16665 from edx/asadiqbal08/ENT-751 
[ENT-751] Update the SailThru var with Enterprise learner information
 2017-12-05 15:03:08 +05:00
edX Transifex Bot
1c0124aafa Update translation strings 2017-12-05 04:13:29 -05:00
ayub-khan
1b774d15aa -Allow staff to preview certificates before course end 2017-12-05 13:57:46 +05:00
Ayub khan
3fc45dcdba Merge pull request #16718 from edx/Update_translations_30_Nov 
updated translations
 2017-12-05 12:29:39 +05:00
noraiz-anwar
a8b59c8d05 update ora to 2.1.5 2017-12-05 11:55:28 +05:00
Clinton Blackburn
1540d3c8a4 Using standard JWT issuer for calls to Credentials Service 
The client-specific JWT doesn't really make any sense and only causes issues due to needing to configure both. This change updates LMS to use the standard issuer.

LEARNER-3441
 2017-12-05 01:15:15 -05:00
Nimisha Asthagiri
e8cb8bba31 Merge pull request #16756 from edx/pacing/log-on-failure 
Schedules: Add celery task logging
 2017-12-04 20:21:41 -05:00
Tyler Hallada
144859cdf2 Turn off HTML escaping for email text fields 2017-12-04 17:47:50 -05:00
David Ormsbee
f883aa9487 Fix watch_assets call from paver update_assets. 
The paver task arg unwrapper expects it to come in a list.
 2017-12-04 17:20:27 -05:00
Michael Terry
b30cbb1541 Merge pull request #16768 from mikix/mikix/16.04 
Update README to suggest recent Ubuntu
 2017-12-04 16:29:40 -05:00
Alessandro Roux
8b652ad352 Merge pull request #16728 from edx/pacing/remove-create-schedules-from-course-waffle-flag 
Dynamic Pacing: Removed references to CREATE_SCHEDULE_WAFFLE_FLAG.
 2017-12-04 16:11:27 -05:00
Feanil Patel
b212af2488 Merge pull request #16765 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-04 14:47:27 -05:00
Brian Mesick
b23bcbb491 Merge pull request #16764 from edx/bmedx/bump_django_wiki_for_django_pin 
Update edx/django-wiki to latest
 2017-12-04 14:36:01 -05:00
sanfordstudent
ccf344714e Merge pull request #16763 from edx/sstudent/remove_broken_admin 
remove broken subsection grade override admin
 2017-12-04 14:32:37 -05:00
Brian Mesick
d905899873 Merge pull request #16760 from edx/bmedx/django111_remove_noargscommand 
Update clear_collectstatic_cache management command to Django 1.11 spec
 2017-12-04 14:19:44 -05:00
Eric Fischer
fae1537682 Merge pull request #16522 from edx/efischer/EDU-1724 
Move library creator checks to POST-only
 2017-12-04 14:17:10 -05:00
Eric Fischer
d0250baad9 Merge pull request #16726 from edx/efischer/xss_followup 
fix a few xss errors
 2017-12-04 14:16:46 -05:00
Nimisha Asthagiri
549f4b661e Schedules: Add celery task logging 2017-12-04 14:16:27 -05:00
sandroroux
4dbb935ca7 Removed references to CREATE_SCHEDULE_WAFFLE_FLAG. 2017-12-04 14:10:29 -05:00
Michael Terry
7e798adae0 Update README to suggest recent Ubuntu 
Have the README suggest and link to installation instructions for
Ubuntu 16.04 instead of the (end of life) 12.04.
 2017-12-04 14:10:26 -05:00
Albert (AJ) St. Aubin
48c40cf05e Merge pull request #16751 from edx/aj/stafF_entitlement_permissions 
Updates to the API Endpoint to remove the Staff users ability to get all
 2017-12-04 14:08:56 -05:00
bmedx
f8804992ef Update edx/django-wiki to latest 
- Resolves an issue creating sandboxes due to pinned Django version
 2017-12-04 13:39:35 -05:00
Diana Huang
141bee3290 Merge pull request #16761 from edx/diana/hide-optional-fields-checkbox 
LEARNER-3406: Fix registration fields bugs.
 2017-12-04 13:14:15 -05:00
Eric Fischer
c08010e5db Merge pull request #16643 from edx/efischer/EDUCATOR-1773_revert 
EDUCATOR-1773 resolution
 2017-12-04 13:12:34 -05:00
Eric Fischer
34db1269c8 Merge pull request #16601 from edx/efischer/EDU-1731_memoize 
Memoize common lookups during request
 2017-12-04 13:12:09 -05:00
bmedx
29514cc2d2 Update clear_collectstatic_cache management command to Django 1.11 spec 2017-12-04 13:05:33 -05:00
asadiqbal
390c5368db Update the SailThru var with Enterprise learner information 2017-12-04 22:33:56 +05:00
Waheed Ahmed
bcccd48871 Merge pull request #16625 from edx/waheed/LEARNER-3206-dates-mobile-fragment-changes 
Course dates mobile fragment improvements.
 2017-12-04 22:14:57 +05:00
Sanford Student
174d0393fa remove broken subsection grade override admin 2017-12-04 12:02:23 -05:00
Eric Fischer
3687d6aa62 fix a few xss errors 2017-12-04 11:56:26 -05:00
Eric Fischer
a09866622d Move library creator checks to POST-only 2017-12-04 11:55:49 -05:00
Eric Fischer
cb463c0d11 Revert "Revert "Merge pull request #16447 from appsembler/omar/hide-library-button"" 
This reverts commit 7696727fda.
 2017-12-04 11:55:49 -05:00
Eric Fischer
b543a6ce34 Upgrade django-ses to 0.8.4 2017-12-04 11:55:09 -05:00
Eric Fischer
3312939703 Revert "Merge pull request #16635 from edx/efischer/EDUCATOR-1773" 
This reverts commit 3e9e97e6d8, reversing
changes made to 0d931107aa.
 2017-12-04 11:55:09 -05:00
Eric Fischer
2e3f871c12 Memoize common lookups during request 
Prevents repeated memcached lookups on functions whose values should
remain static for the lifetime of a request.

EDUCATOR-1731
 2017-12-04 11:54:50 -05:00
Tyler Hallada
f5d2741c34 Merge pull request #16744 from edx/thallada/highlights-logging 
Schedules: more info logging and add exception logging
 2017-12-04 11:32:43 -05:00
Nimisha Asthagiri
de74279d78 Merge pull request #16755 from edx/pacing/fake-request-issue 
Schedules: Emulate HTTP request needs to include host information
 2017-12-04 11:31:58 -05:00
Michael Roytman
cb19a653ee Merge pull request #16754 from edx/mroytman/sfe-a11y-page 
add Accessibility Page into studio from studio-frontend
 2017-12-04 11:23:18 -05:00