Commit Graph

  • 62f5364ddc Update translations edX Transifex Bot 2018-05-22 16:27:22 +00:00
  • 9f0e99d549 Fix test Farhanah Sheets 2018-05-22 09:44:24 -04:00
  • 842afd5056 Merge pull request #18241 from edx/aj/LEARNER-5145 Albert (AJ) St. Aubin 2018-05-22 08:43:40 -04:00
  • 9039ece7ba Fixed tests that are flaky on fireFox 59 attiyaishaque 2018-05-21 14:26:28 +05:00
  • 7812185d8a fixed typos irfanuddinahmad 2018-05-22 15:23:39 +05:00
  • 4f6d9e57d9 Merge pull request #18243 from edx/uman/bump Uman Shahzad 2018-05-22 15:09:26 +05:00
  • 2cd1b9d792 Merge pull request #18234 from edx/iahmad/ENT-988-Update-API-Terms-of-Service irfanuddinahmad 2018-05-22 14:08:46 +05:00
  • c949b2222e Merge pull request #18232 from edx/ammar/ENT-989-update-api-request-form Muhammad Ammar 2018-05-22 14:07:46 +05:00
  • 244576bcb3 Update edx-enterprise to 0.68.6. Uman Shahzad 2018-05-22 13:41:58 +05:00
  • 577bd1ec0d Move pacing above schedule dates and remove invalid help text Farhanah Sheets 2018-05-21 16:51:39 -04:00
  • d4a338d4af Merge pull request #18113 from edx/sofiya/ed-2802-2 sanfordstudent 2018-05-21 15:26:10 -04:00
  • 572b8a0be4 Merge pull request #17670 from open-craft/MCKIN-7023-xblock-i18n-templates J Eskew 2018-05-21 13:49:13 -04:00
  • 1b72974fb8 Added credit as an option to change_enrollment command Albert St. Aubin 2018-05-21 13:14:14 -04:00
  • 959ddaa98d Merge pull request #18181 from edx/mulby/ace-password-reset Gabe Mulley 2018-05-21 11:42:56 -04:00
  • cd18206167 EDUCATOR-2802: P2 gdpr endpoint Sofiya Semenova 2018-05-02 14:00:31 -04:00
  • 73af914cfc Use edx-ace for password reset email Omar Al-Ithawi 2018-04-18 22:56:03 +03:00
  • b8daeb22ba Merge pull request #18239 from edx/tasawer/learner-5369/fix-error-concatenate-str-with-none Tasawer Nawaz 2018-05-21 18:46:37 +05:00
  • b21fec305a fix TypeError: cannot concatenate 'str' and 'NoneType' objects LEARNER-5369 Tasawer Nawaz 2018-05-21 17:35:54 +05:00
  • 741f75d7fe updated TOS irfanuddinahmad 2018-05-18 18:05:41 +05:00
  • 93809a8497 Merge pull request #18236 from edx/jmbowman/sure_upgrade Jeremy Bowman 2018-05-19 10:58:07 -04:00
  • b5c9f8e862 fix tests Peter Pinch 2018-05-18 22:31:47 -04:00
  • 6872671436 Merge pull request #18136 from edx/pwnage101/registration-with-half-retired-user-email Troy Sankey 2018-05-18 16:53:30 -04:00
  • 2e3534019f Added enrollment API test for throttle rates christopher lee 2018-05-17 12:00:25 -04:00
  • 175fbac261 Merge pull request #18235 from edx/sofiya/mgmt-name Sofiya Semenova 2018-05-18 15:56:05 -04:00
  • a7ecfe1cd3 Fixup! refactor email_exists, and handle many more cases Troy Sankey 2018-05-16 16:41:10 -04:00
  • 8d4a2e2be9 Upgrades to avoid sure install bug Jeremy Bowman 2018-05-18 15:14:29 -04:00
  • 3b40787628 Merge pull request #18221 from edx/diana/activation-message Diana Huang 2018-05-18 14:59:22 -04:00
  • 1bb134b043 Changed comment in recalculate_learner_grades Sofiya Semenova 2018-05-18 14:46:50 -04:00
  • bac2ada0ed Merge pull request #18230 from open-craft/jill/empty-dashboard-message-rebase Albert (AJ) St. Aubin 2018-05-18 12:58:12 -04:00
  • a2db851ef2 Merge pull request #18228 from edx/ai/fixed-failing-firefox-tests Attiya Ishaque 2018-05-18 21:51:53 +05:00
  • 8dee3fda76 Fixed tests that are flaky on fireFox 59. attiyaishaque 2018-05-18 00:21:11 +05:00
  • 9d29cd92ce Merge pull request #18233 from edx/testeng/bokchoy_auto_cache_update_918342a50c7f8aed7cff72065c3f26ea0c499e08 Michael Youngstrom 2018-05-18 09:46:36 -04:00
  • 118bc77372 Updating migrations edx-cache-uploader-bot 2018-05-18 05:51:03 -04:00
  • 2075f52d13 Merge pull request #18220 from edx/asadiqbal08/enterprise-version-bump-0.68.5 Asad Iqbal 2018-05-18 14:42:28 +05:00
  • 2d037d3dc7 version bump enterprise asadiqbal 2018-05-17 17:14:18 +05:00
  • 6fa2e462b3 Merge pull request #18218 from edx/ai/fixed-failing-tests Attiya Ishaque 2018-05-18 13:59:35 +05:00
  • 468f9e4212 Fixed tests that are flaky with firefox 59. attiyaishaque 2018-05-17 15:56:56 +05:00
  • ee63a7980b update api request form muhammad-ammar 2018-05-18 12:06:39 +05:00
  • 7992d43009 Merge branch 'master' of https://github.com/edx/edx-platform into dgamanenko/fix_username_missing_field Dmitry Gamanenko 2018-05-18 09:46:24 +03:00
  • 35d75daf00 Quality fix Jillian Vogel 2018-05-18 10:44:46 +09:30
  • 8b9b158adb Fixes test failures Jillian Vogel 2018-04-03 23:26:28 +09:30
  • 37ed10103c Shows the account activation message in the main content area Jillian Vogel 2018-04-03 21:12:10 +09:30
  • 306b49c36d Adds EMPTY_DASHBOARD_MESSAGE Site Configuration flag Jillian Vogel 2018-03-21 14:54:36 +10:30
  • d489ffe7ad Adds HIDE_DASHBOARD_COURSES_UNTIL_ACTIVATED Jillian Vogel 2018-03-21 14:27:50 +10:30
  • d585294f50 Shows the account activation message in the sidebar Jillian Vogel 2018-03-21 14:12:31 +10:30
  • 1200cfb10c Merge pull request #18227 from edx/revert-15464-jill/empty-dashboard-message Michael Youngstrom 2018-05-17 16:00:39 -04:00
  • e8f6d20119 Revert "Learner Dashboard improvements to assist with the Account Activation process" Michael Youngstrom 2018-05-17 14:55:35 -04:00
  • 1250f41e85 Merge pull request #18225 from edx/release-mergeback-to-master edx-pipeline-bot 2018-05-17 14:15:25 -04:00
  • 1bb20d2922 Merge pull request #15464 from open-craft/jill/empty-dashboard-message Albert (AJ) St. Aubin 2018-05-17 12:45:02 -04:00
  • 44dc169eca Display error message if account is inactive. Diana Huang 2018-05-16 16:21:14 -04:00
  • 78e873c29d Merge pull request #18222 from edx/clee/throttlecat1 Feanil Patel 2018-05-17 11:45:45 -04:00
  • 30c3a39de0 Fix throttle rate for 'staff' user christopher lee 2018-05-17 10:52:20 -04:00
  • 232b359258 Fixup! pivot to treating retired emails as banned forever Troy Sankey 2018-05-10 15:15:14 -04:00
  • e9276ba246 Disallow registration when the proposed email is half-retired Troy Sankey 2018-05-04 13:36:52 -04:00
  • ccd966a53c Merge pull request #18212 from edx/clee/remove-throttle Christopher Lee 2018-05-16 16:42:13 -04:00
  • fca9ac10bc Merge pull request #18214 from edx/feanil/make_upgrade Feanil Patel 2018-05-16 16:27:31 -04:00
  • e718ab0260 Upgrade using pip-tools. Feanil Patel 2018-05-16 14:50:16 -04:00
  • c10c91f95b Merge pull request #18211 from edx/sstudent/upgrade_wiki sanfordstudent 2018-05-16 14:03:01 -04:00
  • b89eba07e2 upgrade django-wiki Sanford Student 2018-05-16 12:32:59 -04:00
  • 1310e2f132 Clean up enrollment rate limit waffles christopher lee 2018-05-16 12:57:30 -04:00
  • caedf6b444 Allow solutions to be displayed on showanswer=attempted if not attempted but past due Jolyon Bloomfield 2018-05-16 12:56:42 -04:00
  • e8604ac3bd Merge pull request #18202 from edx/diana/deletion-oauth Diana Huang 2018-05-16 12:06:27 -04:00
  • 9bbd424a7d Make recalculate_course_and_subsection_grades_for_user task logged. Alex Dusenbery 2018-05-16 09:58:57 -04:00
  • ce7b0df687 Merge pull request #18210 from edx/LEARNER-5286-delete-user-cookies-when-retiring-user Jae Bradley 2018-05-16 11:26:23 -04:00
  • b2c9b50de1 Add a warning message when there are social auth links connected. Diana Huang 2018-05-15 11:25:00 -04:00
  • 4045eee57d Remove cookies when retiring user jaebradley 2018-05-16 10:19:33 -04:00
  • 48bff77b45 Merge pull request #18206 from edx/bmedx/fix_forum_retirement_404 Brian Mesick 2018-05-15 21:48:44 -04:00
  • 23023203e5 Bubble up 404s from the forum service on user retirement bmedx 2018-05-15 17:49:06 -04:00
  • 8cf77f2382 Merge pull request #18205 from edx/thallada/sfe-modal-improvements Tyler Hallada 2018-05-15 16:40:49 -04:00
  • 34129e2464 Merge pull request #18194 from edx/sofiya/ed-2893 Sofiya Semenova 2018-05-15 16:03:41 -04:00
  • 2baadff28c Management command to force enrollment regrade Sofiya Semenova 2018-05-14 14:32:51 -04:00
  • 6e55d27248 Merge pull request #18204 from edx/sofiya/management Sofiya Semenova 2018-05-15 14:56:52 -04:00
  • e9a04939d9 Upgrade SFE, unscrollable body when modal is open. Tyler Hallada 2018-05-11 15:06:31 -04:00
  • 55930dce62 Merge pull request #18203 from edx/jeskew/forums_retirement_username_fix J Eskew 2018-05-15 14:36:11 -04:00
  • 057122b482 Create GDPR test user command fix for password and meta Sofiya Semenova 2018-05-15 14:04:53 -04:00
  • e82fe8290d Pass retired_username to forums retirement endpoint instead of original username. John Eskew 2018-05-15 11:55:31 -04:00
  • f045cddd61 Merge pull request #18193 from edx/alasdair/LEARNER-5273-cookie-banner-mobile-layout-fix AlasdairSwan 2018-05-15 11:38:59 -04:00
  • c5541eb548 Merge pull request #18201 from edx/tuchfarber/program_marketing_newest_course_run Matt Tuchfarber 2018-05-15 11:16:17 -04:00
  • 5f821ef6d7 LEARNER-5273 Update how the mobile menu interacts with the cookie policy banner AlasdairSwan 2018-05-14 14:22:04 -04:00
  • 20fdcc8d77 Fix program marketing to use newest course run Matt Tuchfarber 2018-05-15 10:36:54 -04:00
  • f040897812 Merge pull request #18198 from edx/asadiqbal08/enterprise-version-bump Asad Iqbal 2018-05-15 19:10:17 +05:00
  • b153b9e8f6 enterprise version bump asadiqbal 2018-05-15 18:59:19 +05:00
  • 95b70399e3 Merge pull request #18174 from edx/ahsan/LEARNER-5247-deleted-studio-instance-showing-in-entitlement Ahsan Ul Haq 2018-05-15 18:54:45 +05:00
  • 795222adbc Unpublished course run displaying in entitlements LEARNER-5247 Ahsan Ulhaq 2018-05-10 19:07:25 +05:00
  • 841a68c808 Improves XBlock i18n by allowing template translations Jillian Vogel 2018-03-12 20:39:05 +10:30
  • e7439e8d12 Merge pull request #18195 from edx/release-mergeback-to-master edx-pipeline-bot 2018-05-14 18:00:03 -04:00
  • ed8359b84b Merge pull request #18196 from edx/jeskew/add_model_for_retired_user_requests J Eskew 2018-05-14 17:31:52 -04:00
  • 330fc8ae49 Merge branch 'master' into release-mergeback-to-master Alex Dusenbery 2018-05-14 17:01:50 -04:00
  • 3529e0779f Add migrations missing from previous PR. John Eskew 2018-05-14 16:40:17 -04:00
  • dec2dfa0fe Merge pull request #17754 from edx/mulby/email-send-noninteraction Gabe Mulley 2018-05-14 16:15:37 -04:00
  • 5dc13d067d Merge pull request #18191 from edx/bexline/fix_cert_generation Brittney Exline 2018-05-14 12:06:06 -06:00
  • ef477ee2a4 LEARNER-5123 | Cache VisibleBlocks per course AND user, only fetch the ones the user needs for subsection scoring. Alex Dusenbery 2018-05-10 16:54:19 -04:00
  • 83b24e0453 fix broken test Gabe Mulley 2018-05-14 13:21:49 -04:00
  • 62865599c7 Merge pull request #18154 from edx/jeskew/add_model_for_retired_users J Eskew 2018-05-14 13:02:53 -04:00
  • 2ef404b83e Fix two deprecation warnings. John Eskew 2018-05-07 18:10:33 -04:00
  • fee875f2a9 PLAT-2115: Refuse password reset for retired user. John Eskew 2018-05-07 18:10:05 -04:00
  • 083fed964f Fix failing test by passing string to expected_verification_status Adam Stankiewicz 2018-05-14 11:52:43 -04:00
  • 8d825fc977 LEARNER-5185 Fix bug in cert generation for passing users who become approved Brittney Exline 2018-05-14 11:04:28 -04:00
  • 52c15d4637 Fix disabled login/register buttons after failed attempt Régis Behmo 2018-04-12 11:08:51 +02:00
  • 19a991f78e Update translations edX Transifex Bot 2018-05-13 20:38:31 +00:00