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

15360 Commits

Author SHA1 Message Date
Jillian Vogel
b43ac4e80e Merge pull request #16590 from open-craft/jill/video-block-all-sources 
Adds all HTML5 sources to the returned video API data
 2017-12-12 02:19:02 +10:30
Jillian Vogel
cdcb4be077 Adds "all_sources" field to Mobile API and video module Course Blocks 
student_view_data.

Added to both places because the iOS app uses both APIs data to provide
downloadable videos.
 2017-12-11 23:59:52 +10:30
Sven Marnach
02ddf4d321 Merge pull request #16166 from open-craft/smarnach/filter-course-enrollment-allowed 
Add search box to CourseEnrollmentAllowed admin interface.
 2017-12-11 13:57:24 +01:00
Sofiya Semenova
b4a4318d1a Merge pull request #16705 from edx/sofiya/1552 
Educator 1552 Implement roving tabindex for WYSIWYG editor for discussions
 2017-12-08 13:24:07 -05:00
Sofiya Semenova
a1f0679f3a Educator 1552 - Implement roving tabindex for WYSIWYG editor for discussions 2017-12-08 11:18:11 -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
zubair-arbi
2ac544caeb Update account settings page for enterprise learners 
ENT-762
 2017-12-08 15:40:18 +05: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
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
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
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
John Eskew
b14d2e9cf7 Fix video transcript model import before Django initialization occurs. 2017-12-07 09:56:44 -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
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
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
Michael Youngstrom
fef38170f3 Merge pull request #16798 from edx/youngstrom/bokchoy_cache 
Update bokchoy db cache
 2017-12-06 10:11:58 -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
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
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
d4667691fb Convert final field from CommaSeparatedIntegerField to CharField. 2017-12-05 16:47:23 -05:00
Jeremy Bowman
103c723c6d PLAT-1801 Preserve new user login behavior under Django 1.10+ 2017-12-05 10:20:25 -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
Brian Mesick
d905899873 Merge pull request #16760 from edx/bmedx/django111_remove_noargscommand 
Update clear_collectstatic_cache management command to Django 1.11 spec
 2017-12-04 14:19:44 -05:00
Eric Fischer
d0250baad9 Merge pull request #16726 from edx/efischer/xss_followup 
fix a few xss errors
 2017-12-04 14:16:46 -05:00
Albert (AJ) St. Aubin
48c40cf05e Merge pull request #16751 from edx/aj/stafF_entitlement_permissions 
Updates to the API Endpoint to remove the Staff users ability to get all
 2017-12-04 14:08:56 -05:00
bmedx
29514cc2d2 Update clear_collectstatic_cache management command to Django 1.11 spec 2017-12-04 13:05:33 -05:00
Eric Fischer
3687d6aa62 fix a few xss errors 2017-12-04 11:56:26 -05:00
Eric Fischer
2e3f871c12 Memoize common lookups during request 
Prevents repeated memcached lookups on functions whose values should
remain static for the lifetime of a request.

EDUCATOR-1731
 2017-12-04 11:54:50 -05:00
Jeremy Bowman
067785dbfd Merge pull request #16710 from edx/jmbowman/PLAT-1419 
PLAT-1419 Make edxmako a proper template backend
 2017-12-04 11:07:30 -05:00
Albert St. Aubin
dfa7b73a61 Updates to the API Endpoint to remove the Staff users ability to get all 
Entitlements
 2017-12-04 08:37:15 -05:00
Farhanah Sheets
d0687e97b1 Merge pull request #16734 from edx/fsheets/EDUCATOR-1825 
Update studiofrontend to pass generic studioContext
 2017-12-01 19:02:33 -05:00
Farhanah Sheets
e395e78521 Update to use generic studioContext configuration 2017-12-01 17:55:55 -05:00
Jeremy Bowman
fdc50c3aa8 PLAT-1419 Make edxmako a proper template backend 2017-12-01 17:01:52 -05:00
Matt Drayer
61bd579810 mattdrayer/ENT-783: Remove city from SuccessFactors OData API requests 2017-12-01 13:27:57 -05:00
Jesse Zoldak
9c49c10b27 Revert "Allow theme template block override" 2017-11-30 17:09:13 -05:00
Brian Mesick
3951b7527c Merge pull request #16658 from edx/bmedx/django111_tag_test_failures_lms_3 
Tag LMS Unit 3 tests that fail in Django 1.11
 2017-11-30 16:14:18 -05:00
Anthony Mangano
f72cf800e1 Consider user entitlements and use entitlement products in bundle one-click purchase 2017-11-30 13:59:46 -05:00
Uman Shahzad
1ab92ee9f2 Fix an introduced xsslint issue. 2017-11-30 04:55:11 +05:00
Uman Shahzad
8a361300ec Fix some mako-missing-default xsslint issues in test files. 2017-11-29 23:50:31 +05:00
Uman Shahzad
37844fd927 Merge pull request #15947 from open-craft/allow-theme-template-block-override 
Allow theme template block override
 2017-11-29 22:25:27 +05:00
Diana Huang
8693f2fd38 UX updates to registration form. 
- hide optional fields by default.
- instructions only shown when focused in.
- removed header
- Terms of service link and checkbox on same line.
 2017-11-29 09:46:54 -05:00
M. Rehan
b17cd9b992 Merge pull request #16536 from edx/enable-videos-upload-by-default 
Enable Video Uploads by default
 2017-11-29 17:35:01 +05:00
Albert (AJ) St. Aubin
8bd9c14f0b Merge pull request #16660 from edx/aj/entitlement_api_permissions 
Updated the permissions to all non staff users to get their entitlements
 2017-11-29 07:28:33 -05:00
Uman Shahzad
53fea6a4b7 Merge pull request #16624 from open-craft/uman/force-sync-learner-data 
[ENT-759] Add a TPA pipeline step to take forced sync into account.
 2017-11-29 17:11:29 +05:00
Uman Shahzad
ee09c4ccf9 Add a TPA pipeline step to allow force sync of user details. 
The feature is controlled by a switch on the provider.
Emails are sent if the email changes during the sync.
We skip syncing the username/email if there would be a conflict.
 2017-11-29 16:16:55 +05:00