Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uzair Rasheed
1225bde736 Merge pull request #16807 from edx/LEARNER-3385/content-injection-on-registration 
Verify 'Full Name' field does not allow HTML in Signup form
 2017-12-08 21:34:09 +05:00
Sofiya Semenova
a1f0679f3a Educator 1552 - Implement roving tabindex for WYSIWYG editor for discussions 2017-12-08 11:18:11 -05:00
Eric Fischer
25498df8e3 remove placeholder heading 2017-12-08 10:41:21 -05:00
Eric Fischer
648bfeae37 Merge pull request #16832 from edx/dahlia/raise_zendesk_rate_limit 
raise zendesk_proxy rate limit
 2017-12-08 09:43:00 -05:00
Eric Fischer
9bd75eaad1 Update studio-frontend to 0.6.0 2017-12-08 09:40:58 -05:00
Diana Huang
0ecc0558a3 More registration form cleanup. 2017-12-08 09:39:01 -05:00
Waheed Ahmed
3fc788286b Merge pull request #16823 from edx/waheed/LEARNER-2731-implement-journeys-app-banner 
Implement journeys app banner.
 2017-12-08 19:37:47 +05:00
uzairr
8ffac2061d Verify 'Full Name' field does not allow HTML in Signup form 
'Full Name' field in the signup form is allowing HTML as an input
which makes spoofing easily.To avoid it, validation is added
that will ensure 'Full Name' field does not allow HTML.

LEARNER-3385
 2017-12-08 19:18:18 +05:00
Waheed Ahmed
3ed08e3b35 Implement journeys app banner. 
Banners will enable the deep linking functionality for
mobile apps.

LEARNER-2731
 2017-12-08 18:33:47 +05:00
Zubair Afzal
979c7cd1f0 Merge pull request #16703 from edx/zub/ENT-762-update-account-settings-page-for-enterprise-sso 
Update account settings page for enterprise learners
 2017-12-08 17:56:19 +05:00
zubair-arbi
2ac544caeb Update account settings page for enterprise learners 
ENT-762
 2017-12-08 15:40:18 +05:00
Rabia Iftikhar
17c889b7dd Merge pull request #16835 from edx/ri/update-edx-organizations-version-0.4.9 
update edx-organizations version to 0.4.9
 2017-12-08 15:00:12 +05:00
rabia23
eceacb491b update edx-organizations version to 0.4.9 2017-12-08 08:08:52 +00:00
Harry Rein
4c352e2f2b Merge pull request #16472 from edx/HarryRein/course-run-selection-dashboard 
Allow users to fulfill entitlements and change enrollments from the course dashboard.
 2017-12-07 16:39:04 -05:00
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
bmedx
6294baf456 Add command to bulk move user language prefs from one code to another 2017-12-07 15:06:09 -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
McKenzie Welter
5d1eecd43c python tests, quality, and html element type fix 2017-12-07 13:50:24 -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 St. Aubin
28837c020f Allowing a user to fulfill their entitlement on the course dashboard. 
The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the course dashboard.
 2017-12-07 12:41:12 -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
mrey
033645758d Use single quotes on aws.py 2017-12-07 08:54:55 +01: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