Commits · release-candidate-1047 · edx / edx-platform · GitLab

06 Dec, 2017 12 commits
- Merge pull request #16639 from edx/ari/react-renderer · 8b59c6d5
```
mako/react bridge code
```
  Ari Rizzitano committed Dec 06, 2017
  8b59c6d5 Browse Files
- Merge pull request #16800 from edx/jmbowman/PLAT-1427 · 9b92a3b7
```
PLAT-1427 Adapt to build_attrs change in Django 1.11
```
  Jeremy Bowman committed Dec 06, 2017
  9b92a3b7 Browse Files
- Merge pull request #16798 from edx/youngstrom/bokchoy_cache · fef38170
```
Update bokchoy db cache
```
  Michael Youngstrom committed Dec 06, 2017
  fef38170 Browse Files
- Merge pull request #16788 from edx/sylvia/DOC-3826 · e40b00ed
```
On Import Course page, clarify content that's imported per course tea…
```
  Sylvia Pearce committed Dec 06, 2017
  e40b00ed Browse Files
- Merge pull request #16627 from edx/jlajoie/LEARNER-2983 · f89b31da
```
LEARNER-2983: Adds policy for entitlements
```
  Jeff LaJoie committed Dec 06, 2017
  f89b31da Browse Files
- Merge pull request #16804 from edx/douglashall/upgrade_enterprise_0_55_4 · ff03f037
```
Upgrade edx-enterprise package to 0.55.4.
```
  Douglas Hall committed Dec 06, 2017
  ff03f037 Browse Files
- LEARNER-2983: Adding of helper functions and modification of DRF to use SiteConfiguration policy · a5677192
  Jeff LaJoie committed Dec 06, 2017
  
  a5677192 Browse Files
- Upgrade edx-enterprise package to 0.55.4. · 6598fb21
```
https://github.com/edx/edx-enterprise/compare/0.55.1...0.55.4
```
  Douglas Hall committed Dec 06, 2017
  6598fb21 Browse Files
- Update translation strings · ff7fa721
  edX Transifex Bot committed Dec 06, 2017
  
  ff7fa721 Browse Files
- Merge pull request #16690 from edx/LEARNER-3337/validate-username-field · 6b146db1
```
Verify 'Full Name' field does not allow HTML.
```
  Uzair Rasheed committed Dec 06, 2017
  6b146db1 Browse Files
- Update bokchoy db cache · 7a38c5a1
  Michael Youngstrom committed Dec 05, 2017
  
  7a38c5a1 Browse Files
- Merge pull request #14674 from cpennington/cale/latest-edx-lint · d2963a66
```
Cale/latest edx lint
```
  Calen Pennington committed Dec 05, 2017
  d2963a66 Browse Files
05 Dec, 2017 28 commits
- introduce ReactRenderer module and renderReact mako def · 8ca0fe9d
```
[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
```
  Ari Rizzitano committed Dec 05, 2017
  8ca0fe9d Browse Files
- Merge pull request #16775 from edx/jeskew/test_migrations_in_d111 · 0a341cf5
```
Fix warnings/errors in Django 1.10
```
  John Eskew committed Dec 05, 2017
  0a341cf5 Browse Files
- PLAT-1427 Adapt to build_attrs change in Django 1.11 · 54d14098
  Jeremy Bowman committed Dec 05, 2017
  
  54d14098 Browse Files
- Merge pull request #16792 from edx/release-mergeback-to-master · 740268c6
```
Merge release back to master
```
  edx-pipeline-bot committed Dec 05, 2017
  740268c6 Browse Files
- Convert final field from CommaSeparatedIntegerField to CharField. · d4667691
  John Eskew committed Dec 05, 2017
  
  d4667691 Browse Files
- Fix URLs that generate warnings in Django 1.10. · f5a83d5d
  John Eskew committed Dec 05, 2017
  
  f5a83d5d Browse Files
- Merge pull request #16795 from edx/jmbowman/PLAT-1418 · 62f91dd7
```
PLAT-1418 Remove obsolete can_import_settings attribute
```
  Jeremy Bowman committed Dec 05, 2017
  62f91dd7 Browse Files
- Merge pull request #16791 from edx/jmbowman/PLAT-1382 · 811f313c
```
PLAT-1382 Populate ALLOWED_HOSTS for tests
```
  Jeremy Bowman committed Dec 05, 2017
  811f313c Browse Files
- Merge pull request #16793 from edx/dsjen/dummy-token · a9be2b1d
```
Remove zendesk access token from support view.
```
  Dennis Jen committed Dec 05, 2017
  a9be2b1d Browse Files
- Merge pull request #16766 from edx/estute/paver-command-updates-bokchoy-db · 3495f3b6
```
TE-2320 - paver command to consolidate bokchoy db cache creation
```
  Stu Young committed Dec 05, 2017
  3495f3b6 Browse Files
- PLAT-1418 Remove obsolete can_import_settings attribute · df008438
  Jeremy Bowman committed Dec 05, 2017
  
  df008438 Browse Files
- Remove zendesk access token from support view · aca284b7
  Dennis Jen committed Dec 05, 2017
  
  aca284b7 Browse Files
- Merge pull request #16790 from edx/zoldak/remove-flaky-paver-asset-tests · 5dec436f
```
Remove flaky Asset Task testcase classes 
```
  Jesse Zoldak committed Dec 05, 2017
  5dec436f Browse Files
- PLAT-1382 Populate ALLOWED_HOSTS for tests · da8cf6b5
  Jeremy Bowman committed Dec 05, 2017
  
  da8cf6b5 Browse Files
- Remove flaky testcase classes · 82acc30f
  Jesse Zoldak committed Dec 05, 2017
  
  82acc30f Browse Files
- Merge pull request #16774 from edx/jmbowman/PLAT-1801 · cc6e3219
```
PLAT-1801 Preserve new user login behavior under Django 1.10+
```
  Jeremy Bowman committed Dec 05, 2017
  cc6e3219 Browse Files
- Merge pull request #16770 from edx/pacing/refactor-common-code · aabba910
```
Move ACE Common code out of Schedules
```
  Nimisha Asthagiri committed Dec 05, 2017
  aabba910 Browse Files
- On Import Course page, clarify content that's imported per course team request · 233d470a
  Sylvia Pearce committed Dec 05, 2017
  
  233d470a Browse Files
- Merge pull request #16786 from edx/diana/registration-form-bugs · 06e7e18d
```
Fix more registration form bugs.
```
  Diana Huang committed Dec 05, 2017
  06e7e18d Browse Files
- Fix quality issues in ace_common · 7245f769
  Nimisha Asthagiri committed Dec 05, 2017
  
  7245f769 Browse Files
- Update usages to ace_common · 7ef443f7
  Nimisha Asthagiri committed Dec 05, 2017
  
  7ef443f7 Browse Files
- Move ACE Common code out of Schedules · c6ee8eb6
  Nimisha Asthagiri committed Dec 05, 2017
  
  c6ee8eb6 Browse Files
- Merge pull request #16771 from edx/ormsbee/fix_asset_watch_args · 94c5cce7
```
Fix watch_assets call from paver update_assets.
```
  David Ormsbee committed Dec 05, 2017
  94c5cce7 Browse Files
- Fix more registration form bugs. · 366d0e14
  Diana Huang committed Dec 05, 2017
  
  366d0e14 Browse Files
- Merge pull request #16773 from edx/thallada/schedules-no-escape-txt · 26d42de4
```
Schedules: turn off HTML escaping for email text fields
```
  Tyler Hallada committed Dec 05, 2017
  26d42de4 Browse Files
- PLAT-1801 Preserve new user login behavior under Django 1.10+ · 103c723c
  Jeremy Bowman committed Dec 05, 2017
  
  103c723c Browse Files
- Merge pull request #16782 from edx/aj/fix-unicode-error · 08ca2110
```
Handle Unicode chars with AlreadyRunningError exception
```
  Awais Jibran committed Dec 05, 2017
  08ca2110 Browse Files
- Verify 'Full Name' field does not allow HTML. · 333e3315
```
'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
```
  uzairr committed Dec 05, 2017
  333e3315 Browse Files