Commit Graph

  • 2edacd190e removing unnecessary typeface file formats + adding optimized .woff2 formats Brian Talbot 2015-05-29 15:38:33 +02:00
  • 7f451c8835 Merge pull request #8681 from edx/will/credit-provider-integration-fixups Will Daly 2015-06-25 18:02:54 -07:00
  • 0bc2c42e0b Merge pull request #8682 from edx/muhhshoaib/PHX-40-sorting-of-popular-coupon-codes chrisndodge 2015-06-25 20:27:06 -04:00
  • 22a3f8620a Merge pull request #8658 from open-craft/library-create-unrestricted Braden MacDonald 2015-06-25 14:20:03 -07:00
  • 05972a608e Merge pull request #8677 from edx/ahodges/video_help Alison Hodges 2015-06-25 16:25:34 -04:00
  • ab915d1992 Merge pull request #8676 from edx/will/fix-credit-provider-config-unicode-error Will Daly 2015-06-25 13:24:57 -07:00
  • 2ca1d0ef78 fix the source_version xblock after discard changes Syed Hassan Raza 2015-06-12 20:29:49 +05:00
  • da982341e7 Accept string-encoded timestamps Will Daly 2015-06-25 13:18:30 -07:00
  • 62742952a2 Make credit provider callback CSRF exempt Will Daly 2015-06-25 13:04:45 -07:00
  • 24af22ca88 Remove restrictions on library creation in Studio Braden MacDonald 2015-06-23 18:01:03 -07:00
  • 0442e70072 PHX-40 added the sorting of the most popular coupon codes used. Muhammad Shoaib 2015-06-26 00:35:24 +05:00
  • 4d6cefcc3f Merge pull request #8665 from edx/mekkz/course-overviews-fix Kyle McCormick 2015-06-25 15:04:31 -04:00
  • 8c505e6b36 MA-879 Fix bug in course_start_datetime_text Kyle McCormick 2015-06-24 13:57:47 -04:00
  • 9ed127ec8a Fixes DOC-1715, video doc is now in the correct RTD project Alison Hodges 2015-06-25 14:14:07 -04:00
  • c63ac86842 Merge pull request #8675 from edx/release-merge-test Nimisha Asthagiri 2015-06-25 14:06:20 -04:00
  • fdf81042f5 Pass XBlock parents down to their children when constructing them, for caching Calen Pennington 2015-06-17 18:33:40 -04:00
  • 324d4785c1 Include stack traces when counting calls in unit tests Calen Pennington 2015-06-19 12:04:45 -04:00
  • 8548d55700 Gracefully handle credit provider keys with unicode type Will Daly 2015-06-25 10:53:36 -07:00
  • 595d4b2f1d LMS: revising and minimizing font-face calls Brian Talbot 2015-05-29 15:20:32 +02:00
  • da93162f0d Studio: revising and minimizing font-face calls Brian Talbot 2015-05-29 15:20:13 +02:00
  • ee479a0bbc Merge pull request #8673 from edx/mattdrayer/SOL-449 Matt Drayer 2015-06-25 13:22:32 -04:00
  • 8b5e5c5910 Merge branch 'release' Nimisha Asthagiri 2015-06-25 13:11:41 -04:00
  • f7262a211e mattdrayer/SOL-449: Add flaky decorator to bok choy test Matt Drayer 2015-06-25 10:56:59 -04:00
  • 091dc4c3aa Merge pull request #8650 from edx/utkjad/platform-eusc Utkarsh 2015-06-25 11:05:17 -04:00
  • 4ff1c8b38a Merge pull request #8529 from edx/andya/bokchoy-asset-pipeline Andy Armstrong 2015-06-25 10:50:50 -04:00
  • 950917945a Merge pull request #8671 from edx/ahsan/ECOM-1739-reverification-ask-for-webcam-permission-twice Ahsan Ulhaq 2015-06-25 19:42:05 +05:00
  • 923edee15f Fix flaky test_import_timestamp test. cahrens 2015-06-22 13:02:44 -04:00
  • aa76d9482a Update Bok Choy to use optimized static assets Andy Armstrong 2015-06-12 15:19:33 -04:00
  • 5ca6bfeb70 Merge pull request #8668 from edx/peter-fogg/update-team-tab-urls Peter Fogg 2015-06-25 09:19:11 -04:00
  • 84f03a16a6 Reverification flow asks for permission to use the webcam twice Ahsan Ulhaq 2015-06-25 15:39:51 +05:00
  • dac018f459 Adding dependency for edx-user-state-client Utkarsh 2015-06-23 15:30:19 -04:00
  • 4662246bf3 Merge pull request #8648 from edx/will/eligibility-provider-refactor Will Daly 2015-06-24 17:59:37 -07:00
  • 34863c76c1 Make the user info cookie secure Will Daly 2015-06-24 14:07:20 -07:00
  • 75d194e279 Update credit eligibility Will Daly 2015-06-23 08:15:19 -07:00
  • e6c7a571d1 Update URL when switching between Team tabs. Peter Fogg 2015-06-24 17:44:14 -04:00
  • 16807d7f6b Merge pull request #8663 from edx/christina/move-forgot-password-modal Christina Roberts 2015-06-24 17:19:54 -04:00
  • 5b91a97e4e Merge pull request #8654 from edx/christina/delete-dead-lms-code Christina Roberts 2015-06-24 16:04:45 -04:00
  • 2013c96376 Merge pull request #8662 from edx/christina/remove-flaky-test Christina Roberts 2015-06-24 16:03:57 -04:00
  • 4b64316425 Merge branch 'rc/2015-06-24' into release Nimisha Asthagiri 2015-06-24 15:12:05 -04:00
  • 30c049c896 Merge pull request #8664 from edx/clytwynec/TE-937 Christine Lytwynec 2015-06-24 14:53:41 -04:00
  • 9e7852352a Merge pull request #8601 from IONISx/tusbar/fix-enrollment-post-doc Mark Hoeber 2015-06-24 13:34:58 -04:00
  • a5fc4e6d6c Fix flaky test. cahrens 2015-06-24 10:26:36 -04:00
  • 5e86a64729 User info cookie Will Daly 2015-06-23 12:55:35 -07:00
  • 40808638b7 Merge pull request #8635 from edx/ahsan/ECOM-1594-Credit-eligibility-cms-accessibility-issues Ahsan Ulhaq 2015-06-24 21:42:41 +05:00
  • f19b338170 Shorten long lines to resolve pylint issues Bertrand Marron 2015-06-24 17:54:18 +02:00
  • e0ed2d8a3a Fix misleading enrollment API documentation Bertrand Marron 2015-06-20 00:43:32 +02:00
  • 7f9bec933c split common/lib and js unit tests into separate shards Christine Lytwynec 2015-06-24 11:33:57 -04:00
  • df3d9112e1 Move forgot_password_modal to login.html. cahrens 2015-06-24 11:06:16 -04:00
  • 0ae22a3b08 Credit Eligibility display on the CMS accessibility issues Ahsan Ulhaq 2015-06-23 13:28:12 +05:00
  • f07e4b9b38 Merge pull request #8387 from edx/aamir-khan/ECOM-1524-dashboard-credit-display-new Aamir 2015-06-24 19:02:57 +05:00
  • 2dfca626a7 Merge pull request #8151 from edx/marco/capa-styling Marco Morales 2015-06-24 09:05:34 -04:00
  • 987889fc37 ECOM-1524: Display credit availability on the dashboard aamir-khan 2015-06-05 19:13:38 +05:00
  • 66e4e28aa1 Merge pull request #8651 from edx/feanil/hotfix_commits_for_rc Nimisha Asthagiri 2015-06-24 00:37:01 -04:00
  • b1346fc747 add tests for structure cache use default cache for tests add test for when cache isn't configured add test for dummy cache noop if no cache found Adam Palay 2015-06-22 23:14:07 -04:00
  • 39ab0f31dc Cache SplitMongo course structures in memcached. David Ormsbee 2015-05-27 18:35:03 -04:00
  • 13dbfb8679 Merge pull request #8589 from edx/gprice/discussion-api-abuse-flagged Christopher Lee 2015-06-23 18:08:58 -04:00
  • 52a3306e2a Add abuse flagging to discussion API Greg Price 2015-06-17 18:45:19 -04:00
  • 9d42971440 Merge pull request #8646 from edx/clytwynec/fix-TestEmailMessageWithCustomICRVBlock Christine Lytwynec 2015-06-23 17:01:51 -04:00
  • 545f521933 Merge pull request #8652 from edx/will/logged-in-cookie-cleanup Will Daly 2015-06-23 13:53:37 -07:00
  • ead3cefa5f Remove unused setting. cahrens 2015-06-23 16:36:25 -04:00
  • 51a72c63fa Delete files that have no references to them. cahrens 2015-06-23 16:12:36 -04:00
  • 9d6d922e68 Merge pull request #8544 from edx/gprice/discussion-api-thread-list-following Christopher Lee 2015-06-23 16:08:51 -04:00
  • b89ad57cb7 Remove duplicate logged-in-cookie helper methods Will Daly 2015-06-23 12:47:15 -07:00
  • e947a92909 Merge pull request #8622 from edx/clytwynec/quiet_sass_compile_warnings Christine Lytwynec 2015-06-23 15:46:05 -04:00
  • 9480a3652c Merge pull request #8632 from edx/hotfix/2015-06-22 Feanil Patel 2015-06-23 15:38:50 -04:00
  • 16745cdec3 pass debug option through to compile_sass Christine Lytwynec 2015-06-22 15:54:01 -04:00
  • f81e373bd4 don't use hardcoded date in verification email test Christine Lytwynec 2015-06-23 14:04:19 -04:00
  • da16f4441e Merge pull request #8592 from edx/nickersoft/improved-embargo-restriction Tyler Nickerson 2015-06-23 14:18:13 -04:00
  • e184c78c0a XCOM-416: Embargo restrictions are now enforced during logistration Nickersoft 2015-06-19 15:05:46 -04:00
  • 54756317f1 Add followed thread retrieval to discussion API Greg Price 2015-06-17 00:41:18 -04:00
  • de142b2b51 Set a minimum number of Xblock constructions in field override tests Calen Pennington 2015-06-17 18:33:02 -04:00
  • 9a94c60147 Merge pull request #8644 from edx/zoldak/TE-950 Jesse Zoldak 2015-06-23 12:57:56 -04:00
  • ecd237396e Merge pull request #8617 from edx/diana/course-tab-cleanup Diana Huang 2015-06-23 12:33:06 -04:00
  • bfd250ed61 Merge pull request #8596 from edx/frances/fix/course-content-margin frances botsford 2015-06-23 11:53:15 -04:00
  • 9efe3201da Merge pull request #8568 from edx/will/credit-provider-api-timestamp-update Will Daly 2015-06-23 08:46:30 -07:00
  • 79527f8191 Update bok-choy version Jesse Zoldak 2015-06-23 11:22:12 -04:00
  • e6cbff47b7 Switch tabs to use ugettext_noop for titles. Diana Huang 2015-06-22 10:54:41 -04:00
  • aa5e2f49bd Fixes tests, adds internationalized strings for new state tooltips, corrected tooltip javascript, etc. Kyle McCormick 2015-06-04 16:44:08 -04:00
  • 243ac00481 ECOM-1772 Due date issue test case fixed. Awais 2015-06-22 14:55:12 +05:00
  • 8718dc13ca Cache SplitMongo course structures in memcached. David Ormsbee 2015-05-27 18:35:03 -04:00
  • 13f5fe029f Merge pull request #8484 from edx/mekkz/course-overviews Kyle McCormick 2015-06-22 21:38:00 -04:00
  • d84c3bd7a9 MA-776 change UserCourseEnrollmentsList endpoint to use course_overviews Kyle McCormick 2015-06-15 15:56:55 -04:00
  • 1726c136fa MA-772 create app course_overviews for caching course metadata Kyle McCormick 2015-06-15 15:54:37 -04:00
  • 328ed9270f Add new testing decorator check_mongo_calls_range Kyle McCormick 2015-06-17 15:26:51 -04:00
  • 3dafdd2fc5 Merge pull request #8625 from edx/will/js-test-fixup Will Daly 2015-06-22 14:37:20 -07:00
  • ba24c0297e Merge pull request #8626 from edx/renzo/fix-test-case Renzo Lucioni 2015-06-22 17:23:35 -04:00
  • f78d45080d Correct logistration GET parameter preservation test case Renzo Lucioni 2015-06-22 16:25:52 -04:00
  • 356cdeecb4 Fix JS tests that broke due to a conflict between merges Will Daly 2015-06-22 13:22:17 -07:00
  • e7cbcfff20 Merge pull request #8618 from edx/sarina/revert-8402 Sarina Canelake 2015-06-22 16:05:49 -04:00
  • 39d2be7244 Merge pull request #8619 from edx/mattdrayer/ECOM-1773 Matt Drayer 2015-06-22 15:35:13 -04:00
  • f0f3766443 mattdrayer/ECOM-1773: Fixed invalid URL reversal Matt Drayer 2015-06-22 14:01:05 -04:00
  • 1e21945e22 Revert "Merge pull request #8402 from edx/sarina/annotate-middleware" Sarina Canelake 2015-06-22 13:55:53 -04:00
  • d9cdb5d691 Merge pull request #8615 from edx/nimisha/fix-unit-test Nimisha Asthagiri 2015-06-22 13:50:55 -04:00
  • 9175a0c465 Merge pull request #8614 from edx/andya/fix-content-libraries Andy Armstrong 2015-06-22 13:47:05 -04:00
  • 19fdaeced3 Merge pull request #8612 from edx/sarina/remove_hinting_templates Sarina Canelake 2015-06-22 13:37:43 -04:00
  • 44e13af6be Merge pull request #8576 from edx/gprice/discussion-api-max-depth Christopher Lee 2015-06-22 13:30:37 -04:00
  • 5174344a2e Merge pull request #8611 from edx/ned/fix-rednose Ned Batchelder 2015-06-22 13:17:56 -04:00
  • 0f3f98f35d Merge pull request #8586 from edx/cdodge/fix-multi-seat_spinner chrisndodge 2015-06-22 13:16:34 -04:00
  • c426f5506b Respond to code review feedback. Will Daly 2015-06-22 10:03:22 -07:00
  • 1b0246e2af ECOM-1772 Due date issue test case fixed. Awais 2015-06-22 14:55:12 +05:00