Commit Graph

  • 01e1f23f51 Merge pull request #20158 from cthai18/fix/create-account-text David Ormsbee 2019-06-07 17:36:32 -04:00
  • a914faf11c Adding simple history to track grade changes. Educator-4347 atesker 2019-06-06 09:45:45 -04:00
  • 2186b1a40b Merge pull request #20777 from edx/fsheets/about-page-message Farhanah Sheets 2019-06-07 15:18:06 -04:00
  • 14c642dab6 Add a script requirements file to upgrade automation. Feanil Patel 2019-06-07 15:10:40 -04:00
  • 77eb3d2a82 Merge pull request #20778 from edx/renovate/edx-edx-bootstrap-1.x Feanil Patel 2019-06-07 14:54:26 -04:00
  • 96cc889171 Unpin edx-enterprise and edx-drf-extensions Brittney Exline 2019-06-07 14:35:38 -04:00
  • d75f98a0a1 Run npm install in devstack. Feanil Patel 2019-06-07 13:42:19 -04:00
  • 051a000bac Update dependency @edx/edx-bootstrap to v1.0.4 Renovate Bot 2019-06-07 16:02:27 +00:00
  • 093b51f743 Merge pull request #20775 from edx/feanil/correctly_pin_jasmin_jquery Feanil Patel 2019-06-07 12:00:54 -04:00
  • aba836b517 Merge pull request #20674 from edx/REVEM-354 Matthew Piatetsky 2019-06-07 11:35:34 -04:00
  • 77a2317170 Merge pull request #20764 from edx/renovate/npm-moment-vulnerability Feanil Patel 2019-06-07 11:28:28 -04:00
  • 6bd3f2ff51 Add in messaging for 403 error cases on about pages and update error color for a11y Farhanah Sheets 2019-06-07 11:22:52 -04:00
  • 5a4a99d806 Version 2.1.1 on NPM is not exactly the thing we use. Feanil Patel 2019-06-07 11:08:55 -04:00
  • 2e6675938c Fix tests while still upgrading moment. Feanil Patel 2019-06-07 10:52:07 -04:00
  • 2c5ac0407f Updating Python Requirements (#20772) edX requirements bot 2019-06-07 10:19:38 -04:00
  • 5694753ce6 Merge pull request #20765 from edx/renovate/npm-react-dom-vulnerability Feanil Patel 2019-06-07 10:09:19 -04:00
  • f0ecc938ef Add IdentityServer3 Backend (#20275) Thomas Tracy 2019-06-07 09:38:46 -04:00
  • 297dd174b5 Merge pull request #20229 from open-craft/josuebc/upstream/BB-1132 David Ormsbee 2019-06-06 17:23:04 -04:00
  • df14f5cdf6 [BB-1132] Decrease NAME_MIN_LENGTH to 1 Josue Balandrano Coronel 2019-04-15 09:16:15 -05:00
  • 91f336c1ba Run npm install locally. Feanil Patel 2019-06-06 16:31:43 -04:00
  • 221153d864 Merge pull request #20770 from edx/feanil/update_renovate_config Feanil Patel 2019-06-06 16:22:47 -04:00
  • 24d601827a Go back to what jasmin-jquery was pointing to before. Feanil Patel 2019-06-06 15:57:51 -04:00
  • 46926d0b7c Allow for semver ranges. Feanil Patel 2019-06-06 15:40:37 -04:00
  • e5c3084e8c return 422 on bad input jansenk 2019-06-05 12:15:47 -04:00
  • 221dc99d23 Merge pull request #20760 from edx/ttracy/ent-1994-dsc-flag-bug Thomas Tracy 2019-06-06 11:41:51 -04:00
  • 5786a603ba Update dependency react-dom to v16.1.2 [SECURITY] Renovate Bot 2019-06-06 15:27:35 +00:00
  • d68c350b9e Update dependency moment to v2.19.3 [SECURITY] Renovate Bot 2019-06-06 15:26:56 +00:00
  • a47b6858c3 Merge pull request #20761 from edx/bexline/fix-edx-drf-extensions-again Brittney Exline 2019-06-06 11:25:16 -04:00
  • dbb563fa49 Merge pull request #20754 from edx/renovate/configure Feanil Patel 2019-06-06 11:23:49 -04:00
  • 28d67bc22d Pinning edx-enterprise, edx-drf-extensions, and edx-rbac to last stable versions Brittney Exline 2019-06-06 10:53:32 -04:00
  • 905b6a4790 Merge pull request #20757 from edx/jenkins/upgrade-python-requirements-382f6dd Feanil Patel 2019-06-06 10:23:49 -04:00
  • be0e6093cd type uuid for proper encoding. Thomas Tracy 2019-06-06 09:50:24 -04:00
  • e37de5f134 Updating Python Requirements edX requirements bot 2019-06-06 06:53:04 -04:00
  • 382f6ddc35 Merge pull request #20745 from open-craft/jill/models-gettext-lazy David Ormsbee 2019-06-05 19:53:10 -04:00
  • 134c8be2d0 Change button text for creating account Chester Thai 2019-04-03 15:15:10 -07:00
  • 2b2e93bda7 Merge pull request #20756 from edx/bexline/fix-edx-drf-extensions Brittney Exline 2019-06-05 17:56:16 -04:00
  • 819755b10b Final upgrades to avoid errors from edx-drf-extensions Brittney Exline 2019-06-05 17:07:44 -04:00
  • 9d3174331e Add custom config to renovate. Feanil Patel 2019-06-05 15:46:26 -04:00
  • c66ad09dbc REVMI-234 Remove flaky test (#20752) Christie Rice 2019-06-05 15:48:47 -04:00
  • ce5b976f5e update local currency code Matthew Piatetsky 2019-06-03 17:06:23 -04:00
  • 737f007d0b Add renovate.json Renovate Bot 2019-06-05 19:26:23 +00:00
  • 4b84d630de Merge pull request #20719 from edx/dcs/grade-support Dave St.Germain 2019-06-05 14:46:15 -04:00
  • c5f04c60b4 Update edx-lint to 1.3.0 (#20750) Michael Youngstrom 2019-06-05 14:17:59 -04:00
  • a26ad5868a Updating Bokchoy testing database cache (#20749) edX cache uploader bot 2019-06-05 13:58:24 -04:00
  • 8022a7e3b2 Python Requirements Update (#20747) edX requirements bot 2019-06-05 13:02:17 -04:00
  • cf32f5bcf9 allow orgs w/o idp configured to enroll students in a program jansenk 2019-06-05 10:53:18 -04:00
  • b5d07783b9 REVMI-234 Include user id in jwt sent to ecommerce (#20743) Christie Rice 2019-06-05 10:27:23 -04:00
  • 74492907d8 Merge pull request #19582 from open-craft/josuebc/upstream/BB-732 David Ormsbee 2019-06-04 18:21:53 -04:00
  • 1626270d1e Updating Bokchoy testing database cache (#20744) edX cache uploader bot 2019-06-04 17:33:45 -04:00
  • 86d9f52ff4 Merge pull request #20728 from edx/pwnage101/add-history-to-courseentitlement-courseoverview Brian Mesick 2019-06-04 16:24:42 -04:00
  • 095c420378 check curriculum rather than courses for program course membership jansenk 2019-05-31 16:08:05 -04:00
  • ec2b221b5e Bump edx-organizations and pin edx-opaque-keys Troy Sankey 2019-05-31 15:22:55 -04:00
  • df8f581d36 Add history to CourseEntitlement Troy Sankey 2019-05-30 16:42:31 -04:00
  • f1f7e7e2ec Updating Bokchoy testing database cache (#20740) edX cache uploader bot 2019-06-04 09:24:08 -04:00
  • 22ebf0e16f Strings used in models should always use gettext_lazy. Jillian Vogel 2019-06-03 23:25:35 +09:30
  • ba8d3a5990 Merge pull request #20671 from edx/REVEM-283 Matthew Piatetsky 2019-06-03 15:06:58 -04:00
  • ad77392f8d add discount banner to track selection Matthew Piatetsky 2019-05-22 16:45:50 -04:00
  • 05df361950 Merge pull request #20738 from edx/nedbat/django-1-11-21 Ned Batchelder 2019-06-03 14:07:18 -04:00
  • 8f2d7cfc8a switch enabled to disabled Matthew Piatetsky 2019-05-30 11:48:24 -04:00
  • cb5ec5a65d Grade api support for bulk grading Dave St.Germain 2019-05-30 12:10:13 -04:00
  • e5fd43264d EDUCATOR-4307 | Don't bother with celery to run expire waiting enrollments command. Alex Dusenbery 2019-06-03 10:21:06 -04:00
  • 70cd9f35c5 Django 1.11.21 Ned Batchelder 2019-06-03 10:41:15 -04:00
  • 12d893862c Merge pull request #20632 from tanyaxp/progress-certificates-title David Ormsbee 2019-06-03 10:33:48 -04:00
  • c487b9a384 Change 'withdrawn' status to 'canceled' in program_enrollments Kyle McCormick 2019-06-03 09:02:32 -04:00
  • 55dd3e18bb Merge pull request #153 from edx/noraiz/PROD-169 Noraiz Anwar 2019-06-03 11:39:59 +05:00
  • b32ed9ff2b add discount restriction stacked config models Matthew Piatetsky 2019-05-22 15:50:49 -04:00
  • 4a1346b068 INCR-265 Run python-modernize on lms/djangoapps/courseware/management and lms/djangoapps/courseware/tests (#20716) alangsto 2019-05-31 14:07:18 -04:00
  • 9e01a9e2aa Merge pull request #20727 from edx/Andytr1-patch-1 Andytr1 2019-05-31 13:16:35 -04:00
  • f72b1d56de Merge pull request #20639 from edx/nedbat/welcome-message Ned Batchelder 2019-05-31 12:39:41 -04:00
  • c9f958279e Merge pull request #20703 from edx/andytr1/waffle_for_proctored_test Andytr1 2019-05-31 11:07:58 -04:00
  • 5eeb423372 waffle flag - test_settings.show_review_rules To toggle proctored exam advanced settings atesker 2019-05-28 14:46:27 -04:00
  • a2ca6f96d0 API support for bulk grade import/export Dave St.Germain 2019-05-29 17:03:11 -04:00
  • 10cf20235b Update testing.rst Andytr1 2019-05-31 09:23:20 -04:00
  • 6327b00575 Merge pull request #20683 from caesar2164/cleanup-bootstrap-footer David Joy 2019-05-30 14:55:50 -04:00
  • be1d0197ee Merge pull request #20724 from edx/feanil/fix_test_repo_reference Feanil Patel 2019-05-30 14:53:58 -04:00
  • 9ebcf758df Use our fork of this repo instead of the mitocw one. Feanil Patel 2019-05-30 13:43:04 -04:00
  • 9c8ed25001 Merge pull request #20722 from edx/dcs/when-now Dave St.Germain 2019-05-30 11:43:52 -04:00
  • 49b5b88a30 Bumped edx-when Dave St.Germain 2019-05-30 09:06:45 -04:00
  • 7819a2d5d7 Mark alt text for translation Giulio Gratta 2019-05-29 09:59:40 -07:00
  • dddfac8380 Make platform bootstrap footer match other footer Giulio Gratta 2019-05-23 13:23:01 -07:00
  • 69496576ee Merge pull request #20665 from edx/iahmad/ENT-1634-Remove-linking-enterprise-SSO-accounts-to-existing-users-via-username-lookup irfanuddinahmad 2019-05-30 13:25:08 +05:00
  • 53265d506e user existence check updated to use email only irfanuddinahmad 2019-05-22 09:07:43 -04:00
  • 78f6135e5e Merge pull request #20717 from edx/geoip2-bot-update-country-database2019-05-29 Waheed Ahmed 2019-05-30 12:08:05 +05:00
  • b11affc5e3 geoip2: update maxmind geolite country database edX Transifex Bot 2019-05-29 20:33:12 +00:00
  • ba4921b538 Merge pull request #20710 from edx/bom/course-experience-readme Nimisha Asthagiri 2019-05-29 15:33:53 -04:00
  • 407438970b Merge pull request #20709 from edx/bom/certificates-readme Nimisha Asthagiri 2019-05-29 15:33:03 -04:00
  • a8e3624d9f Merge pull request #20711 from edx/bom/commerce-readme Nimisha Asthagiri 2019-05-29 14:12:03 -04:00
  • 54bf50e429 Merge pull request #20707 from edx/depr/microsites-static-template-view Nimisha Asthagiri 2019-05-29 14:11:38 -04:00
  • 8d41aa2ea9 Merge pull request #20687 from eduNEXT/lmm/proctored_translation Natalia Berdnikov 2019-05-29 12:57:14 -04:00
  • 8615b1b0ac Merge pull request #20661 from edx/emma-green/REVEM-355/add-arch-decision emma-green 2019-05-29 12:08:21 -04:00
  • 97c8c176a6 Updating Bokchoy testing database cache (#20715) edX cache uploader bot 2019-05-29 11:43:06 -04:00
  • ad608bea67 Merge pull request #20706 from edx/depr/microsites-shopping-cart Nimisha Asthagiri 2019-05-29 11:00:40 -04:00
  • c0c17601c0 Merge pull request #20705 from edx/depr/microsites-certificates Nimisha Asthagiri 2019-05-29 10:58:24 -04:00
  • feaacef3f3 Remove microsites from static_template_view DEPR-28 Nimisha Asthagiri 2019-05-29 02:10:31 -04:00
  • 5c3dbaa588 Merge pull request #20708 from edx/depr/microsites-user_authn Nimisha Asthagiri 2019-05-29 10:30:33 -04:00
  • 1bb449a742 Merge pull request #20653 from edx/zhancock/complete-waiting-enrollments Zachary Hancock 2019-05-29 10:30:16 -04:00
  • 95c15495dd add arch decision of computation of course-user discount Emma Green 2019-05-21 16:54:07 -04:00
  • b4df3a10f4 Updating Bokchoy testing database cache (#20713) edX cache uploader bot 2019-05-29 09:55:53 -04:00
  • 34777350d4 Merge pull request #20712 from edx/ziafazal/WL-1927 Zia Fazal 2019-05-29 15:11:21 +05:00
  • 504decf345 Bumped edx-enterprise version and added cornerstone app Zia Fazal 2019-05-29 14:21:09 +05:00