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

18193 Commits

Author SHA1 Message Date
Daniel Clemente Laboreo
6d3f8150db Implement generate_report_data for capa problems 2018-05-24 22:09:58 +03:00
irfanuddinahmad
5e77dfd5b7 Merge pull request #18245 from edx/ENT-982-Typos-in-API-terms-of-service 
ENT-982 Fixed typos in API terms of service
 2018-05-24 16:29:40 +05:00
Simon Chen
7f05114752 Remove the expansive category_map call from inline discussion view 2018-05-23 14:14:05 -04:00
J Eskew
c87ba77233 Revert "Retry upon Sailthru optout timeout." 2018-05-23 10:59:28 -04:00
John Eskew
597e6c66d5 Add backoff module as a new requirement. 
Use backoff when calling Sailthru API to retry upon optout timeouts.
 2018-05-22 16:03:41 -04:00
irfanuddinahmad
7812185d8a fixed typos 2018-05-22 15:23:39 +05:00
irfanuddinahmad
2cd1b9d792 Merge pull request #18234 from edx/iahmad/ENT-988-Update-API-Terms-of-Service 
ENT-988 Update API Terms of Service
 2018-05-22 14:08:46 +05:00
Gabe Mulley
959ddaa98d Merge pull request #18181 from edx/mulby/ace-password-reset 
Use edx-ace for password reset emails
 2018-05-21 11:42:56 -04:00
Omar Al-Ithawi
73af914cfc Use edx-ace for password reset email 2018-05-21 09:49:14 -04:00
Tasawer Nawaz
b21fec305a fix TypeError: cannot concatenate 'str' and 'NoneType' objects 
LEARNER-5369
 2018-05-21 17:35:54 +05:00
irfanuddinahmad
741f75d7fe updated TOS 2018-05-21 15:00:57 +05:00
Troy Sankey
6872671436 Merge pull request #18136 from edx/pwnage101/registration-with-half-retired-user-email 
Disallow registration when the proposed email is retired
 2018-05-18 16:53:30 -04:00
Sofiya Semenova
175fbac261 Merge pull request #18235 from edx/sofiya/mgmt-name 
Changed comment in recalculate_learner_grades
 2018-05-18 15:56:05 -04:00
Troy Sankey
a7ecfe1cd3 Fixup! refactor email_exists, and handle many more cases 2018-05-18 15:34:35 -04:00
Diana Huang
3b40787628 Merge pull request #18221 from edx/diana/activation-message 
LEARNER-5283: Display error message if account is inactive.
 2018-05-18 14:59:22 -04:00
Sofiya Semenova
1bb134b043 Changed comment in recalculate_learner_grades 2018-05-18 14:46:50 -04:00
Jillian Vogel
35d75daf00 Quality fix 2018-05-18 10:44:46 +09:30
Jillian Vogel
37ed10103c Shows the account activation message in the main content area 
if HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED is enabled.

(cherry picked from commit 761acdfc6d)
 2018-05-18 09:33:16 +09:30
Jillian Vogel
306b49c36d Adds EMPTY_DASHBOARD_MESSAGE Site Configuration flag 
When set, displays the configured text/markup under "You are not enrolled in any courses yet."

Adjusts left/right padding on .empty-dashboard-message to keep our extra message from hitting the sides.

(cherry picked from commit e417c5f8c2)
 2018-05-18 09:33:09 +09:30
Jillian Vogel
d489ffe7ad Adds HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED 
Site Configuration and feature flag

When set, it hides the Courses list on the Learner Dashboard page if the
learner has not yet activated their account.

(cherry picked from commit 22ee400b15)
 2018-05-18 09:33:02 +09:30
Jillian Vogel
d585294f50 Shows the account activation message in the sidebar 
and removes the DISPLAY_ACCOUNT_ACTIVATION_MESSAGE_ON_SIDEBAR flag, since this
feature is now always on.

Marks the top banner as deprecated.

(cherry picked from commit b44114d171)
 2018-05-18 09:32:54 +09:30
Michael Youngstrom
e8f6d20119 Revert "Learner Dashboard improvements to assist with the Account Activation process" 2018-05-17 14:55:35 -04:00
Albert (AJ) St. Aubin
1bb20d2922 Merge pull request #15464 from open-craft/jill/empty-dashboard-message 
Learner Dashboard improvements to assist with the Account Activation process
 2018-05-17 12:45:02 -04:00
Diana Huang
44dc169eca Display error message if account is inactive. 2018-05-17 11:47:37 -04:00
Troy Sankey
232b359258 Fixup! pivot to treating retired emails as banned forever 2018-05-16 16:44:02 -04:00
Troy Sankey
e9276ba246 Disallow registration when the proposed email is half-retired 
Our learner retirement implementation shall allow re-use of email
addresses, but we currently do not disallow re-use of emails for
learners whose retirement is still in-progress (i.e. their retirement
state is between PENDING and LMS_COMPLETE inclusive).

The time between a user initiating retirement, and the jenkins job
actually picking up the user and driving their account retirement might
be as long as 1 hour, so this is a serious concern.

Addresses EDUCATOR-2824.
 2018-05-16 16:44:02 -04:00
Diana Huang
e8604ac3bd Merge pull request #18202 from edx/diana/deletion-oauth 
LEARNER-5039: Add a warning message when there are social auth links connected.
 2018-05-16 12:06:27 -04:00
Alex Dusenbery
9bbd424a7d Make recalculate_course_and_subsection_grades_for_user task logged. 2018-05-16 11:34:53 -04:00
Diana Huang
b2c9b50de1 Add a warning message when there are social auth links connected. 2018-05-16 10:59:33 -04:00
jaebradley
4045eee57d Remove cookies when retiring user 2018-05-16 10:20:32 -04:00
Brian Mesick
48bff77b45 Merge pull request #18206 from edx/bmedx/fix_forum_retirement_404 
Bubble up 404s from the forum service on user retirement
 2018-05-15 21:48:44 -04:00
bmedx
23023203e5 Bubble up 404s from the forum service on user retirement 2018-05-15 17:49:06 -04:00
Sofiya Semenova
34129e2464 Merge pull request #18194 from edx/sofiya/ed-2893 
Management command to force enrollment regrade
 2018-05-15 16:03:41 -04:00
Sofiya Semenova
2baadff28c Management command to force enrollment regrade 2018-05-15 15:11:32 -04:00
John Eskew
e82fe8290d Pass retired_username to forums retirement endpoint instead of original username. 2018-05-15 11:55:31 -04:00
AlasdairSwan
f045cddd61 Merge pull request #18193 from edx/alasdair/LEARNER-5273-cookie-banner-mobile-layout-fix 
LEARNER-5273 Update how the mobile menu interacts with the cookie pol…
 2018-05-15 11:38:59 -04:00
AlasdairSwan
5f821ef6d7 LEARNER-5273 Update how the mobile menu interacts with the cookie policy banner 2018-05-15 11:11:44 -04:00
Matt Tuchfarber
20fdcc8d77 Fix program marketing to use newest course run 2018-05-15 10:36:54 -04:00
John Eskew
3529e0779f Add migrations missing from previous PR. 2018-05-14 16:40:17 -04:00
Gabe Mulley
dec2dfa0fe Merge pull request #17754 from edx/mulby/email-send-noninteraction 
mark email sent events as non-interactions
 2018-05-14 16:15:37 -04:00
Brittney Exline
5dc13d067d Merge pull request #18191 from edx/bexline/fix_cert_generation 
LEARNER-5185 Fix bug in cert generation for passing users who become approved
 2018-05-14 12:06:06 -06:00
Alex Dusenbery
ef477ee2a4 LEARNER-5123 | Cache VisibleBlocks per course AND user, only fetch the ones the user needs for subsection scoring. 2018-05-14 13:44:56 -04:00
Gabe Mulley
83b24e0453 fix broken test 2018-05-14 13:21:49 -04:00
J Eskew
62865599c7 Merge pull request #18154 from edx/jeskew/add_model_for_retired_users 
Refuse password reset for retired users.
 2018-05-14 13:02:53 -04:00
John Eskew
2ef404b83e Fix two deprecation warnings. 2018-05-14 12:24:36 -04:00
Adam Stankiewicz
083fed964f Fix failing test by passing string to expected_verification_status 2018-05-14 11:52:43 -04:00
Brittney Exline
8d825fc977 LEARNER-5185 Fix bug in cert generation for passing users who become approved 
Because of the way async tasks pass arguments, we were passing in a string of a dictionary
that contained the id verification status but checking it against a dictionary in the
task's function, which was causing errors for generating certificates for passing users
whose id verification status changes to approved after they are passing.
 2018-05-14 11:04:28 -04:00
Régis Behmo
52c15d4637 Fix disabled login/register buttons after failed attempt 
In the login window, when the user enter a wrong email or password, the
"Log into my ... account" button used to remain disabled, which was very
confusing for users.

Steps to reproduce:
- Go to /login
- Type wrong email/password combination
- Press "Log into..." button

Similarly, users could not click the "register button after a failed
register attempt. For example, this occurred to users with an invalid
email address, such as "fooatgmaildotcom".
 2018-05-14 08:55:56 -04:00
Michael Terry
6833823ccc Update student records buttons 
Updates the look and feel of the two (experimental and disabled by
default) links to student records.

Also converts the 'student_records' waffle switch to a waffle flag
named 'credentials.student_records.

LEARNER-5246
 2018-05-11 16:38:16 -04:00
Matthew Piatetsky
b96037f35e Merge pull request #18178 from edx/mark_units_graded 
mark units as graded if subsection is graded
 2018-05-11 16:04:44 -04:00