Commit Graph

  • a458b469d1 modify partial recovery message Adam Palay 2013-12-04 17:02:17 -05:00
  • 326d9dbeac Merge pull request #1851 from edx/ned/merge-lti-hotfix Ned Batchelder 2013-12-04 13:48:22 -08:00
  • 3118a5de1b Merge pull request #1852 from cpennington/more-db-error-fixes Ned Batchelder 2013-12-04 13:46:56 -08:00
  • b9926a2fd3 Add message explaining partial recovery Calen Pennington 2013-12-04 16:42:57 -05:00
  • beda1f8bbf Merge pull request #1846 from edx/db/update-logging David Baumgold 2013-12-04 13:37:44 -08:00
  • e561c1354d Add managemant command to generate sql to clean up tp truncated student ids in ORA db Calen Pennington 2013-12-04 15:11:54 -05:00
  • 4d506016e7 Add a backwards migration to delete the archive table Adam Palay 2013-12-04 10:23:04 -05:00
  • b33bb1a836 Merge pull request #1848 from edx/db/remove-deploy-rake David Baumgold 2013-12-04 13:01:16 -08:00
  • e96108629d Fix LTI tests. Александр 2013-12-03 19:04:21 +02:00
  • c4515faedf Make has_score to be XField insted of decriptor property. Александр 2013-12-03 17:48:27 +02:00
  • e4403815e7 Fix LTI max_score method. polesye 2013-12-03 12:50:16 +02:00
  • 6baf195a4a Removed unused rake tasks David Baumgold 2013-12-04 15:37:18 -05:00
  • e26fc08d2b Update logging.getLogger() calls to use edx instead of mitx David Baumgold 2013-12-02 14:28:00 -05:00
  • bbcd8affa9 Merge pull request #1839 from edx/db/mitx-root-url David Baumgold 2013-12-04 12:17:13 -08:00
  • c7ac4100ff Merge pull request #1840 from edx/adam/db-error Ned Batchelder 2013-12-04 12:07:07 -08:00
  • f06f333b8a Added developer-specific settings to devstack Julia Hansbrough 2013-12-04 20:06:55 +00:00
  • 1f056c37f0 Merge pull request #1777 from edx/talbs/studio-fix-tos Brian Talbot 2013-12-04 11:50:09 -08:00
  • 19c6b8564d Merge pull request #1842 from edx/hotfix/error-msg-ORA-panel Ned Batchelder 2013-12-04 11:34:07 -08:00
  • 175e1aab9e adds more temporary error messages Adam Palay 2013-12-04 14:30:09 -05:00
  • 83c6a72051 Merge pull request #1841 from edx/hotfix/error-msg-ORA-panel Ned Batchelder 2013-12-04 11:12:55 -08:00
  • eb23b65992 add temporary error message for ORA panel Adam Palay 2013-12-04 13:03:12 -05:00
  • 838622f5bd Handle integrity errors when creating/retrieving AnonymousUserId entries Calen Pennington 2013-12-04 13:43:59 -05:00
  • 7171397d95 extend max_length of anonymous_user_id (LMS-1571) Adam Palay 2013-12-04 10:23:04 -05:00
  • 7b82de53a7 Merge pull request #1835 from edx/documentation/new_studio_doc/12-04-13 Mark Hoeber 2013-12-04 10:29:32 -08:00
  • e93e632017 Merge pull request #1825 from edx/ned/make-runone-work-with-more-test-output Ned Batchelder 2013-12-04 10:14:13 -08:00
  • b32f2bc170 MITX_ROOT_URL => EDX_ROOT_URL David Baumgold 2013-12-02 14:22:52 -05:00
  • 1a585a88a9 Merge pull request #1833 from edx/db/mitx_markdown-edx_markdown David Baumgold 2013-12-04 09:58:50 -08:00
  • d95b46dd19 Studio: adding back in links (and supporting styling) to ToS and Privacy Policy to footer and sign up UI STUD-151 Brian Talbot 2013-11-25 19:59:59 -05:00
  • 050031f7d5 Disable Peer Track Changes STUD-1008 Zubair Afzal 2013-12-04 16:43:17 +05:00
  • dd5ac4cf34 Change video transcripts to use locators instead of locations. cahrens 2013-11-26 15:02:25 -05:00
  • 5347923304 Merge pull request #1829 from zubair-arbi/zub/bugfix/std1008-disablepeertrackchanges zubair-arbi 2013-12-04 08:04:33 -08:00
  • c63dbe87ea Continued edits Mark Hoeber 2013-12-04 10:42:44 -05:00
  • c495fdd3ae Continued Editorial work Mark Hoeber 2013-12-03 14:44:30 -05:00
  • 7c7bfc658c adding images for ORA Mark Hoeber 2013-12-02 11:56:40 -05:00
  • 29b49ce10d Editorial updates Mark Hoeber 2013-12-02 11:55:22 -05:00
  • 89c2832e9e New Updated Studio Documentation Mark Hoeber 2013-11-27 11:03:35 -05:00
  • 6af8ecef03 mitx_markdown => edx_markdown David Baumgold 2013-12-02 12:20:48 -05:00
  • d1f3e3a6b5 Merge pull request #1827 from edx/db/remove-mitx-from-features David Baumgold 2013-12-04 07:13:19 -08:00
  • 2682a14d43 Merge pull request #1790 from edx/christina/transcripts Christina Roberts 2013-12-04 06:41:44 -08:00
  • 5dba3fb47a Disable Peer Track Changes STUD-1008 Zubair Afzal 2013-12-04 16:43:17 +05:00
  • 0426e51d06 Encode header row (LMS-197) Sarina Canelake 2013-12-02 16:44:34 -05:00
  • 79815acc6e Fall back on MITX_FEATURES env variable if FEATURES isn't found David Baumgold 2013-12-03 16:29:45 -05:00
  • f3f4af8087 settings.MITX_FEATURES => settings.FEATURES David Baumgold 2013-12-02 11:55:01 -05:00
  • 69899e24df Merge pull request #1823 from edx/db/mitxmako-edxmako David Baumgold 2013-12-03 11:36:50 -08:00
  • c812c5509a fix typo in ORA template (ORA-136) Adam Palay 2013-12-02 14:13:23 -05:00
  • e872c4f276 Merge pull request #1824 from edx/ned/show-full-diff-in-responsetype-tests Ned Batchelder 2013-12-03 11:34:19 -08:00
  • 842355293d Merge pull request #1816 from edx/ormsbee/grading_tests David Ormsbee 2013-12-03 11:24:00 -08:00
  • f10df353d2 Add basic tests of gradeset iteration. David Ormsbee 2013-12-02 16:07:56 -05:00
  • 8eff442752 mitxmako => edxmako David Baumgold 2013-12-02 11:37:07 -05:00
  • 149c3fd05f Make runone work with more test output. Ned Batchelder 2013-12-03 14:13:54 -05:00
  • 599bdbb102 Show full diffs in ResponseType tests. Ned Batchelder 2013-12-03 14:05:33 -05:00
  • c62abeddb7 Merge branch 'release' Ned Batchelder 2013-12-03 13:20:29 -05:00
  • e0f2ece2f2 Merge pull request #1820 from edx/anton/fix-lti-display-name polesye 2013-12-03 09:36:30 -08:00
  • 1cd9325ef5 Fix LTI tests. Александр 2013-12-03 19:04:21 +02:00
  • 932d13ede8 Make has_score to be XField insted of decriptor property. Александр 2013-12-03 17:48:27 +02:00
  • 41d82dfcc1 BLD-542: Add display name. polesye 2013-12-03 17:21:04 +02:00
  • 29e3a03db5 Merge pull request #1810 from edx/anton/fix-math-operations-in-numerical-input polesye 2013-12-03 07:18:54 -08:00
  • c8adbe3895 Merge pull request #1182 from carsongee/add_mitx_ssl_bypass_signup brianhw 2013-12-03 07:03:43 -08:00
  • 2088a2159e Add min value. polesye 2013-12-03 13:41:51 +02:00
  • 8a180744ed Fix LTI max_score method. polesye 2013-12-03 12:50:16 +02:00
  • 78149d0ae4 Add comment. polesye 2013-12-03 09:08:44 +02:00
  • 62a25824df Merge pull request #1765 from edx/gprice/inline-discussion-a11y Greg Price 2013-12-02 15:12:19 -08:00
  • ddb2483367 Update the XBlock version. Ned Batchelder 2013-12-02 15:48:05 -05:00
  • 7fa7641c0a Merge pull request #1799 from edx/dhm/bug-1003 Don Mitchell 2013-12-02 12:42:51 -08:00
  • 9dc68b03a0 Improve auth handling of Locators Ensure user admin screen gets the union of all possibly matching group names. Smarter default group naming. STUD-1003 Don Mitchell 2013-11-27 10:01:10 -05:00
  • 8f01387178 BLD-525: Fix Numerical input to support mathematical operations. polesye 2013-12-02 10:25:43 +02:00
  • 45d373c278 Merge pull request #1798 from edx/anton/calculator-hint-a11y polesye 2013-12-02 01:47:09 -08:00
  • 0dbb7603fb BLD-533: Improve calculator's tooltip accessibility. polesye 2013-11-25 11:15:56 +02:00
  • ef528494ab Merge pull request #1797 from edx/valera/enable_acceptance_video Valera Rozuvan 2013-11-29 01:23:15 -08:00
  • d75b580f8f Enabled back turned off Video acceptance tests. Valera Rozuvan 2013-11-27 13:17:00 +02:00
  • 39b29dcb65 Merge pull request #1802 from edx/ned/merge-master-to-rc-2013-11-21-again Ned Batchelder 2013-11-27 10:18:01 -08:00
  • c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 Ned Batchelder 2013-11-27 11:55:44 -05:00
  • 3e3a57f5cd Merge pull request #1774 from edx/flowerhack/refund-requested-date Julia Hansbrough 2013-11-27 07:35:23 -08:00
  • 30cd57f539 New migrations file Julia Hansbrough 2013-11-27 15:16:25 +00:00
  • 280e3c3856 Merge conflicts Julia Hansbrough 2013-11-27 14:43:16 +00:00
  • 006b8f8298 Removed old migration vagrant 2013-11-27 14:38:59 +00:00
  • bb3917fa1d Merge pull request #1299 from edx/zoldak/remove-pearson-code Jay Zoldak 2013-11-27 04:35:30 -08:00
  • 6dac4b79d3 Merge pull request #1791 from cpennington/rebased-lti-graded Ned Batchelder 2013-11-26 14:07:55 -08:00
  • 6614d7e9bb Add migration to remove pearson tables Jay Zoldak 2013-11-26 16:52:06 -05:00
  • a56b9457a0 Rebase to re-prepare PR Jay Zoldak 2013-11-25 15:01:27 -05:00
  • 341875bb18 Remove code related to Pearson Testing Centers Jay Zoldak 2013-10-10 10:26:48 -04:00
  • 5fdfc60957 Change video transcripts to use locators instead of locations. cahrens 2013-11-26 15:02:25 -05:00
  • 11bbf4c182 Add grading functionality to LTI xmodule Calen Pennington 2013-11-26 15:47:35 -05:00
  • 52ab2b1313 Make FieldDataCache use the user from scope_ids, rather than its pre-configured user Calen Pennington 2013-11-26 15:44:09 -05:00
  • 1205173d6f Add a per-course anonymous student id Calen Pennington 2013-11-26 15:18:24 -05:00
  • 9b6edea406 Rename the LTIModuleDescriptor to LTIDescriptor to follow convention Calen Pennington 2013-11-26 14:19:23 -05:00
  • 6d613f9d4e Enable un-authenticated handler urls Calen Pennington 2013-11-26 14:09:50 -05:00
  • f94565d699 Merge pull request #1685 from edx/jbau/shopping-cart/report Jason Bau 2013-11-26 11:45:59 -08:00
  • 81798dd8be Improve accessibility of inline discussions Greg Price 2013-11-22 17:50:39 -05:00
  • a0fa9d0b14 Refactor keypress activation for forum buttons Greg Price 2013-11-22 17:48:29 -05:00
  • 3ed96f75a1 Merge pull request #1788 from edx/will/disable-caption-test-2 Will Daly 2013-11-26 11:09:28 -08:00
  • 761699bf74 Disabled another video test that failed in master Will Daly 2013-11-26 14:01:58 -05:00
  • 812c8210da Merge pull request #1778 from edx/talbs/studio-fix-italics Brian Talbot 2013-11-26 09:59:56 -08:00
  • bff94de284 Studio: adding basic italicize text styling into xmodule/block preview UI STUD-963 Brian Talbot 2013-11-25 20:33:01 -05:00
  • 5a5c8c0eb5 Merge pull request #1779 from edx/talbs/fix-studio-notificationsie Brian Talbot 2013-11-26 09:09:17 -08:00
  • 88ccf85d42 Merge pull request #1786 from edx/will/disable-caption-test Will Daly 2013-11-26 09:08:51 -08:00
  • d00e5a4503 Disabled video caption tests that failed in master Will Daly 2013-11-26 12:07:04 -05:00
  • 957175e3da Merge pull request #1773 from edx/andy/unitidentifier Andy Armstrong 2013-11-26 08:23:27 -08:00
  • 38fba2481c Merge pull request #1754 from edx/dhm/restful_settings Don Mitchell 2013-11-26 07:39:39 -08:00
  • 389df17320 Merge pull request #1748 from puntxo/patch-1 David Baumgold 2013-11-26 07:28:04 -08:00