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

44207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Hallada
70ef88ae75 Merge pull request #16904 from edx/thallada/bump-sfe 
Bump SFE to 0.6.3
 2017-12-13 13:56:48 -05:00
Douglas Hall
0fd77c0f9a Merge pull request #16902 from edx/douglashall/update_enterprise_0_56_0 
Update edx-enterprise package to version 0.56.0.
 2017-12-13 13:56:24 -05:00
Tyler Hallada
4c45e01b02 Bump SFE to 0.6.3 2017-12-13 13:12:08 -05:00
Harry Rein
a0df76e19e Merge pull request #16903 from edx/HarryRein/entitlements-jasmine-tests-requireJS 
Remove dependency on Popper.js
 2017-12-13 13:04:52 -05:00
Harry Rein
54734841a2 Remove dependency on Popper.js 2017-12-13 12:45:08 -05:00
Stu Young
02573a3178 Merge pull request #16851 from edx/estute/paver-fingerprint-migrations 
TE-2350 paver function to fingerprint bokchoy db files
 2017-12-13 12:20:08 -05:00
Douglas Hall
95e821f34b Update edx-enterprise package to version 0.56.0. 
https://github.com/edx/edx-enterprise/compare/0.55.5...0.56.0
 2017-12-13 11:47:43 -05:00
Nimisha Asthagiri
c1d0252999 Merge pull request #16674 from open-craft/tomaszgy/completion_in_blocks_api 
Add block completion value as optional field in course_blocks.api.
 2017-12-13 10:38:36 -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
Brian Mesick
e4648bff79 Merge pull request #16860 from edx/bmedx/django111_fix_cms_errors 
Changes to fix various Django 1.11 errors
 2017-12-13 10:07:43 -05:00
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
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
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
Tomasz Gargas
d4edf33f09 Remove a check for READ_VERSION==0 in BlockStructureBlockData._add_transformer. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2017-12-12 14:22:10 +01:00
Tomasz Gargas
64c4ae4a7a Add block completion value as optional field in course_blocks.api. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2017-12-12 14:22:10 +01: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