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

44056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlasdairSwan
acab64be4d LEARNER-3128 add role=presentation to sequence nav list items 2017-12-06 08:38:56 -05:00
edX Transifex Bot
ff7fa721a1 Update translation strings 2017-12-06 05:11:24 -05:00
Uzair Rasheed
6b146db12b Merge pull request #16690 from edx/LEARNER-3337/validate-username-field 
Verify 'Full Name' field does not allow HTML.
 2017-12-06 14:29:57 +05:00
Calen Pennington
d2963a66b2 Merge pull request #14674 from cpennington/cale/latest-edx-lint 
Cale/latest edx lint
 2017-12-05 20:16:02 -05:00
John Eskew
0a341cf526 Merge pull request #16775 from edx/jeskew/test_migrations_in_d111 
Fix warnings/errors in Django 1.10
 2017-12-05 17:37:18 -05:00
edx-pipeline-bot
740268c668 Merge pull request #16792 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-05 17:02:08 -05:00
John Eskew
d4667691fb Convert final field from CommaSeparatedIntegerField to CharField. 2017-12-05 16:47:23 -05:00
John Eskew
f5a83d5d6c Fix URLs that generate warnings in Django 1.10. 2017-12-05 16:46:33 -05:00
Jeremy Bowman
62f91dd7e9 Merge pull request #16795 from edx/jmbowman/PLAT-1418 
PLAT-1418 Remove obsolete can_import_settings attribute
 2017-12-05 16:45:32 -05:00
Jeremy Bowman
811f313c5e Merge pull request #16791 from edx/jmbowman/PLAT-1382 
PLAT-1382 Populate ALLOWED_HOSTS for tests
 2017-12-05 16:36:56 -05:00
Dennis Jen
a9be2b1d62 Merge pull request #16793 from edx/dsjen/dummy-token 
Remove zendesk access token from support view.
 2017-12-05 16:36:29 -05:00
Stu Young
3495f3b6b5 Merge pull request #16766 from edx/estute/paver-command-updates-bokchoy-db 
TE-2320 - paver command to consolidate bokchoy db cache creation
 2017-12-05 16:33:18 -05:00
Jeremy Bowman
df008438a8 PLAT-1418 Remove obsolete can_import_settings attribute 2017-12-05 15:42:15 -05:00
Dennis Jen
aca284b744 Remove zendesk access token from support view 2017-12-05 15:35:57 -05:00
Jesse Zoldak
5dec436f6b Merge pull request #16790 from edx/zoldak/remove-flaky-paver-asset-tests 
Remove flaky Asset Task testcase classes
 2017-12-05 12:35:15 -08:00
Jeremy Bowman
da8cf6b528 PLAT-1382 Populate ALLOWED_HOSTS for tests 2017-12-05 14:22:30 -05:00
Jesse Zoldak
82acc30f5b Remove flaky testcase classes 2017-12-05 14:22:22 -05:00
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
Diana Huang
06e7e18d32 Merge pull request #16786 from edx/diana/registration-form-bugs 
Fix more registration form bugs.
 2017-12-05 12:34:41 -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
Diana Huang
366d0e1400 Fix more registration form bugs. 2017-12-05 11:10:35 -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
uzairr
333e3315cb Verify 'Full Name' field does not allow HTML. 
'Full Name' field in the student account settings is allowing HTML
as an input which makes spoofing easily.To avoid it, validation is
added that ensures 'Full Name' field does not allow HTML as input.

LEARNER-3337
 2017-12-05 13:33:30 +00: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