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

49248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sandroroux
f365aa9b6a Deleted waffle-based tests. 2017-12-06 16:20:47 -05:00
Calen Pennington
a7d6f84398 Don't use the edx-platform revision as the studio assets base url 2017-12-06 16:12:07 -05:00
John Eskew
4bbc3aa37a Turn on deprecation warnings post-Django 1.11 for bokchoy tests. 2017-12-06 16:04:02 -05:00
Alex Dusenbery
941bc5cf21 EDUCATOR-1547 | ORA2 v2.1.6 2017-12-06 16:03:13 -05:00
Michael Terry
64bcfa2a04 Merge pull request #16810 from mikix/mikix/LEARNER-3125 
Fix breadcrumb tooltips in IE
 2017-12-06 16:00:15 -05:00
Eric Fischer
35611e81ec Merge pull request #16769 from edx/dahlia/zendesk_proxy_client 
Zendesk proxy client
 2017-12-06 15:47:01 -05:00
Jeremy Bowman
0974e5b055 Merge pull request #16812 from edx/jmbowman/PLAT-1749 
PLAT-1749 Support Django 1.10+ CSRF tokens
 2017-12-06 15:31:16 -05:00
Nimisha Asthagiri
63d7f87f4f Merge pull request #16811 from edx/pacing/revert-schedule-waffle-removal 
Revert removing CREATE_SCHEDULE_WAFFLE_FLAG "Merge pull request #16728"
 2017-12-06 14:26:15 -05:00
Eric Fischer
8743cda0d6 Zendesk Proxy 
This change creates a new lms/cms endpoint which accepts unauthenticated
requests to securely create zendesk tickets. This allows javascript code to
create tickets without exposing ZENDESK_OAUTH_ACCESS_TOKEN

EDUCATOR-1889
 2017-12-06 13:32:44 -05:00
Jeremy Bowman
19709cd36f PLAT-1749 Support Django 1.10+ CSRF tokens 2017-12-06 13:18:00 -05:00
Nimisha Asthagiri
8acf3434c0 Revert "Merge pull request #16728 from edx/pacing/remove-create-schedules-from-course-waffle-flag" 
This reverts commit 8b652ad352, reversing
changes made to b212af2488.
 2017-12-06 11:58:39 -05:00
Michael Terry
e9b3ba72df Fix breadcrumb tooltips in IE 
IE11 is not using 'overflow: visible' as the default overflow,
so set that manually. This allows our tooltips on the course nav
buttons to appear on hover or focus.

LEARNER-3125
 2017-12-06 11:58:07 -05:00
sandroroux
4d948672cd Brought SiteConfig checks back. 2017-12-06 11:43:29 -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
sandroroux
f52f0914fa Removed enable_forum_notifications 2017-12-06 10:12:29 -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
Calen Pennington
bcd66c5135 Lower pylint threshold to just above what it is on master 2017-12-06 10:03:48 -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
sandroroux
b3bbc159a0 Removed discussions.forum_response_notifications and discussions.send_notifications_for_course 2017-12-06 09:29:15 -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
Ned Batchelder
63b49ee051 Fix safe_lxml. SEC-338 
The imports were sorted in May, which broke the monkeypatching in
safe_lxml.  I added two tests that the XML parsers are properly patched,
but they didn't pass until I added the monkeypatching to the start of
the test runs.  Once that was done, some tests failed because they
relied on specific details of how empty elements are represented.  Those
tests are now fixed.
 2017-12-05 21:40:06 -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
John Eskew
50ebfaf734 Add -Wd when running pytest to turn on deprecation warnings in Django 1.11 2017-12-05 16:25:56 -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