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

44070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bmedx
6294baf456 Add command to bulk move user language prefs from one code to another 2017-12-07 15:06:09 -05:00
AlasdairSwan
98b391a278 Merge pull request #16805 from edx/alasdair/LEARNER-3128-sequence-list-role-presentation-a11y-update 
LEARNER-3128 add role=presentation to sequence nav list items
 2017-12-06 11:16:46 -05:00
Ari Rizzitano
8b59c6d596 Merge pull request #16639 from edx/ari/react-renderer 
mako/react bridge code
 2017-12-06 11:12:24 -05:00
Jeremy Bowman
9b92a3b73a Merge pull request #16800 from edx/jmbowman/PLAT-1427 
PLAT-1427 Adapt to build_attrs change in Django 1.11
 2017-12-06 10:40:57 -05:00
Michael Youngstrom
fef38170f3 Merge pull request #16798 from edx/youngstrom/bokchoy_cache 
Update bokchoy db cache
 2017-12-06 10:11:58 -05:00
Sylvia Pearce
e40b00eda6 Merge pull request #16788 from edx/sylvia/DOC-3826 
On Import Course page, clarify content that's imported per course tea…
 2017-12-06 09:59:50 -05:00
Jeff LaJoie
f89b31da58 Merge pull request #16627 from edx/jlajoie/LEARNER-2983 
LEARNER-2983: Adds policy for entitlements
 2017-12-06 09:46:12 -05:00
Douglas Hall
ff03f037fc Merge pull request #16804 from edx/douglashall/upgrade_enterprise_0_55_4 
Upgrade edx-enterprise package to 0.55.4.
 2017-12-06 09:16:32 -05:00
AlasdairSwan
acab64be4d LEARNER-3128 add role=presentation to sequence nav list items 2017-12-06 08:38:56 -05:00
Jeff LaJoie
a567719236 LEARNER-2983: Adding of helper functions and modification of DRF to use SiteConfiguration policy 2017-12-06 08:36:21 -05:00
Douglas Hall
6598fb2141 Upgrade edx-enterprise package to 0.55.4. 
https://github.com/edx/edx-enterprise/compare/0.55.1...0.55.4
 2017-12-06 05:57:37 -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
Michael Youngstrom
7a38c5a13a Update bokchoy db cache 2017-12-05 22:16:56 -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
Ari Rizzitano
8ca0fe9dfc introduce ReactRenderer module and renderReact mako def 
[FEDX-453]

[extreme wip] mako/react bridge code [FEDX-453]

more attempts

split out entry points into separate file

this works!

kill dynamic import

error handling

didn't need webpack_static

handle passing props

cleanup django-template-rendering defs

pytest monkeypatch fix

cleanup

add id arg to renderReact def

more cleanup

oops

quality xss fixes

unittest fix

kill HelloWorld
 2017-12-05 17:53:46 -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
Jeremy Bowman
54d14098c0 PLAT-1427 Adapt to build_attrs change in Django 1.11 2017-12-05 17:29:35 -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
Sylvia Pearce
233d470ad2 On Import Course page, clarify content that's imported per course team request 2017-12-05 13:40:36 -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