Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,827 Commits 1 Branch 0 Tags
319dee4faac64164f8a8df45ccaca2c995d07ee7
Commit Graph

18007 Commits

Author SHA1 Message Date
Brian Mesick
fc1f18aa14 Merge pull request #17919 from edx/bmedx/retirement_status 
Add a model and associated API to help control the user retirement flow
 2018-04-20 12:35:16 -04:00
Daniel Clemente Laboreo
00c339d091 Implement iter_all_for_block and iter_all_for_course for DjangoUserStateClient 2018-04-20 11:26:16 +03:00
Ned Batchelder
1642eeabaa Merge pull request #14128 from edx/jbarciauskas/PLAT-1109-ignore-integrity-error 
[PLAT-1109] Suppress IntegrityErrors caused by race condition
 2018-04-19 16:22:05 -04:00
bmedx
4390773f4b Clean up some warnings to get enough headroom to pass tests 2018-04-19 15:04:39 -04:00
Michael LoTurco
919264f56d Add entitlement unenrollment survey 
Updates behavior post unenrollment, also refactors accessible_modal
to enable the unenrollment survey to remain accessible after the
content in the modal changes (to the survey).

mloturco/learner-3524
 2018-04-19 10:19:11 -04:00
Eric Fischer
9b093ff17f Add passthrough for context_title and context_label LTI parameters 2018-04-18 13:39:53 -04:00
Eric Fischer
38f5358541 Revert "pass title/label to LTI consumers" 
This reverts commit f1fa7b8e06.
 2018-04-18 12:59:15 -04:00
Attiya Ishaque
44ccd84c7a Merge pull request #17975 from edx/ai/EDUCATOR-2719-button-styling 
Fix styling of button on certificate & membership page.
 2018-04-18 17:32:59 +05:00
Uzair Rasheed
e0d20be11d Merge pull request #17912 from edx/LEARNER-1487/send_successfull_verification_email 
Send verification email status
 2018-04-18 12:09:42 +05:00
Jae Bradley
769ca45f42 Merge pull request #17941 from edx/LEARNER-4864-cookie-policy-banner-component 
LEARNER-4864: Add Cookie Policy Banner
 2018-04-17 17:50:25 -04:00
jaebradley
fab388ad6b add cookie policy banner with feature flag 2018-04-17 16:48:52 -04:00
Feanil Patel
139ac68ad3 Merge pull request #17981 from edx/release-mergeback-to-master 
Merge release back to master
 2018-04-17 16:31:04 -04:00
Feanil Patel
aa46a245b0 Merge pull request #17967 from edx/gbabey/revert-ENT-924 
Revert "Show Enterprise display name if we should hide sensitive user…
 2018-04-17 12:58:57 -04:00
George Babey
a155aad01c Revert "Show Enterprise display name if we should hide sensitive username." 
This reverts commit d58bd06928.

This commit caused performance issues due to increased API load from checking the
enterprise association on each page load
 2018-04-17 09:07:17 -04:00
attiyaishaque
9dc01647e8 Fix styling of button on certificate & membership page. 2018-04-17 12:21:09 +05:00
Mushtaq Ali
5a9477af30 Import video transcripts - EDUCATOR-2173 2018-04-16 12:05:44 +05:00
Tasawer Nawaz
048329cf24 Merge pull request #17363 from edx/tasawer/learner-3962/translate-contact-us-form 
translate string on support form
 2018-04-16 11:52:14 +05:00
Simon Chen
c02c1d5177 Merge pull request #17902 from edx/rm-new-course-outline-waffle 
EDUCATOR 2283 - Removes the new course outline waffle flag.
 2018-04-14 15:07:00 -04:00
Bill DeRusha
f7dd174873 Merge pull request #17954 from edx/bderusha/generated-pw-complexity 
Update and refactor random password generator
 2018-04-13 17:13:55 -04:00
J Eskew
0269d4a536 Merge pull request #17868 from edx/jeskew/check_for_retired_username 
Reject acct creation when using a retired username.
 2018-04-13 15:15:10 -04:00
John Eskew
338d4551ab Reject acct creation when using a retired username. 
Change from specifying a retired username/email format to specifying
  a retired username prefix and a retired email prefix/domain,
  preventing possible config errors due to unexpected/bad formats.
 2018-04-13 14:27:21 -04:00
Bill DeRusha
d1ed33ac23 Update and refactor random password generator 2018-04-13 14:17:21 -04:00
Michael Terry
a34c8c8233 Drop remaining coffee use 
This basically commits the transpiled CoffeeScript JS (with minor
cleanup) and removes coffee build support.

A tiny amount of support for xblocks exists, because external users
may have xblocks with coffee. But no coffee in our tree anyway.
 2018-04-13 14:10:40 -04:00
Michael Terry
2abbd1eb83 Move all our coffee files 
This moves the original files into their JS locations so that when
the next commit modifies them, we dont lose history.
 2018-04-13 14:10:40 -04:00
sandroroux
3899b76929 Removes the new course outline waffle flag. 2018-04-13 12:28:14 -04:00
Nimisha Asthagiri
d0c99dca41 Merge pull request #17921 from edx/douglashall/remove_ccx_usage_of_course_structures 
Remove use of the deprecated course_structures module.
 2018-04-13 09:40:54 -04:00
Michael Terry
98a13423d1 Drop underscore from learner_dashboard 2018-04-12 15:14:52 -04:00
McKenzie Welter
435c3c6338 mark support (re)issued entitlements as unrefundable 2018-04-12 12:16:37 -04:00
Uman Shahzad
d58bd06928 Show Enterprise display name if we should hide sensitive username. 2018-04-12 19:10:30 +05:00
Waheed Ahmed
7711387e55 Merge pull request #17937 from edx/waheed/LEARNER-4426-fix-500-error-on-new-contact-us-form 
Fix 500 error on new contact us form.
 2018-04-12 18:18:05 +05:00
Waheed Ahmed
ce7e144088 Fix 500 error on new contact us form. 
If learner has enrollments without course overview object server raises
error, fixed using course_overview property of course enrollment.

LEARNER-4426
 2018-04-12 16:10:18 +05:00
uzairr
ad7fb01883 Edit email acknowledging photo-submission 
To add more context,content of the acknowledging
email of photo-submission is updated so that a learner aware of
the whole process.

LEARNER-4048
 2018-04-12 13:48:52 +05:00
uzairr
d85dc4532e Send verification email status 
Support Team need to handle bulk of tickets every month about the
verification status of learners.To avoid it,suitable changes have
done to send verification email to the learner.

LEARNER-1487
 2018-04-12 11:47:49 +05:00
Douglas Hall
a2f5210969 Updates after review feedback. 2018-04-11 16:04:54 -04:00
Brittney Exline
3bab72cfa0 Merge pull request #17888 from edx/astankiewicz/sso_id_verification 
ENT-943 Refactor ID verification models
 2018-04-11 11:09:43 -06:00
Brittney Exline
3f3f8699a4 Merge pull request #17911 from edx/bexline/tpa_model_cleanup 
ENT-943 Cleanup of old third_party_auth provider slug fields
 2018-04-11 10:56:07 -06:00
Douglas Hall
4d72d9caae Remove use of the deprecated course_structures module. 2018-04-11 12:54:14 -04:00
Adam Stankiewicz
d0585be144 ENT-943 refactor PhotoVerification model 2018-04-11 11:21:28 -04:00
Joel Barciauskas
caf9901c1b [PLAT-1109] Suppress IntegrityErrors caused by race condition 
Suppress IntegrityErrors that may be caused by a race condition
between processes resulting from a slow-loading page and a user refreshing the
page.
 2018-04-11 13:47:11 +05:00
McKenzie Welter
c6064e1c5b Merge pull request #17906 from edx/McKenzieW/learner-4893 
move Create Entitlement button up and shrink username search bar
 2018-04-10 17:05:49 -04:00
Matthew DuBose
a24d892e9c correct mention of old course ID in description of bulk email django tool 2018-04-10 15:42:07 -04:00
McKenzie Welter
300427be3f move Create Entitlement button up and shrink username search bar 2018-04-10 14:54:33 -04:00
Brittney Exline
9a86a67ae0 ENT-943 Cleanup of old third_party_auth provider slug fields 2018-04-10 09:58:31 -04:00
Matthew Piatetsky
619e7d8722 Merge pull request #17887 from edx/REV-73 
Hide experiment courses from dashboard if enrolled but not paid
 2018-04-09 16:28:14 -04:00
adeel khan
e9b89e0506 Merge pull request #17898 from edx/ahsan/Revert-LEARNER-1487 
Revert "Send email to learners to inform verification status"
 2018-04-07 02:03:54 +05:00
Ahsan Ulhaq
400d99a90d fix failing test 2018-04-07 01:12:00 +05:00
Brian Mesick
5782119341 Merge pull request #17867 from edx/bmedx/registration_deadlocks 
WIP: Refactor registration to improve reliability
 2018-04-06 15:24:13 -04:00
Ahsan Ulhaq
0ed84584bf Revert "Send email to learners to inform verification status" 
This reverts commit 0865e52c32.
 2018-04-07 00:23:11 +05:00
Matthew Piatetsky
7673ea06b1 Hide experiment courses from dashboard if enrolled but not paid 2018-04-06 10:14:29 -04:00
Brittney Exline
61820a459d Merge pull request #17835 from edx/bexline/sso_id_verification 
ENT-942 Implement an abstraction layer for PhotoVerification class methods
 2018-04-06 07:49:45 -06:00