Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• bdeb2e865a Remove unnecessary "// Overrides" comments Joshua Spayd 2017-07-26 22:13:50 +00:00
• 666db5cc0d Fixing whitelabel messaging issue. Harry Rein 2017-07-26 17:07:33 -04:00
• 069a905145 Merge pull request #15671 from edx/diana/tabs-issues Diana Huang 2017-07-26 16:57:15 -04:00
• dc22ec5018 Make timer toggle accessible Joshua Spayd 2017-07-26 18:41:06 +00:00
• 91ad611f2e EDUCATOR-783 | Upgrade to edxval 0.1.0 (supports django 1.11). Alex Dusenbery 2017-07-26 14:40:07 -04:00
• 827c703d16 Change templates to use site aware email Matt Tuchfarber 2017-07-25 15:07:30 -04:00
• 562322d71e Merge pull request #15673 from edx/efischer/actually_limit_libraries Eric Fischer 2017-07-26 16:29:44 -04:00
• 482b63baaf Handle tab hiding at a different level. Diana Huang 2017-07-26 14:19:19 -04:00
• cf39bef74f GradesService: accept both string id or opaque key Tyler Hallada 2017-07-26 15:49:26 -04:00
• 262e068d29 Remove development.txt from circle.yml John Eskew 2017-07-26 15:41:41 -04:00
• d483fe1b68 Mirror the devstack prereqs in CircleCI and paver install_prereqs John Eskew 2017-06-12 11:06:57 -04:00
• bfb17a7673 Merge pull request #15665 from edx/bmedx/django_1.11_upgrade_oauth_toolkit_PLAT-1655 Brian Beggs 2017-07-26 15:20:09 -04:00
• 70c0b7bd3d PLAT-1590 Fixes for Docker Devstack e2e tests Jeremy Bowman 2017-07-26 15:07:57 -04:00
• 90a8a17ff4 Merge pull request #15657 from open-craft/haikuginger/enterprise-from-pipeline Jesse Shapiro 2017-07-26 14:49:24 -04:00
• 2ab2ed7760 Return no libraries if org not specified Eric Fischer 2017-07-26 14:45:45 -04:00
• 3517c1d978 Add pipeline check for linked enterprise Jesse Shapiro 2017-07-25 10:09:37 -04:00
• 5fea8b8b66 Merge pull request #15664 from edx/LEARNER-2016 Matthew Piatetsky 2017-07-26 13:49:35 -04:00
• 82bc92b4d8 Merge pull request #15607 from edx/ari/webpack-commons-all-pages Ari Rizzitano 2017-07-26 13:04:16 -04:00
• 918ca9b5ac Merge pull request #15654 from edx/tasawer/learner-741/fix-user-drowndown-alignment Tasawer Nawaz 2017-07-26 21:27:10 +05:00
• ef9935d2af Merge pull request #15591 from edx/Learner-1254 hamzamunir7300 2017-07-26 20:42:21 +05:00
• 3d4b2a7382 include webpack commons bundle on all pages; stub webpack_loader in python unittests Ari Rizzitano 2017-07-19 11:38:01 -04:00
• 9b15f58037 Merge pull request #15661 from edx/schen/learner-1521 Simon Chen 2017-07-26 10:47:38 -04:00
• 3f9f078189 fix for the quality tests failing Hamza Munir 2017-07-26 19:43:37 +05:00
• c96c1c8e94 Merge pull request #15667 from edx/afzaledx/get_programs_with_type_fix Afzal Wali Naushahi 2017-07-26 17:02:33 +05:00
• ec1473f84f Added a missing parameter. Afzal Wali 2017-07-26 15:46:49 +05:00
• 840a919a9c Fixed user dropdown alignment LEARNER-741 tasawernawaz 2017-07-25 14:55:55 +05:00
• 8087a1d165 Adds settings.FEATURES.ENABLE_SEPARATE_ARCHIVED_COURSES Jillian Vogel 2017-06-28 19:06:24 +09:30
• 53d9f87df3 Merge pull request #15662 from edx/bbaker/EDUCATOR-760 Brandon Baker 2017-07-25 16:40:11 -04:00
• 7be1f310db Add utm params to url redirect Matthew Piatetsky 2017-07-25 14:55:33 -04:00
• 8e06cdbf5e EDUCATOR-760 Change partitions logic to include partitions with one deleted group bbaker6225 2017-07-25 13:51:13 -04:00
• 39a27ac793 Merge remote-tracking branch 'origin/master' into EDUCATOR-926 Tyler Hallada 2017-07-25 15:05:36 -04:00
• 881acecc8f Upgrade django-oauth-toolkit to 0.12.0 bmedx 2017-07-25 14:55:08 -04:00
• f625e032dd Merge pull request #15659 from edx/release-mergeback-to-master edx-pipeline-bot 2017-07-25 14:54:43 -04:00
• a934e9e443 Merge branch 'master' into release-mergeback-to-master Feanil Patel 2017-07-25 14:00:33 -04:00
• 20a16f24b5 Move the user_attribute creation for site from within the user creation transaction to outside learner-1521 Simon Chen 2017-07-25 13:27:57 -04:00
• 0f2279d325 Merge pull request #15658 from edx/efischer/fix_leaks Eric Fischer 2017-07-25 13:26:55 -04:00
• e619406526 Temporarily install edx-proctoring@EDUCATOR-927 Tyler Hallada 2017-07-25 13:18:34 -04:00
• 228356dc09 Merge pull request #15633 from edx/jibsheet/remove-pre-insights-analytics-config Kevin Falcone 2017-07-25 13:07:17 -04:00
• 2f6fef589a Merge pull request #15649 from edx/release-candidate Feanil Patel 2017-07-25 12:57:31 -04:00
• d4943c5337 Use bulk_operations when loading items Eric Fischer 2017-07-25 10:38:50 -04:00
• 4c353d9318 Create GradesService to override persistent grades Tyler Hallada 2017-07-25 11:58:08 -04:00
• 62094215fd Merge pull request #15653 from edx/tobz/DE-209 Toby Lawrence 2017-07-25 11:37:31 -04:00
• 0d7305bc49 Merge pull request #15636 from edx/clintonb/multi-tenant-programs-fix Afzal Wali Naushahi 2017-07-25 20:28:35 +05:00
• acad210d47 Merge pull request #15651 from edx/release-mergeback-to-master edx-pipeline-bot 2017-07-25 10:45:11 -04:00
• 5c47632154 Merge pull request #15656 from edx/LEARNER-1726 Matthew Piatetsky 2017-07-25 10:44:22 -04:00
• bc6d7980a4 Revert "Merge pull request #15593 from edx/efischer/edu-274_logging" Eric Fischer 2017-07-25 10:38:29 -04:00
• 9efa7770f8 Resolved multi-tenant program issues Clinton Blackburn 2017-07-21 14:43:31 -04:00
• bfa8f4f436 CSS/JS fixes to Track Selection V3 Test Matthew Piatetsky 2017-07-25 09:48:04 -04:00
• db6f59987d Style timer with class rather than style attribute Joshua Spayd 2017-07-25 00:12:11 +00:00
• 81354a0238 [DE-209] Switch to the PyPI-based version of eventtracking. Toby Lawrence 2017-07-24 20:05:34 -04:00
• fd22467261 Merge pull request #15637 from edx/HarryRein/LEARNER-1652-cleanup Harry Rein 2017-07-24 16:26:24 -04:00
• b523ac3f91 Merge pull request #15589 from edx/HarryRein/LEARNER-1894-in-course-messaging-xsy Harry Rein 2017-07-24 16:06:52 -04:00
• eb987ed680 Merge pull request #15594 from edx/diana/access-checks Diana Huang 2017-07-24 16:04:05 -04:00
• d5fca9ee19 Merge pull request #15642 from edx/andya/studio-bootstrap-theme Andy Armstrong 2017-07-24 15:25:04 -04:00
• 08df53e110 Adding in course messaging to the home page. Harry Rein 2017-07-17 13:25:34 -04:00
• 081231a79b Merge pull request #15647 from edx/christina/ed-947 Christina Roberts 2017-07-24 14:34:08 -04:00
• 0356845c57 Merge pull request #15650 from edx/rc-2017-07-24 Feanil Patel 2017-07-24 14:27:34 -04:00
• 7efd5f38d4 Updating jasmine tests for course tools. Harry Rein 2017-07-21 15:08:42 -04:00
• 3fd17d3d21 Merge branch 'release' into rc-2017-07-24 Feanil Patel 2017-07-24 13:33:25 -04:00
• abc1aff401 Merge branch 'release' into release-candidate Feanil Patel 2017-07-24 13:20:07 -04:00
• fc11bdd72d Merge pull request #15604 from edx/jeskew/use_django111_compat_drf_oauth John Eskew 2017-07-24 12:37:03 -04:00
• c338b751f2 Consolidate access checks for prereqs and surveys. Diana Huang 2017-07-18 11:07:26 -04:00
• 83ae677b83 Don't add groups in experiment configurations twice. cahrens 2017-07-24 10:50:47 -04:00
• 95e47ddb02 Add basic Bootstrap theme to Studio Andy Armstrong 2017-07-19 10:17:49 -04:00
• 27cd3d199d Merge pull request #15645 from edx/mjfrey/vscode-gitignore Michael Frey 2017-07-24 09:23:08 -04:00
• 0082f36002 Ignore Visual Studio Code directory. Michael Frey 2017-07-24 09:20:05 -04:00
• 91752ad98a Merge pull request #15624 from open-craft/haikuginger/remove-sso-consent Jesse Shapiro 2017-07-24 07:43:16 -04:00
• 4697aab443 Merge pull request #15634 from edx/jeskew/bump_submissions_version_for_logging John Eskew 2017-07-22 11:55:46 -04:00
• 6f79800d38 Merge pull request #15640 from ubc/ubcpi-0.6.3 John Eskew 2017-07-22 11:48:56 -04:00
• 4cc91daab4 Update UBCPI to 0.6.3 Pan Luo 2017-07-21 16:26:42 -07:00
• fa9c09f9fe Remove Enterprise SSO hooks Jesse Shapiro 2017-07-20 13:17:30 -04:00
• 585d85ea96 ANALYTICS_API_KEY and ANALYTICS_SERVER_URL aren't used Kevin Falcone 2017-07-21 17:06:05 -04:00
• 7452456986 Merge pull request #15616 from edx/LEARNER-1726 Matthew Piatetsky 2017-07-21 14:46:31 -04:00
• 3b523bee1b Bump edx-ora2 to v1.4.8 John Eskew 2017-07-21 14:24:15 -04:00
• a8f032af8a Bump edx-ora2 to v1.4.8 John Eskew 2017-07-21 14:24:15 -04:00
• 3d3824d7b3 Bump edx-submissions to v2.0.5 for better logging. John Eskew 2017-07-21 13:34:36 -04:00
• 7d9cc90cab Merge pull request #15627 from edx/sstudent/compute_grades_fix sanfordstudent 2017-07-21 14:03:52 -04:00
• ca900b65fd Bump edx-submissions to v2.0.5 for better logging. John Eskew 2017-07-21 13:34:36 -04:00
• c8250fd573 Implement track selection v3 test Matthew Piatetsky 2017-07-19 17:38:44 -04:00
• 66fdd2fbd3 EDUCATOR-915: force subsection grades to update when course grade updates Sanford Student 2017-07-20 15:47:52 -04:00
• deaf89b709 Remove these unused config settings Kevin Falcone 2017-07-21 12:44:12 -04:00
• 17d5386046 Merge pull request #15632 from edx/afzaledx/clear_cached_programs Afzal Wali Naushahi 2017-07-21 21:23:18 +05:00
• b524f0e15b Merge pull request #15610 from edx/ari/fix-webpack-failures Ari Rizzitano 2017-07-21 11:32:39 -04:00
• 038d5a1351 catch WebpackLoaderBadStatsError to prevent unittest concurrency errors [LEARNER-1938] Ari Rizzitano 2017-07-19 15:22:54 -04:00
• f86f599894 Merge pull request #15631 from open-craft/bdero/bulk-enroll-content-type Brittney Exline 2017-07-21 09:57:22 -04:00
• e82053ee43 Clearing the cache if the site's configuration was removed. The site's configuration does not contain the API URL, it should not keep on displayed the old cached list of uuids. LEARNER-1146 Afzal Wali 2017-07-21 18:25:19 +05:00
• 9da5be0298 Move JavaScript to edx-proctoring repo Joshua Spayd 2017-07-20 16:02:09 -07:00
• aecb7ea309 Merge pull request #15626 from edx/jeskew/bump_submissions_version John Eskew 2017-07-20 19:01:27 -04:00
• bdc5c852b8 Update ORA2 and submissions to include field error printing. John Eskew 2017-07-20 16:04:47 -04:00
• 1990dc7fd8 Patch the bulk_enroll request to use a form content type Brandon DeRosier 2017-07-20 17:56:56 -04:00
• 1ecd1f38c1 Shift to edx fork of drf-oauth module. Add comments about forks. John Eskew 2017-07-19 09:54:26 -04:00
• 8ec6039766 Merge pull request #15557 from edx/george/cookie-consent-message George Song 2017-07-20 13:59:31 -07:00
• af08729195 Merge pull request #15623 from edx/george/enrollments-prereq George Song 2017-07-20 13:56:48 -07:00
• abc503bad2 Merge pull request #15608 from edx/bexline/fix_auto_registration Brittney Exline 2017-07-20 14:10:01 -04:00
• fc5716d9b1 Fixed milestone issues Ahmed Jazzar 2017-03-24 09:36:24 +02:00
• 040dfd698f Improve cookie consent message mrey 2017-05-31 12:17:43 +02:00
• 6439020815 ENT-550 Display only TOS for enterprise's configured to skip registration Brittney Exline 2017-07-19 12:23:17 -04:00
• 8ce7d86471 Merge pull request #15620 from edx/nedbat/update-translations Ned Batchelder 2017-07-20 12:45:05 -04:00
• 141c0af0eb Merge pull request #15586 from jspayd/hide-passwords-upstream George Song 2017-07-20 08:59:12 -07:00
• 42fffdfa9a Merge pull request #15614 from edx/christina/ed-945 Christina Roberts 2017-07-20 10:20:49 -04:00