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

46173 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matt Tuchfarber
c5541eb548 Merge pull request #18201 from edx/tuchfarber/program_marketing_newest_course_run 
Fix program marketing to use newest course run
 2018-05-15 11:16:17 -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
Asad Iqbal
f040897812 Merge pull request #18198 from edx/asadiqbal08/enterprise-version-bump 
Enterprise version bump to 0.68.3
 2018-05-15 19:10:17 +05:00
asadiqbal
b153b9e8f6 enterprise version bump 2018-05-15 18:59:19 +05:00
Ahsan Ul Haq
95b70399e3 Merge pull request #18174 from edx/ahsan/LEARNER-5247-deleted-studio-instance-showing-in-entitlement 
Unpublished course run displaying in entitlements
 2018-05-15 18:54:45 +05:00
Ahsan Ulhaq
795222adbc Unpublished course run displaying in entitlements 
LEARNER-5247
 2018-05-15 17:58:13 +05:00
edx-pipeline-bot
e7439e8d12 Merge pull request #18195 from edx/release-mergeback-to-master 
Merge release back to master
 2018-05-14 18:00:03 -04:00
J Eskew
ed8359b84b Merge pull request #18196 from edx/jeskew/add_model_for_retired_user_requests 
Add migrations missing from previous PR.
 2018-05-14 17:31:52 -04:00
Alex Dusenbery
330fc8ae49 Merge branch 'master' into release-mergeback-to-master 2018-05-14 17:01:50 -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
John Eskew
fee875f2a9 PLAT-2115: Refuse password reset for retired user. 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
edX Transifex Bot
19a991f78e Update translations 2018-05-13 17:18:41 -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
Alex Dusenbery
eb23d32dcc Call count() when you want a count. 2018-05-11 15:21:35 -04:00
Sanford Student
43d761496e EDUCAOTR-2870: move oauth token retirement to dea deactivation endpoint 2018-05-11 15:21:35 -04:00
Simon Chen
06e087b99d Create the retire_user method on ApiAccessRequest model 2018-05-11 15:21:35 -04:00
bmedx
c79afa5ed1 Fix PLAT-2123- Bug with retiring user's original_email being hashed 2018-05-11 15:21:35 -04:00
Jae Bradley
318fe50099 Merge pull request #18186 from edx/update-cookie-policy-banner-to-1.1.7 
update cookie policy banner package to 1.1.7
 2018-05-11 15:14:09 -04:00
Jae Bradley
695a975678 Merge pull request #18180 from edx/fix-fetch-ie-11 
LEARNER-5278: Fix Delete My Account for IE 11
 2018-05-11 15:05:59 -04:00
jaebradley
b2bd5cad19 update cookie policy banner package to 1.1.7 2018-05-11 14:15:18 -04:00
Simon Chen
0571df77d2 Merge pull request #18184 from edx/schen/EDUCATOR-2648 
Create the retire_user method on ApiAccessRequest model
 2018-05-11 13:50:59 -04:00
sanfordstudent
7ab64270a5 Merge pull request #18185 from edx/sstudent/EDUCATOR-2870 
EDUCAOTR-2870: move oauth token retirement to deactivation endpoint
 2018-05-11 13:48:35 -04:00
Gabe Mulley
669f61b2ea mark email sent events as non-interactions 2018-05-11 13:24:55 -04:00
Sanford Student
6bb2d9dcc7 EDUCAOTR-2870: move oauth token retirement to dea deactivation endpoint 2018-05-11 13:05:04 -04:00
Brian Mesick
c3ca67781a Merge pull request #18183 from edx/bmedx/PLAT-2123 
Fix PLAT-2123- Bug with retiring user's original_email being hashed
 2018-05-11 12:55:42 -04:00
jaebradley
eba6b8cff0 fix ie11 account deletion 2018-05-11 12:32:22 -04:00
Simon Chen
7ffaaebd05 Create the retire_user method on ApiAccessRequest model 2018-05-11 12:18:28 -04:00
bmedx
fd84e3f52a Fix PLAT-2123- Bug with retiring user's original_email being hashed 2018-05-11 11:13:50 -04:00
Awais Jibran
a84884fff9 Merge pull request #18157 from edx/aj/fix-courseware-title-error 
Fix Courseware IndexError
 2018-05-11 11:00:37 +05:00
Alex Dusenbery
2d4dd3750b LEARNER-5123 | Hotfix - don't regrade everything for a user in a course with too many visible blocks. 2018-05-10 14:49:15 -04:00
Brian Mesick
4170b5d294 Merge pull request #18175 from edx/bmedx/sailthru_retirement_fixes 
Fix issues with Sailthru retirement
 2018-05-10 14:01:19 -04:00
Gabe Mulley
b97874f74a Merge pull request #18177 from edx/revert-16545-omar/fmo/multipart-email 
Revert "Use edx-ace for the password reset email"
 2018-05-10 13:45:30 -04:00
Matthew Piatetsky
a394f23c12 mark units as graded if subsection is graded 2018-05-10 13:32:53 -04:00
bmedx
1e6c6fca5c Fix issues with Sailthru retirement 2018-05-10 13:31:34 -04:00
Gabe Mulley
5fa6c51368 Revert "Use edx-ace for the password reset email" 2018-05-10 13:06:52 -04:00
Christopher Lee
55bcb0fa73 Merge pull request #18176 from edx/clee/throttlefix 
Clee/throttlefix
 2018-05-10 13:01:48 -04:00
christopher lee
3d27ff8d66 Fix incorrect rate limit settings 2018-05-10 12:04:34 -04:00
christopher lee
3a15df4e77 Revert "Clean up enrollment rate limit waffles" 
This reverts commit 813d59d091.
 2018-05-10 12:01:04 -04:00