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

44190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Filler
dd4d13af5f Merge pull request #16611 from edx/afzaledx/WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-13 08:48:06 -05:00
Ahsan Ul Haq
773b622efa Merge pull request #16874 from edx/ahsan/LEARNER-3546-White-listed-certificates-not-appear-on-progress-page 
Show white listed certificates on progress page
 2017-12-13 11:51:25 +05:00
Ahsan Ulhaq
50c8a80f32 Show white listed ceretificates on progress page 
White listed certificates should appear on the progress page
even if the user has not passed the course
LEARNER-3546
 2017-12-13 10:06:37 +05:00
Ned Batchelder
91d55cf95f Merge pull request #16887 from edx/private_to_public_04030f5 
Mergeback PR from private to public.
 2017-12-12 19:07:26 -05:00
Brittney Exline
c0ce7cf69a Merge pull request #16880 from edx/bexline/registration_fix_ie11 
ENT-800 Fix IE11 Broken Submit button on Registration Page
 2017-12-12 16:25:01 -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
Jesse Zoldak
0380c5fc5d Merge pull request #16879 from edx/zoldak/no-freeze-to-console 
Remove an extra call to pip freeze
 2017-12-12 12:20:43 -08:00
Harry Rein
68de7cf3f6 Merge pull request #16884 from edx/HarryRein/entitlements-jasmine-tests 
Importing bootstrap and popper through webpack.
 2017-12-12 15:14:59 -05:00
edX Transifex Bot
da8987aea8 Update translation strings 2017-12-12 15:06:11 -05:00
Harry Rein
791b8b141e Importing bootstrap and popper through webpack. 2017-12-12 14:50:38 -05:00
Harry Rein
c864de7c2a Merge pull request #16878 from edx/HarryRein/entitlements-requireJS-loading-issue 
Harry rein/entitlements require js loading issue
 2017-12-12 13:51:54 -05:00
Jesse Zoldak
1db4b052c0 No need to show pip freeze output on the console 2017-12-12 12:17:54 -05:00
Brittney Exline
c110a9ac21 ENT-800 Fix IE11 Broken Submit button on Registration Page 2017-12-12 11:58:00 -05:00
Harry Rein
badb1f8482 Merge pull request #16783 from edx/HarryRein/course-run-selection-program-dashboard 
Harry rein/course run selection program dashboard
 2017-12-12 11:57:04 -05:00
Harry Rein
19406fa48f Removing RequireJS imports of bootstrap and popper. 2017-12-12 11:07:11 -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
Jae Bradley
a9506c1a05 Merge pull request #16828 from edx/add-analytics-api-env-variables 
Add Analytics API Environment Variables
 2017-12-12 08:48:16 -05:00
George Babey
3cc25a30f5 Merge pull request #16870 from edx/gbabey/upgrade_enterprise_0_55_5 
Upgrade edx-enterprise package to 0.55.5
 2017-12-12 07:59:27 -05:00
Noraiz Anwar
d18fb6bf64 Merge pull request #16858 from edx/noraiz/EDUCATOR-1931 
temporary logs to check if anonymous user is accessing courseware
 2017-12-12 14:49:42 +05:00
noraiz-anwar
e7c0f36148 temporary logs to check if anonymous user is accessing courseware 2017-12-12 12:25:17 +05:00
Douglas Hall
cd70023141 Merge pull request #16861 from edx/douglashall/ENT-796 
Fix optional registration fields toggle.
 2017-12-11 20:10:19 -05:00
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
Douglas Hall
ede8ee4a5b Fix optional registration fields toggle. 
We need to account for optional fields that may get rendered
as hidden input elements due to the configuration of the
registration form when deciding whether or not to display
the optional registration fields toggle checkbox.

ENT-796
 2017-12-11 16:14:18 -05:00
George Babey
f3f08f4aad Upgrade edx-enterprise package to 0.55.5 
https://github.com/edx/edx-enterprise/compare/0.55.4...0.55.5
 2017-12-11 16:12:31 -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
jaebradley
1736371b6c add analytics api env variables 
use auth tokens instead of env tokens

use default values from common
 2017-12-11 09:23:21 -05:00
Afzal Wali
f589dc9d29 WL-1219 
Added extended profile fields to the Account settings page.
 2017-12-11 18:42:59 +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