Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
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
Brandon DeRosier
c7c3ef694c Add optional password reset failure emails 
This change allows Open edX operators to enable password reset
failure email notifications. This is mainly useful for
explicitly informing users that there's no account associated
with their email, so that users can be sure that there wasn't
a problem with the email system.

OSPR-1832
 2017-12-18 11:05:15 -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
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
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
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
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
Harry Rein
791b8b141e Importing bootstrap and popper through webpack. 2017-12-12 14:50:38 -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
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
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
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
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