Commit Graph

  • 3d4a853e00 Merge pull request #5926 from Stanford-Online/kluo/lti-grades-past-due Usman Khalid 2015-01-22 19:55:21 +05:00
  • af9dce82a3 Make LTI grade submissions respect deadlines Kevin Luo 2014-11-06 11:54:17 -08:00
  • fcd7736d29 Merge pull request #6721 from edx/will/revert-requirejs-changes Will Daly 2015-01-21 19:07:34 -05:00
  • 4198da1ae1 Merge pull request #6657 from open-craft/fix-library-old-mongo-default Braden MacDonald 2015-01-21 15:05:12 -08:00
  • 1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" Will Daly 2015-01-21 17:13:27 -05:00
  • e70a5e265c Merge pull request #6082 from openfun/edx/translate-enrollment-emails Sarina Canelake 2015-01-21 16:40:51 -05:00
  • e617ce927d Merge pull request #6713 from edx/cdodge/no-tax-id-on-cc-receipts chrisndodge 2015-01-21 16:16:24 -05:00
  • 1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms Will Daly 2015-01-21 15:23:35 -05:00
  • 872870ea18 Merge pull request #6715 from edx/talbs/fix-instructordashboard-icons Brian Talbot 2015-01-21 15:04:27 -05:00
  • 62b58fce02 Only put the TaxID for Invoices, not Credit Card based receipts Chris Dodge 2015-01-21 13:23:29 -05:00
  • 136f8d4efa removing jenkins doc from platform Christine Lytwynec 2015-01-21 14:10:34 -05:00
  • 025f046b04 Fix errors with libraries when old mongo is default (first) modulestore Braden MacDonald 2015-01-15 13:04:47 -08:00
  • 9d2ede98a4 LMS: resolving incorrect icon on Instructor Dashboard admin list mgmt Brian Talbot 2015-01-21 13:47:01 -05:00
  • 57fc5b37f0 Updated version of PyContracts. John Eskew 2015-01-21 11:09:59 -05:00
  • 0bd1f84d6f Merge pull request #6699 from edx/sanchez/unicode_error_verification Stephen Sanchez 2015-01-21 11:02:00 -05:00
  • e6e443c712 Merge pull request #6674 from edx/disable-pylint-name-errors-on-settings David Baumgold 2015-01-21 10:40:05 -05:00
  • a72e129da5 Merge pull request #6532 from edx/course-about-i18n David Baumgold 2015-01-21 10:23:59 -05:00
  • ab53bad878 Merge pull request #6704 from edx/cdodge/fix-shoppingcart-back-button chrisndodge 2015-01-21 10:22:57 -05:00
  • 7faf5cc0f3 When changing quantities, be sure to return the new CyberSource submit form html. Also, to ensure that any browser content is fully refreshed when clicking the back button, force a page refresh to reset client state Chris Dodge 2015-01-20 20:13:59 -05:00
  • 6604eedbad Merge pull request #6683 from mitocw/bdero/instructor-dashboard-gitlogs-link Sarina Canelake 2015-01-20 21:14:04 -05:00
  • 065a7f3426 Merge pull request #6702 from edx/sanchez/verification_unicode_names Carlos Andrés Rocha 2015-01-20 18:59:14 -05:00
  • 24862edf1c Add gitlogs link to instructor dashboard Brandon DeRosier 2015-01-16 23:49:14 -05:00
  • 3b5bd4e777 Making verification msg strings unicode friendly. stephensanchez 2015-01-20 21:01:38 +00:00
  • 1503043826 Merge pull request #6698 from edx/renzo/disable-flaky-bok-choy Renzo Lucioni 2015-01-20 16:40:13 -05:00
  • 891b952c99 Making verification msg strings unicode friendly. stephensanchez 2015-01-20 21:01:38 +00:00
  • 2ea094e5bc Merge pull request #6700 from edx/alasdair/old-verification-flow-fontawesome-fix AlasdairSwan 2015-01-20 16:22:42 -05:00
  • 1ccc7dc8cc Merge pull request #6677 from edx/diana/handle-expired-verification Diana Huang 2015-01-20 16:21:13 -05:00
  • 04fc722e1c ECOM-958 fixed font awesome issues with old verification flow AlasdairSwan 2015-01-20 16:05:55 -05:00
  • d6a823c033 Disable flaky bok-choy tests of payment and verification flow Renzo Lucioni 2015-01-20 15:30:23 -05:00
  • 1920ab4149 Merge pull request #6650 from edx/dan-f/validate-group-configuration-group-names Daniel Friedman 2015-01-20 15:27:49 -05:00
  • 134d2f57b2 Show an error when a student needs to reverify due to expiration. Diana Huang 2015-01-14 17:17:05 -05:00
  • c2a0b0f06e Merge pull request #6631 from edx/gprice/video-upload-improvements Greg Price 2015-01-20 14:47:14 -05:00
  • 1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS Will Daly 2015-01-11 08:51:50 -05:00
  • e592eef09b Merge pull request #6675 from edx/clee-MA-234-hotfix Christopher Lee 2015-01-20 14:02:46 -05:00
  • 6249584767 Merge pull request #6659 from edx/jeskew/asset_md_size_of_mongo_docs John Eskew 2015-01-20 13:31:51 -05:00
  • b6c08ad213 Named_path variable now populates complete path christopher lee 2015-01-16 11:45:48 -05:00
  • 11428fa632 Merge pull request #5237 from mtyaka/mathjax-upgrade Adam 2015-01-20 12:26:38 -05:00
  • f3419bb5bb Render enrollment emails in the student's language Régis Behmo 2014-11-26 11:56:47 +01:00
  • 7a2f0640b7 Add Régis Behmo to AUTHORS Régis Behmo 2014-11-27 11:53:44 +01:00
  • 874cd5c78f Improve code for video upload feature Greg Price 2015-01-14 17:06:32 -05:00
  • c1df980077 Merge pull request #6695 from edx/sarina/20150120-update-translations Sarina Canelake 2015-01-20 11:28:23 -05:00
  • 5cd58897ab Require unique group names in group configurations Daniel Friedman 2015-01-13 10:32:30 -05:00
  • a4bbed3bc1 Add performance test which finds the BSON size of varying amounts of asset metadata in both the old Mongo and Split modulestores. John Eskew 2015-01-15 17:20:23 -05:00
  • 284e78c27e Merge pull request #6690 from edx/will/inline-user-api-forms Will Daly 2015-01-20 11:09:01 -05:00
  • 349a02e405 Merge pull request #6693 from benpatterson/benp/fix-pylint-error Ben Patterson 2015-01-20 10:42:32 -05:00
  • 9783630dc0 Merge pull request #6666 from edx/awais786/ECOM-924-unique-code-url Awais Qureshi 2015-01-20 20:36:32 +05:00
  • 503f4d95bb Update translations (autogenerated message) Sarina Canelake 2015-01-20 10:04:06 -05:00
  • 0c7620a544 Merge pull request #6637 from open-craft/mtyaka/validate-chars Xavier Antoviaque 2015-01-20 16:02:32 +01:00
  • b12d007138 ECOM-924 Adding redeem code url in attached email file Awais 2015-01-16 16:43:29 +05:00
  • 11613bd26a Resolve run_pylint error. Ben Patterson 2015-01-20 06:28:11 -05:00
  • 957e0e28cc Merge pull request #6685 from edx/tim/get_parent Tim Babych 2015-01-19 23:36:29 +02:00
  • 0a9f9130b0 Inline the user api form description calls Will Daly 2015-01-19 13:03:33 -05:00
  • e255f4b021 Upgrade MathJax to 2.4. Matjaz Gregoric 2015-01-16 09:15:36 +01:00
  • b0c2bc2181 make use of xblock.get_parent() Tim Babych 2015-01-19 04:04:02 +02:00
  • f8a048d6e2 Merge pull request #6651 from benpatterson/benp/remove-tddium-scripts Ben Patterson 2015-01-18 12:33:46 -05:00
  • 809d09af07 Merge pull request #6191 from marcore/fix-TNL-726 David Baumgold 2015-01-17 17:08:21 -05:00
  • d65902ed3c Add themes files to staticfiles_dir in Studio Marco Re 2014-12-09 11:44:08 +01:00
  • 95cc2bb8ab Merge pull request #6667 from edx/anton/edxnotes-fix-ui-hat Anton Stupak 2015-01-17 13:04:02 +02:00
  • b14eaa038c Merge pull request #6627 from edx/jeskew/perf_test_asset_metadata_find_mongo John Eskew 2015-01-16 17:03:02 -05:00
  • 01f2e1fd0b Add performance test when finding asset metadata. Re-factor report generation and add report for "find" performance test. John Eskew 2015-01-13 17:08:50 -05:00
  • 1d9b5a9736 TNL-1220: Fix Harvard Text Annotation UI. polesye 2015-01-16 16:03:14 +02:00
  • e64d45b705 Merge pull request #6563 from edx/ned/fix-6013 Ned Batchelder 2015-01-16 15:12:31 -05:00
  • b2e2048bf6 Merge pull request #6680 from edx/sarina/add-authors Sarina Canelake 2015-01-16 15:01:55 -05:00
  • 8f377c06c2 Add Siem Kok and Steffan Sluis to AUTHORS Sarina Canelake 2015-01-16 15:00:31 -05:00
  • a8cc338711 Merge pull request #6672 from edx/talbs/fix-edxnotes-links+highlights Brian Talbot 2015-01-16 14:49:08 -05:00
  • dde097c926 Merge pull request #6676 from edx/release chrisndodge 2015-01-16 14:07:44 -05:00
  • 9ac7176b8f Merge pull request #6223 from edx/feature/SOL-20 Martyn James 2015-01-16 12:54:45 -05:00
  • dcc8e95648 Implements SOL-20. Filtering for assets table by asset type Martyn James 2014-10-23 15:37:51 -04:00
  • 8ed247b362 Merge pull request #6662 from edx/mobile/MA-227 Nimisha Asthagiri 2015-01-16 12:45:08 -05:00
  • 8394fb71ac Merge pull request #6608 from edx/mobile/MA-216 Nimisha Asthagiri 2015-01-16 12:41:21 -05:00
  • 8c45e62bf4 Merge pull request #6661 from edx/hotfix/2015-01-16 chrisndodge 2015-01-16 12:24:22 -05:00
  • 0c9d687fc9 One place in the new library code that used the old user service Ned Batchelder 2015-01-16 08:34:25 -05:00
  • df0e3e64ad Pylint fixes to make diff-quality happy Ned Batchelder 2015-01-12 13:35:31 -05:00
  • 7f1b60b286 Implement user service to return currently-logged-in user Jason Bau 2014-11-20 17:39:34 -05:00
  • dd18a8e618 User service PR: fix unrelated courseware test Jason Bau 2014-12-12 15:15:32 -08:00
  • ef43840a79 Ignore invalid-name errors for settings files David Baumgold 2015-01-16 11:15:48 -05:00
  • 314ad95797 Merge pull request #6658 from edx/will/ECOM-894 Will Daly 2015-01-16 11:27:00 -05:00
  • 0ed43e1472 Merge pull request #6671 from edx/clytwynec/disable_flaky_tests Christine Lytwynec 2015-01-16 11:23:45 -05:00
  • 26fb3fc557 LMS: student notes - styling links to appear in highlighted text Brian Talbot 2015-01-16 11:07:55 -05:00
  • 94b313fd72 Merge pull request #6625 from Stanford-Online/jbau/small-shib-bugfix Sarina Canelake 2015-01-16 11:07:29 -05:00
  • 625eae27d6 disable DragAndDropTest Christine Lytwynec 2015-01-16 10:51:43 -05:00
  • 17d593ae0a Merge pull request #6669 from edx/clytwynec/disable_flaky_tests Christine Lytwynec 2015-01-16 10:48:18 -05:00
  • 94ce3c0a8c Merge pull request #6514 from johnjlee/schoolyourself-xblock Ned Batchelder 2015-01-16 10:35:50 -05:00
  • c2f3e7a1e8 disable test_settings_overrides Christine Lytwynec 2015-01-16 09:43:59 -05:00
  • 85650da212 disable test_prerequisite_course_save_successfully Christine Lytwynec 2015-01-16 09:42:08 -05:00
  • caee333142 MA-227 Mobile announcements sort order correction. Nimisha Asthagiri 2015-01-15 21:43:26 -05:00
  • 8228337063 Allow inactive users to request a password reset Will Daly 2015-01-15 17:07:18 -05:00
  • 5958ffb33d Merge pull request #6582 from edx/waheed/tnl935-fix-transcript-skip-first-line Waheed Ahmed 2015-01-16 15:00:21 +05:00
  • 47a372282a Fixed transcript skip first line if it contains BOM(Byte Order Mark). TNL-935 Waheed Ahmed 2015-01-13 16:00:18 +05:00
  • 2db00c5723 Merge pull request #6647 from edx/renzo/split-payment-verification-acceptance-tests Renzo Lucioni 2015-01-16 01:47:04 -05:00
  • dea6b764de Mobile enrollments API: sort order by recent enrollment date. Nimisha Asthagiri 2015-01-15 20:02:39 -05:00
  • b59566a382 Merge pull request #6455 from edx/mattdrayer/entrance-exams Matt Drayer 2015-01-15 21:43:08 -05:00
  • 3c669e3838 New feature contribution: Entrance Exams Matt Drayer 2015-01-12 15:48:22 -05:00
  • 5880401d9d add a missing check for an undefined object Chris Dodge 2015-01-15 18:58:11 -05:00
  • c6777a5b25 Bok Choy tests for the split payment and verification flow Renzo Lucioni 2015-01-09 09:44:26 -05:00
  • 27fee62039 Merge pull request #6126 from edx/ziafazal/add-pre-requisite-course-via-milestones-app Matt Drayer 2015-01-15 14:20:44 -08:00
  • a07f607281 Updated strategy per review feedback. Nimisha Asthagiri 2015-01-15 17:15:46 -05:00
  • 572f155aad Merge pull request #6541 from edx/will/update-diff-cover Will Daly 2015-01-15 17:09:43 -05:00
  • ca1ba20556 Merge pull request #6656 from edx/update-readme-link David Baumgold 2015-01-15 16:58:43 -05:00
  • 591c0f63bb Update README link for full stack installation David Baumgold 2015-01-15 16:31:24 -05:00