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

15380 Commits

Author SHA1 Message Date
Tyler Hallada
d6880218e7 Add a11y form bok-choy tests 
Address PR comments

Attempt to fix bok-choy tests?
 2017-12-14 16:15:37 -05:00
Jeremy Bowman
7ba83dd533 Merge pull request #16908 from edx/jmbowman/PLAT-1847 
PLAT-1847 Fix cms tests under Django 1.9
 2017-12-14 13:49:55 -05:00
Albert (AJ) St. Aubin
8c205ad84c Merge pull request #16877 from edx/aj/LEARNER-2668_api_changes 
Entitlement API Changes to support User Revoke and Refund
 2017-12-14 07:16:01 -05:00
Waheed Ahmed
67752c39cc Merge pull request #16305 from edx/waheed/LEARNER-2730-text-me-the-app 
Create custom Text Me The App landing page.
 2017-12-14 12:50:00 +05:00
Jeremy Bowman
d44e6297ae PLAT-1847 Fix cms tests under Django 1.9 2017-12-13 15:29:02 -05:00
Albert St. Aubin
1d7443221d Entitlement API Changes to support User Revoke and Refund 
[LEARNER-2668]

These changes will support a user intiated Revoke and Refund of
an Entitlement. This includes unenrolling the User from
any related Course Runs they are currently enrolled in.
 2017-12-13 13:37:14 -05:00
Matt Drayer
931fd8a537 Merge pull request #16886 from edx/mattdrayer/ENT-807 
ENT-807: Utilize configured user for SuccessFactors BizX OData API callbacks
 2017-12-13 10:26:54 -05:00
Sofiya Semenova
b159c2712e Merge pull request #16864 from edx/sofiya/symmath 
Educator-1879 Symmath fails to initialize because of requests library
 2017-12-13 10:18:44 -05:00
Waheed Ahmed
efe4120b8f Create custom Text Me the App landing page. 
Rebrand the branch.io text me the app landing page to reflect edX's style.

LEARNER-2730
 2017-12-13 17:10:32 +05:00
Ned Batchelder
3d49d80b58 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-12 16:13:47 -05:00
Sofiya Semenova
8030f82e1c Ed-1879 Remove requests import in symmath 2017-12-12 15:57:42 -05:00
Matt Drayer
885ddb9977 Utilize configured user for SuccessFactors BizX OData API callbacks 2017-12-12 15:23:05 -05:00
Harry Rein
2711fb521a Allowing a user to fulfill their entitlement on the programs dashboard. 
LEARNER-3438

The user can now enroll in a session, unenroll from a session or change session
from a new course enrollment card on the programs dashboard.
 2017-12-12 10:35:26 -05:00
Jeremy Bowman
1c661adfe6 Merge pull request #16868 from edx/jmbowman/PLAT-1830 
PLAT-1830 Allow running any test suite in tox
 2017-12-11 18:11:58 -05:00
Jeremy Bowman
05e7a4d671 PLAT-1830 Allow running any test suite in tox 2017-12-11 15:43:01 -05:00
Michael Terry
25076e6a92 Show related programs when unenrolled 
On the course dashboard, show related programs to your course
even if you are not enrolled in a current session.

LEARNER-3504
 2017-12-11 14:52:36 -05:00
McKenzie Welter
853cd9a0a7 show programs in which user holds a course entitlement on programs listing page 2017-12-11 12:22:36 -05:00
Eric Fischer
25eb31877b Merge pull request #16843 from edx/why_did_we_not_do_this_sooner 
fix some eslint ish
 2017-12-11 12:08:21 -05:00
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
Eric Fischer
cffc155307 test fixup 2017-12-08 14:39:02 -05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05: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