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

44102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
1a7ffc73c2 raise zendesk_proxy rate limit 2017-12-07 16:04:01 -05:00
Tyler Hallada
f9623fc96a Merge pull request #16796 from edx/thallada/schedules-hold-back-fix 
Schedules: Fix hold back error
 2017-12-07 15:10:05 -05:00
John Eskew
254aa84f9d Merge pull request #16815 from edx/jeskew/fix_model_import_for_video_transcripts 
Fix video transcript model import before Django initialization occurs.
 2017-12-07 13:58:06 -05:00
Tyler Hallada
95bb6e3db0 Use pytest-style asserts in test_signals.py 2017-12-07 13:43:49 -05:00
Tyler Hallada
6e791c58ea Fix hold back error 
Also add try/except that prevents enroll failure caused by Schedule creation
exception in the future.

Address PR comments

Split one-line docstrings on their own line

Add period to the end of docstring summaries

Use kwargs.get to be more defensive

Disable pylint unused-argument about sender param
 2017-12-07 13:43:47 -05:00
Albert (AJ) St. Aubin
292848cfe7 Merge pull request #16617 from edx/aj/entitlement_session_backend 
Aj/entitlement session backend
 2017-12-07 12:05:17 -05:00
Calen Pennington
d1630a5871 Merge pull request #16808 from edx/adjust-max-pylint 
Lower pylint threshold to just above what it is on master
 2017-12-07 11:54:49 -05:00
Alessandro Roux
f7ea33351b Merge pull request #16809 from edx/discussions/remove-roll-out-waffles 
EDUCATOR-1577: Removed roll-out flags.
 2017-12-07 11:32:08 -05:00
Albert St. Aubin
0ea3753d94 Added Entitlement enroll and unenroll logic to the Enrollment API 
[LEARNER-3136]

This commit containts the logic and API endpoint for a user to Enroll,
Unenroll, and switch-session on a Course Entitlement.
 2017-12-07 10:54:59 -05:00
Calen Pennington
4ff39cf51f Merge pull request #16819 from edx/cale/remove-studio-dynamic-asset-dir 
Don't use the edx-platform revision as the studio assets base url
 2017-12-07 10:49:34 -05:00
Jeremy Bowman
df63e311d0 Merge pull request #16818 from edx/jmbowman/PLAT-1372 
PLAT-1372 Remove dead templates copying old admin HTML
 2017-12-07 10:26:31 -05:00
John Eskew
b14d2e9cf7 Fix video transcript model import before Django initialization occurs. 2017-12-07 09:56:44 -05:00
Ayub khan
7d28b41bc8 Merge pull request #16825 from edx/update_translations_dec_7 
updated translations
 2017-12-07 18:25:12 +05:00
ayub-khan
96984aa3a4 updated translations 7 dec 2017-12-07 17:17:16 +05:00
Jeremy Bowman
3fe6ba59bc PLAT-1372 Remove dead templates copying old admin HTML 2017-12-06 17:11:52 -05:00
John Eskew
db2be76adf Merge pull request #16799 from edx/jeskew/turn_on_django_deprecation_warnings 
Turn on deprecation warnings in Django 1.11
 2017-12-06 16:55:52 -05:00
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
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