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

44165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Mesick
9b10dd70f2 Merge pull request #16866 from edx/bmedx/TestGetProgramsWithType_maxdiff 
Increase diff output for theses tests to debug potential issues
 2017-12-11 18:40:45 -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
Alex Dusenbery
5a30f735dd EDUCATOR-1817 | upgrade ora2 to 2.1.8 2017-12-11 17:07:31 -05:00
Brian Mesick
44703269b5 Merge pull request #16814 from edx/bmedx/course_lang_bulk_update_cmd 
Add command to bulk move user language prefs from one code to another
 2017-12-11 16:53:31 -05:00
Ned Batchelder
e6a8ab21c8 Merge pull request #16780 from mreyk/teltek/feature/all-languages 
Allow to overwrite ALL_LANGUAGES parameter in aws configuration
 2017-12-11 16:40:29 -05:00
Michael Terry
15d80c7bb3 Merge pull request #16854 from edx/mikix/LEARNER-3504 
Show related programs when unenrolled
 2017-12-11 16:12:12 -05:00
Eric Fischer
320fc3e5c9 Merge pull request #16863 from edx/efischer/library_creator_setting 
Add DISABLE_LIBRARY_CREATION setting to library creator logic
 2017-12-11 15:55:32 -05:00
Jeremy Bowman
05e7a4d671 PLAT-1830 Allow running any test suite in tox 2017-12-11 15:43:01 -05:00
Harry Rein
c734058cd7 Merge pull request #16862 from edx/HarryRein/temp-patch-dashboard-entitlements 
Load popper and bootstrap through a script tag to reduce stage flakiness
 2017-12-11 15:16:00 -05:00
bmedx
b1d4daf638 Increase diff output for theses tests to debug potential issues 2017-12-11 15:00:49 -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
Brian Mesick
98456e11a1 Merge pull request #16840 from edx/bmedx/django111_conditional_birdcage 
Make all uses of birdcage conditional, should fix 1.11 errors
 2017-12-11 14:51:48 -05:00
Eric Fischer
76d19dbe15 Add DISABLE_LIBRARY_CREATION setting to library creator logic 
EDUCATOR-1924
 2017-12-11 14:31:02 -05:00
McKenzie Welter
5da1bc441a Merge pull request #16844 from edx/McKenzieW/learner-3493 
show programs in which user holds a course entitlement on program listing page
 2017-12-11 14:14:48 -05:00
Harry Rein
a9a255e3c8 Load popper and bootstrap through a script tag to reduce flakiness on stage. 2017-12-11 13:23:29 -05:00
David Ormsbee
8844f9662b Merge pull request #16850 from edx/ormsbee/remove_old_lms_cms_envs 
Remove old Preview config files (not used).
 2017-12-11 13:22:39 -05:00
bmedx
2579785a54 Make all uses of birdcage conditional, should fix 1.11 errors 2017-12-11 13:21:06 -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
John Eskew
831eae6255 Merge pull request #16830 from edx/jeskew/remove_double_opaque_keys_req 
Remove added reqs that are already in base.txt.
 2017-12-11 10:58:27 -05:00
John Eskew
a42698a7ed Use a common base req file to avoid tox double requirements. 2017-12-11 10:56:17 -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
Farhanah Sheets
9b3aad31cc Merge pull request #16852 from edx/dahlia/sfe_bump 
Update studio-frontend to 0.6.1
 2017-12-11 09:31:51 -05:00
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
Tasawer Nawaz
e7ff0230c6 Merge pull request #16822 from edx/tasawer/learner-3165/fix-error-logging-on-program-certificate-error 
update logging in award program certificate task
 2017-12-11 18:26:16 +05:00
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
Tasawer Nawaz
a6f4f1762b update logging in award program certiicate task LEARNER-3165 2017-12-11 17:16:25 +05:00
Dillon-Dumesnil
bb9e5922e1 Merge pull request #16853 from edx/ddumesnil/xblock 
Removing debugging
 2017-12-08 16:40:45 -05:00
Dillon Dumesnil
a03ce146a0 Removing debugging 2017-12-08 15:35:29 -05:00
Farhanah Sheets
78d61c1ad9 Bump to SFE v0.6.1 2017-12-08 15:08:41 -05:00
Dillon-Dumesnil
e61af093a6 Merge pull request #16846 from edx/ddumesnil/xblock 
Updating xblock-review version to include commit for being more defen…
 2017-12-08 14:57:16 -05:00
Eric Fischer
f63cf61a9d cleanup regex 2017-12-08 14:39:02 -05:00
Eric Fischer
cffc155307 test fixup 2017-12-08 14:39:02 -05:00
Eric Fischer
8ec97371bd drop eslint limit 2017-12-08 14:39:01 -05:00
Eric Fischer
5bc6b31e29 eslint --fix 2017-12-08 14:38:41 -05:00
Michael Frey
e0112d18e3 Merge pull request #16842 from edx/HarryRein/popover-styling 
Fix styling on the popover.
 2017-12-08 14:18:28 -05:00
David Ormsbee
3e09b2d09d Remove old Preview config files (not used). 2017-12-08 13:43:32 -05:00
Dillon Dumesnil
aa8b7ab2ec Fixing correctness text so it doesn't match 'correct' in the word 'correctness' causing my tests to fail. This should be improved soon 2017-12-08 13:34:44 -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
Dillon Dumesnil
0def70e725 Updating xblock-review version to include commit for being more defensive about score field in the state of a problem 2017-12-08 13:03:05 -05:00
Diana Huang
8752480aac Merge pull request #16829 from edx/diana/registration-form-improvements 
LEARNER-3469 - More registration form cleanup.
 2017-12-08 13:00:20 -05:00
Harry Rein
2162b966d0 Fix styling on the popover. 2017-12-08 12:28:06 -05:00
Eric Fischer
171e671577 Merge pull request #16838 from edx/dahlia/sfe_bump 
Update studio-frontend to 0.6.0
 2017-12-08 12:00:10 -05:00
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