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

44268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anthony Mangano
fdadd4cdf4 Fix a11y issues with unenroll modal 2017-12-18 16:44:09 -05:00
Cliff Dyer
ca46bfcf06 Merge pull request #16688 from open-craft/cornwell/rest-endpoint 
MCKIN-5896 - Create a REST endpoint for batch-uploading offline completions.
 2017-12-18 11:37:24 -05:00
Matthew Piatetsky
dd8e879e79 Merge pull request #16892 from edx/LEARNER-3072 
LEARNER-3072 Add bundle purchase button to course dashboard
 2017-12-18 10:54:55 -05:00
Michael Terry
e705ff09a5 Merge pull request #16924 from edx/mikix/LEARNER-3588 
Show related programs on entitlements
 2017-12-18 09:05:14 -05:00
Michael Frey
d48a1d5f46 Merge pull request #16926 from edx/mjfrey/LEARNER-3606 
Get only the first program from the list of matching entitlements.
 2017-12-18 07:41:52 -05:00
Saleem Latif
79d95e9caf Merge pull request #16691 from edx/saleem-latif/ENT-760 
[ENT-760]:  Disable linking of personal accounts to enterprise customers via SSO
 2017-12-18 16:31:51 +05:00
adeel khan
aefaab727f Merge pull request #16857 from edx/adeel/Learner_3491_removing_tags_for_certificate_rendering 
Fix certificate's course title for xss tag injection.
 2017-12-18 11:29:19 +00:00
Saleem Latif
86da9c1c63 Disable linking of personal accounts to enterprise customers via SSO 2017-12-18 15:12:42 +05:00
Adeel Khan
5773001f75 Fix certificate's course title for xss tags injection. 
This fix would enable course author to selectively add
basic html tags to course title, while removing any
other injected tags that could execute javascript.

LEARNER-3491
 2017-12-18 14:08:22 +05:00
Michael Frey
3305a7c3ff Get only the first program from the list of matching entitlements. 
LEARNER-3606
 2017-12-17 17:32:52 -05:00
edX Transifex Bot
257de20d95 Update translation strings 2017-12-17 16:52:42 -05:00
Anthony Mangano
d2b14f1542 Merge pull request #16855 from edx/amangano/LEARNER-2668-entitlement-refund-front-end-approach4 
Entitlement dashboard unenroll functionality
 2017-12-15 21:07:48 -05:00
Anthony Mangano
a6cb0fef1c add dashboard entitlement actions 2017-12-15 13:37:06 -05:00
Michael Terry
7e01d66bbd Show related programs on entitlements 
A list of Related Programs should appear for entitlements, like they
do for enrollments. We already fixed this in the base code, but we
(I) missed the edx.org theme version.

LEARNER-3588
 2017-12-15 13:36:02 -05:00
Nimisha Asthagiri
7fda9bd60c Merge pull request #16859 from open-craft/tomaszgy/completion_in_blocks_api_read_1 
Bump READ_VERSION of BlockCompletionTransformer to 1
 2017-12-15 13:32:03 -05:00
Rabia Iftikhar
6388391da6 Merge pull request #16912 from edx/ri/EDUCATOR-1930-set-score-raises-integrity-error 
EDUCATOR-1930 resolve Integrity Error exception in set score method for student module table's duplicate entry
 2017-12-15 23:07:25 +05:00
Albert (AJ) St. Aubin
365b4fb312 Merge pull request #16920 from edx/aj/add_is_expired_check_to_policy 
Aj/add is expired check to policy
 2017-12-15 12:42:45 -05:00
Matt Tuchfarber
b6030a4b13 Merge pull request #16685 from edx/tuchfarber/expand_program_faqs 
Make program marketing FAQ single column
 2017-12-15 12:22:56 -05:00
rabia23
dbd0468a6e EDUCATOR-1930 resolve Integrity Error exception in set score method for student module table's duplicate entry 2017-12-15 16:57:10 +00:00
Albert St. Aubin
3fbb1571df Update to policy check utilities for Course Entitlements 2017-12-15 11:32:33 -05:00
Matt Tuchfarber
01ac2da100 Make FAQ full width, not columns 2017-12-15 11:15:14 -05:00
Waheed Ahmed
ad5a539cea Merge pull request #16911 from edx/waheed/LEARNER-3239-add-save-button-with-profile-visibility 
Add save button with profile visibility dropdown.
 2017-12-15 19:34:26 +05:00
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
Waheed Ahmed
cd65d720ad Add save button with profile visibility dropdown. 
When a learner changes this dropdown from Full to Limited or
vice versa, nothing happens. This creates confusion, to fix
that add save button.

LEARNER-3239
 2017-12-15 13:03:33 +05:00
Michael Cornwell
fae695884b Added urls and built endpoint. 2017-12-14 16:40:15 -06: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
Matthew Piatetsky
000bbaf02f Add bundle purchase button to course dashboard 2017-12-14 17:06:52 -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