Commit Graph

  • f80720d09e Merge pull request #9541 from edx/afzaledx/extending_auto_auth_for_verified_users Afzal Wali Naushahi 2015-09-02 23:27:36 +05:00
  • ff8e473787 Merge pull request #9588 from edx/release Kevin Falcone 2015-09-02 14:11:29 -04:00
  • 7b77f816ed Merge pull request #9472 from edx/andya/team-search-ui Andy Armstrong 2015-09-02 13:09:08 -04:00
  • 54cf7124f2 Merge pull request #9566 from edx/hotfix-2015-09-02 Kevin Falcone 2015-09-02 13:06:31 -04:00
  • 0145ae7b6e adjust teams search styles and add search clear Frances Botsford 2015-08-28 15:41:34 -04:00
  • 4be74937df Add searching to the teams view Andy Armstrong 2015-08-25 20:09:07 -04:00
  • 4de03b64a9 Merge pull request #9583 from mirjamsk/patch-1 Sarina Canelake 2015-09-02 11:52:58 -04:00
  • 9473c29710 Merge pull request #9574 from edx/muzaffar/upgrade-sorl-thumbnail Muzaffar yousaf 2015-09-02 20:32:30 +05:00
  • 9fd1d9079f Merge pull request #9569 from edx/benp/TE-572-disable Ben Patterson 2015-09-02 11:27:21 -04:00
  • e47eb205d4 Merge pull request #9577 from edx/benp/ECOM-1165-declare-it-flaky Ben Patterson 2015-09-02 10:36:11 -04:00
  • f74c9b6de5 mattdrayer/cert-webview-add-org-fields: Added new fields to context Matt Drayer 2015-09-02 10:09:19 -04:00
  • 49158fe0c9 Merge pull request #9535 from edx/ziafazal/MAYN-119 Matt Drayer 2015-09-02 10:05:47 -04:00
  • 257aaaee83 Added the ability to change the enrollment mode in the auto_auth API (used for bokchoy and load tests). Afzal Wali 2015-08-31 17:50:14 +05:00
  • 3a6f4b99fd Update AUTHORS mirjamsk 2015-09-02 15:58:10 +02:00
  • d81b674789 Add lms/envs/aws.py entry for LTI_AGGREGATE_SCORE_PASSBACK_DELAY David Ormsbee 2015-09-02 09:27:05 -04:00
  • 3792d67fd1 Merge pull request #9567 from edx/merge-release-into-master Adam 2015-09-02 09:21:45 -04:00
  • aa8e363cf9 Update Django-nose muhammad-ammar 2015-09-02 18:16:32 +05:00
  • b4b0971c04 Tagging this test as flaky. Ben Patterson 2015-09-02 08:35:45 -04:00
  • 65960ca007 Upgrade sorl-thumbnail to 12.3. muzaffaryousaf 2015-09-02 14:33:18 +05:00
  • 127467f20a Merge pull request #9023 from mcgachey/lti-collated-grades David Ormsbee 2015-09-02 07:34:10 -04:00
  • 4b4ca54674 Hide shopping Cart menu Zia Fazal 2015-08-31 12:06:17 +05:00
  • fb65874930 Addresses TNL-3183 mirjamsk 2015-09-02 08:00:42 +00:00
  • 2438b27b9c Merge pull request #9330 from open-craft/fix-offline-gradecalc Braden MacDonald 2015-09-01 19:41:22 -07:00
  • 29e1c49d6a TE-572 disable flaky test. Ben Patterson 2015-09-01 18:12:22 -04:00
  • 06014bfae0 Merge pull request #9559 from edx/peter-fogg/remove-bind-all Peter Fogg 2015-09-01 17:36:14 -04:00
  • 804e110295 Merge pull request #9565 from edx/zoldak/TNL-3183 Jesse Zoldak 2015-09-01 16:18:30 -04:00
  • f8e44f7832 Merge pull request #9536 from edx/muhhshoaib/PHX-122-remove-the-record-in-the-creditRequirementStatus-table chrisndodge 2015-09-01 16:05:43 -04:00
  • a4759b4158 Merge pull request #9563 from edx/adam/add-video-player-fix-to-rc Adam 2015-09-01 16:01:56 -04:00
  • 76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master Adam Palay 2015-09-01 16:01:04 -04:00
  • 7f0b9bceff Decorate flaky test TNL-3183 Jesse Zoldak 2015-09-01 15:34:31 -04:00
  • f577a6d278 Add body hash to LTI outcome message. David Ormsbee 2015-08-31 15:22:37 -04:00
  • 664544035a Add explicit name for LTI provider outcome celery task. David Ormsbee 2015-08-29 20:22:27 -04:00
  • 37cdb89a5e Allow LtiConsumer.instance_guid to be blank. David Ormsbee 2015-08-28 14:18:42 -04:00
  • 06a20054b0 Merge pull request #9561 from edx/hotfix/2015-09-01a Adam 2015-09-01 15:15:34 -04:00
  • f099a7e911 fix issue where video player renders twice (TNL-3064) Adam Palay 2015-08-28 12:26:00 -04:00
  • 4d0efa2893 PHX-122 Muhammad Shoaib 2015-08-31 16:37:09 +05:00
  • f82662356f Revert "OSPR-535 Partial Credit" Syed Hassan Raza 2015-09-01 10:57:17 -07:00
  • 67a6dd08bc Remove unnecessary bindAll calls. Peter Fogg 2015-09-01 13:56:20 -04:00
  • e807cbd589 Merge pull request #9402 from edx/clytwynec/TNL-2153 Christine Lytwynec 2015-09-01 12:48:46 -04:00
  • 15c0d3c2e3 Merge pull request #9532 from edx/ammar/tnl3166 Muhammad Ammar 2015-09-01 21:04:10 +05:00
  • f2631faab1 Merge pull request #9529 from edx/marco/UX-2753/partial-credit-icon-status Marco Morales 2015-09-01 11:30:18 -04:00
  • 3470e180fc Change component types and template links to buttons Christine Lytwynec 2015-08-20 10:17:02 -04:00
  • 9f86f18841 Merge pull request #9503 from edx/christina/composite-index Christina Roberts 2015-09-01 10:30:47 -04:00
  • af609f103f Merge pull request #9494 from edx/ned/move-recommender-tests Ned Batchelder 2015-09-01 10:20:24 -04:00
  • 1d229a3293 Merge pull request #9540 from edx/dsego/SOL-1065 Davorin Šego 2015-09-01 15:53:18 +02:00
  • 6acdfea7aa Merge pull request #9553 from edx/mjevtic/SOL-1160 Marko Jevtić 2015-09-01 15:27:47 +02:00
  • a0a0078d1f Use AjaxHelpers instead of Sinon fake server Davorin Sego 2015-08-31 16:04:27 +02:00
  • 1531d8d250 (SOL-1160) mark test as flaky Marko Jevtic 2015-09-01 12:26:50 +00:00
  • f2b3ec5766 Merge pull request #9513 from edx/ammar/tnl3125-i18n-and-rtl-fixes Muhammad Ammar 2015-09-01 16:50:33 +05:00
  • 089ca195b6 Merge pull request #9542 from edx/ahsan/Update-edx-reverification-block-version Ahsan Ulhaq 2015-09-01 15:49:07 +05:00
  • 65099c4ef7 update Reverification block hash Ahsan Ulhaq 2015-08-31 19:20:53 +05:00
  • e15732114d Fixed CCX display name issue in enrollment/unenrollment email templates for non EDX members Amir Qayyum Khan 2015-08-26 17:33:39 +05:00
  • 4840b46716 i18n and rtl fixes muhammad-ammar 2015-08-28 15:14:54 +05:00
  • c217d986de Merge pull request #9516 from edx/tasawer/dev-story/ecom-1017-removing-experimental-logistration-endpoints-updated tasawernawaz 2015-09-01 11:50:52 +05:00
  • 5e67933175 fix flaky muhammad-ammar 2015-08-29 16:00:25 +05:00
  • 072a66e196 Merge pull request #9468 from edx/frances/teams-padding-responsive-followup frances botsford 2015-08-31 21:52:01 -04:00
  • a16c951c09 Fix imports and test skips to work properly from openedx Ned Batchelder 2015-08-27 07:20:44 -04:00
  • f925a4af9c Move recommender XBlock tests to openedx/tests/xblock_integration Ned Batchelder 2015-08-26 16:57:42 -04:00
  • 9ff620dedf Merge pull request #9334 from jolyonb/dragdropfix Andy Armstrong 2015-08-31 17:12:49 -04:00
  • 40f833164c Merge pull request #9509 from edx/ormsbee/faster_tests_shoppingcart David Ormsbee 2015-08-31 16:07:58 -04:00
  • 25169ccc4d Merge pull request #9147 from open-craft/OC-791-answer-export Sarina Canelake 2015-08-31 15:12:55 -04:00
  • bb1631b2e5 Merge pull request #9545 from edx/clintonb/csrf-test Clinton Blackburn 2015-08-31 11:53:21 -07:00
  • 44d3cb444f updated responsive body class to .is-view-in-course Frances Botsford 2015-08-25 13:12:09 -04:00
  • c6c897e218 Added test for CreditCourse endpoint CSRF validation Clinton Blackburn 2015-08-31 12:31:55 -04:00
  • 40e38829a6 Merge pull request #9544 from edx/asadiqbal08/SOL-1158 Matt Drayer 2015-08-31 13:30:53 -04:00
  • db2ac7996d Merge pull request #9515 from edx/benp/add-jshint-diff-quality Ben Patterson 2015-08-31 12:55:20 -04:00
  • 5ad126d69f Merge pull request #9505 from edx/jibsheet/delete_course-memory-improvement Kevin Falcone 2015-08-31 12:38:30 -04:00
  • c1162864aa SOL-1158 asadiqbal 2015-08-31 21:17:40 +05:00
  • 44b40b3fde Merge pull request #9538 from edx/feanil/upgrade_uglify_on_rc Feanil Patel 2015-08-31 11:30:01 -04:00
  • e3c66f55e0 Optimize memory and CPU usage. Kevin Falcone 2015-08-26 23:37:03 -04:00
  • 91c1527189 Update circle-ci to run quality after jshint has been added to PATH. Ben Patterson 2015-08-31 10:58:09 -04:00
  • 035bf4fbf2 Merge pull request #9537 from edx/feanil/upgrade_uglify Feanil Patel 2015-08-31 11:01:18 -04:00
  • 0683e5ff3f Add jshint diff-quality. Ben Patterson 2015-06-27 08:30:11 -04:00
  • 4bc9cb4ddd Merge pull request #9531 from edx/credit-api-csrf-fix Clinton Blackburn 2015-08-31 07:55:10 -07:00
  • 4e66253c23 Upgrade uglify-js to 2.4.24 Feanil Patel 2015-08-31 09:19:46 -04:00
  • 354693a794 Upgrade uglify-js to 2.4.24 Feanil Patel 2015-08-31 09:19:46 -04:00
  • cd69ca2b23 Removed unused url endpoints + fixed broken tests ECOM-1017 Tasawer 2015-08-28 19:27:43 +05:00
  • ab2d006329 Merge pull request #9454 from edx/tasawer/bugfix/ecom-1165-fixing-password-reset-test tasawernawaz 2015-08-31 13:53:23 +05:00
  • 58a2dc2466 Removing flaky decorator from test ECOM-1165 Tasawer 2015-08-25 16:52:29 +05:00
  • 6096341523 Update mako muhammad-ammar 2015-08-31 11:20:56 +05:00
  • 0de0fbb91a Merge pull request #9519 from edx/ned/sass-import-dot Ned Batchelder 2015-08-29 12:35:53 -04:00
  • a1ba77d6b3 Diabled CSRF protection for Credit Course API endpoints Clinton Blackburn 2015-08-29 03:02:05 -04:00
  • 3c8dbe774f Merge pull request #9530 from edx/ned/tweak-release-email Ned Batchelder 2015-08-28 17:17:07 -04:00
  • 9e7c93d931 Merge pull request #9504 from edx/peter-fogg/sort-team-page Peter Fogg 2015-08-28 16:25:57 -04:00
  • 0219d97c88 Add a sentence to the release email about how to change where the email is sent. Ned Batchelder 2015-08-28 16:22:07 -04:00
  • dd0218416b Allow staff users to request a list of courses a student is enrolled in. Sven Marnach 2015-08-10 13:51:33 +02:00
  • dc5c4660c7 updated partially correct capa icon, accounting for lack of status label or message on these problems. New icon used is an asterisk with the same green color. marcotuts 2015-08-28 15:57:25 -04:00
  • 2c774fd271 Allow sorting of teams in a topic. Peter Fogg 2015-08-26 16:12:24 -04:00
  • 1e430a76ca Merge pull request #9495 from edx/ormsbee/faster_tests_course_struct David Ormsbee 2015-08-28 15:06:16 -04:00
  • 4876865c37 Merge pull request #9528 from edx/zoldak/TNL-3166 Jesse Zoldak 2015-08-28 15:04:01 -04:00
  • 5a3b69ba4b Add current directory to the sass compilation path. Ned Batchelder 2015-08-28 11:31:16 -04:00
  • d3754af2f4 Skip flaky JS test TNL-3166 Jesse Zoldak 2015-08-28 14:51:59 -04:00
  • b37ddc7e1d Merge pull request #9518 from edx/asadiqbal08/updating_organization_app_hash Matt Drayer 2015-08-28 14:38:59 -04:00
  • f696c98f82 Merge pull request #9510 from edx/ormsbee/faster_tests_disc_api_serializers David Ormsbee 2015-08-28 13:39:15 -04:00
  • d57e777dec Merge pull request #9523 from edx/revert-9367-clrux/ac-76-course-nav clrux 2015-08-28 13:28:47 -04:00
  • 5b545c2b0d Revert "Course navigation menu accessibility issue" clrux 2015-08-28 13:28:08 -04:00
  • 52a8bc50cb Merge pull request #9367 from edx/clrux/ac-76-course-nav clrux 2015-08-28 13:27:44 -04:00
  • 69ddbc0dc4 Merge pull request #9370 from edx/cdodge/add-course-id-to-survey-answers chrisndodge 2015-08-28 13:03:58 -04:00
  • 9992ba66df Name teams in a more meaningful way cahrens 2015-08-28 12:42:50 -04:00
  • 17253ead24 Cache team_size on CourseTeam model and remove is_active field. Peter Fogg 2015-08-28 09:32:50 -04:00