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

44242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harry Rein
4cccfca8dc Merge pull request #16834 from edx/HarryJeff/LEARNER-3304-policy-front-end 
Policy Front end on the Course Dashboard
 2017-12-15 09:27:04 -05:00
Harry Rein
610c255bb6 Display the expired at logic for entitlements. 
LEARNER-3304

Displays the expired out status for the course dashboard and the programs pages.
 2017-12-15 08:25:38 -05:00
Albert (AJ) St. Aubin
31e8b67999 Merge pull request #16913 from edx/aj/LEARNER-2668_api_changes_post 
Minor fixes and code changes to the Entitlement Refund API
 2017-12-15 07:47:05 -05:00
Brittney Exline
b0773f8e9b Merge pull request #16917 from edx/bexline/enterprise_version_bump 
ENT-806/ENT-809 Upgrade edx-enterprise to 0.56.3
 2017-12-14 17:39:11 -05:00
Tyler Hallada
99b079bdd7 Merge pull request #16847 from edx/thallada/a11y-form-bok-choy 
Add bok-choy tests for studio accessibility form
 2017-12-14 17:17:42 -05:00
Tyler Hallada
67fe47713b Bump studio-frontend to 0.6.5 
Bump studio-frontend to 0.6.4
 2017-12-14 16:15:43 -05:00
Tyler Hallada
dbd4801e84 Add missing aria-label to footer policies <nav> 2017-12-14 16:15:42 -05:00
Tyler Hallada
4f8febff6d Remove hash & path on dev webpack css module names 
This will make bok-choy testing easier.
 2017-12-14 16:15:42 -05:00
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
Brittney Exline
04cc655656 ENT-806/ENT-809 Upgrade edx-enterprise to 0.56.3 2017-12-14 15:29:31 -05:00
David Ormsbee
6db93fc791 Merge pull request #16901 from edx/ormsbee/remove_git_lms 
Remove dealer.git (startup optimization).
 2017-12-14 15:15:06 -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 St. Aubin
d6feff0ade Minor fixes and code changes to the Entitlement Refund API 
[LEARNER-2668]
 2017-12-14 09:46:47 -05:00
George Babey
088aec985f Merge pull request #16907 from edx/gbabey/upgrade_enterprise_0_56_1 
Update edx-enterprise package to version 0.56.1
 2017-12-14 09:06:47 -05:00
George Babey
c272f531ff Update edx-enterprise package to version 0.56.1 
https://github.com/edx/edx-enterprise/compare/0.56.0...0.56.1
 2017-12-14 07:59:47 -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
Tasawer Nawaz
0a0a17c8fe Merge pull request #16900 from edx/tasawer/learner-3165-fix-retries-logic-in-award-program-certificate 
Fix retries logic in award program certificate task
 2017-12-14 12:15:50 +05:00
Douglas Hall
6a3227743a Merge pull request #16910 from edx/douglashall/ENT-798 
ENT-798 Update SailThru user with enterprise name on EnterpriseCustomerUser creation.
 2017-12-13 18:38:19 -05:00
Matt Tuchfarber
fc195ddff9 Merge pull request #16736 from edx/tuchfarber/WL_1343_instructor_ordering 
Order program instructors based on new program field
 2017-12-13 17:12:54 -05:00
Jeremy Bowman
d674f9086f Merge pull request #16889 from edx/jmbowman/PLAT-1840-commonlib 
PLAT-1840 Fix common/lib tests under Django 1.9
 2017-12-13 17:11:37 -05:00
Douglas Hall
ada86232c2 ENT-798 Update SailThru user with enterprise name on EnterpriseCustomerUser creation. 2017-12-13 16:24:27 -05:00
Jeremy Bowman
917f877299 PLAT-1840 Fix common/lib tests under Django 1.9 2017-12-13 15:57:00 -05:00
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
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