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

17474 Commits

Author SHA1 Message Date
Gabe Mulley
0efc376488 Merge pull request #16976 from edx/mulby/fix-ace-ga-tracking 
fix GA tracking of ACE emails
 2017-12-20 10:32:42 -05:00
Gabe Mulley
b118f0633c fix GA tracking of ACE emails 2017-12-20 08:59:06 -05:00
McKenzie Welter
a4d23eaea9 include email settings in fulfilled entitlement action items 2017-12-20 08:57:27 -05:00
J. Cliff Dyer
1fc43bf60d Define custom completion for VideoModule 
Update the VideoModule to publish a completion event when the player
reaches 95% complete, and submit a BlockCompletion when that event
occurs.

OC-3091
MCKIN-5897
 2017-12-19 14:12:28 -05:00
Simon Chen
131b14b111 Merge pull request #16961 from edx/schen/EDUCATOR-1549 
Programmatically indicate nested discussions in filter
 2017-12-19 13:40:05 -05:00
Simon Chen
3de6e7789b Programmatically indicate nested discussions in filter 
This is an a11y fix on the discussion topic display on the left. We are going to write out all the parent catagories for each topic
EDUCATOR-1549
 2017-12-19 11:16:07 -05:00
Harry Rein
908c769ae3 Update entitlement card to use Change or Leave Session. 
LEARNER-3646
 2017-12-19 10:26:17 -05:00
Bessie Steinberg
a4fa04ec3e Merge pull request #16931 from edx/bessiesteinberg/WL-1288-registration-page-customization 
Add Job Title field to Registration Page
 2017-12-19 09:49:53 -05:00
Anthony Mangano
c8d0d5eb33 Merge pull request #16938 from edx/LEARNER-3633-fix-entitlement-unenrollment-modal-a11y-issues 
LEARNER-3633 fix entitlement unenrollment modal a11y issues
 2017-12-19 09:49:12 -05:00
Jeremy Bowman
1dbdee9c54 Revert "PLAT-1858 Better capture of deprecation warnings" 2017-12-18 21:18:02 -05:00
Anthony Mangano
fdadd4cdf4 Fix a11y issues with unenroll modal 2017-12-18 16:44:09 -05:00
Harry Rein
5e2c3e4bf5 Merge pull request #16933 from edx/HarryRein/LEARNER-3636-dont-show-expired-entitlements-unenrolled 
Do not show expired, unfulfilled entitlements on dashboards.
 2017-12-18 16:26:43 -05:00
Jeremy Bowman
0e52b4581f Merge pull request #16915 from edx/jmbowman/PLAT-1858 
PLAT-1858 Better capture of deprecation warnings
 2017-12-18 16:23:58 -05:00
Bessie Steinberg
b340174e12 Add Job Title field to Registration Page 
Add 'Job Title' as configurable field on the registration page.
Job Title will be saved to the 'meta' field of the 'userprofile' table.
 2017-12-18 16:20:11 -05:00
Michael Terry
e32ff53f5f Merge pull request #16935 from edx/mikix/expired-rel-programs 
Show programs for expired entitlements
 2017-12-18 15:51:06 -05:00
Harry Rein
75aa736dcf Do not show expired, unfulfilled entitlements on course/programs dashboard. 
LEARNER-3636
 2017-12-18 15:16:35 -05:00
Matthew Piatetsky
6ea32b7ae6 Merge pull request #16923 from edx/LEARNER-3557 
LEARNER-3557 Add is_enterprise cookie on login page to be checked on basket page
 2017-12-18 15:00:44 -05:00
Jeremy Bowman
b26fe5fd24 PLAT-1858 Better capture of deprecation warnings 2017-12-18 14:59:05 -05:00
Michael Terry
4fe60eb1e4 Show programs for expired entitlements 
The dashboard was not showing related programs for expired but
fulfilled entitlements.

LEARNER-3608
 2017-12-18 14:41:20 -05:00
Matthew Piatetsky
4a2262967f Add is_enterprise cookie on login page to be checked on basket page 2017-12-18 13:51:37 -05:00
Matt Tuchfarber
70566b5d9d Fix double headers or WL registration page 2017-12-18 13:33:49 -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
Saleem Latif
86da9c1c63 Disable linking of personal accounts to enterprise customers via SSO 2017-12-18 15:12: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
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
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
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
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
Matthew Piatetsky
000bbaf02f Add bundle purchase button to course dashboard 2017-12-14 17:06:52 -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
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
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
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
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
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
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
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
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