Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
39757aa5b0 Merge pull request #16906 from edx/efischer/zendesk_503 
Log payload on 503 errors
 2017-12-13 15:45:54 -05:00
Harry Rein
310279c704 Merge pull request #16905 from edx/HarryRein/reenabling-jasmine-tests-entitlements 
Reenabling Entitlement Jasmine tests.
 2017-12-13 15:33:42 -05:00
Jeremy Bowman
d44e6297ae PLAT-1847 Fix cms tests under Django 1.9 2017-12-13 15:29:02 -05:00
Matt Tuchfarber
a4f5c14cf9 Order program instructors based on new program field 
This collects the instructors from the courses in the program like before. There is now a field in the program model in discovery that allows you to list instructors for the program.

Depends on this PR: https://github.com/edx/course-discovery/pull/1244
 2017-12-13 14:43:44 -05:00
Ned Batchelder
c965f52d74 Merge pull request #16893 from edx/nedbat/protect-safe_lxml 
Skip safe_lxml/etree.py in future isorts
 2017-12-13 14:15:08 -05:00
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
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
Harry Rein
7380bcd70c Reenabling Entitlement Jasmine tests. 
LEARNER-3483
 2017-12-13 13:31:30 -05:00
Eric Fischer
fde7700543 Log payload on 503 errors 
EDUCATOR-1956
 2017-12-13 13:31:23 -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
David Ormsbee
7f3a55af74 Remove dealer.git (startup optimization). 
In the absence of an EDX_PLATFORM_VERSION OS env variable, we used to
calculate the current version by looking at the current git revision of
the edx-platform repo. This was an expensive calculation (~7% of startup
costs). It also turns out that at some point we stopped setting that env
variable anywhere, so it always fell back to recalculating it.

With this commit, we'll start reading the code version from the env JSON
files, and fall back to "unknown" rather than doing the dealer.git call.
 2017-12-13 11:35:43 -05:00
Michael Terry
4b25ffa39d Add expire_old_entitlements command 
This new management command will search for possible entitlements
that are languishing in the database and expire them if they can
be according to our policy.

This is meant to be run on a regular basis to clear out old
entitlements.

LEARNER-3087
 2017-12-13 11:11:55 -05:00
Tomasz Gargas
73f86006f7 Bump READ_VERSION of BlockCompletionTransformer to 1. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2017-12-13 17:11:36 +01:00
Tasawer Nawaz
a02dac29f1 Fix retries logic in award program certificate task 
LEARNER-3165
 2017-12-13 21:00:27 +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
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
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
8b02ce8394 Skip safe_lxml/etree.py in future isorts 2017-12-12 19:39:35 -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