Commit Graph

  • 293f62a740 Added changes for AN-609 Alison Hodges 2014-03-05 11:25:32 -05:00
  • d821ac77f3 Merge pull request #2737 from edx/dcadams/fix_tinymce David Adams 2014-03-05 13:20:37 -08:00
  • 6689b3f4e4 Merge pull request #2826 from edx/ahodges/documentation.imageconversion Alison Hodges 2014-03-05 15:52:25 -05:00
  • 4ec669c855 Slightly reorder the toolbar buttons so that the image button is more likely to be visible. cahrens 2014-03-05 15:44:51 -05:00
  • 68d4248a0e Converted 104 existing gif files to png format Alison Hodges 2014-03-05 15:24:33 -05:00
  • e915a32aed xblock save only affects draft Don Mitchell 2014-03-05 09:40:28 -05:00
  • 41f5159b37 Test special code paths in create_item Don Mitchell 2014-03-04 12:55:19 -05:00
  • 71ac844120 Add tests for get_orphans Don Mitchell 2014-03-04 11:50:59 -05:00
  • e972b23064 Requesting an xmodule field in wrong app context raises exception rather than assertion Don Mitchell 2014-03-04 09:34:37 -05:00
  • 563b713a3f Test exception on read-only db Don Mitchell 2014-03-04 09:23:51 -05:00
  • aecc037e2d pylint and pep8 fixes Don Mitchell 2014-03-03 16:52:38 -05:00
  • fc1ca7b3a2 No longer create loc maps on create_(item|course) Don Mitchell 2014-03-03 13:16:12 -05:00
  • dcc6f54409 Change get_courses default branch to draft. We need to figure out how apps configure what default they want or ensure they get the one they want Don Mitchell 2014-03-03 13:15:48 -05:00
  • aab5e0441b Mixed modulestore handles most modulestore functions, cont. Don Mitchell 2014-02-28 15:32:01 -05:00
  • 371ecb08e8 Better sorting of stores for get_courses May apply to all store ordering Don Mitchell 2014-02-27 17:11:05 -05:00
  • 43df25d42b Point to prefer_xmodules new locn Don Mitchell 2014-02-27 10:23:17 -05:00
  • f371c4f5ae Pass user id to update_item Don Mitchell 2014-02-26 16:42:20 -05:00
  • c9285de433 unicode correctly and understandably Don Mitchell 2014-02-26 16:37:39 -05:00
  • ca0dd8390f Mixed no longer translates Don Mitchell 2014-02-24 11:36:34 -05:00
  • d2c147bfc4 Merge pull request #2824 from cpennington/rc-ab-tests Han Su Kim 2014-03-05 14:38:10 -05:00
  • 432249e9cf making mixed ms capable of front ending all modulestores for most operations including CRUD STUD-600 Don Mitchell 2014-02-19 12:06:44 -05:00
  • d45251164e Fixes tinymce bug: On using the image plugin, the image was not appearing in the visual editor immediately after using the command. David Adams 2014-02-26 11:26:34 -08:00
  • cc8594acd2 Merge pull request #2807 from edx/christina/containers Christina Roberts 2014-03-05 13:57:34 -05:00
  • bce7d9e43d Add tests and clean up A/B testing Diana Huang 2014-03-01 14:15:56 -05:00
  • 2d5c37b2a0 Track renders of split_test children Calen Pennington 2014-02-28 13:13:09 -05:00
  • d101933617 Add course tags to all events where a course-id can be extracted from the url Calen Pennington 2014-02-28 12:06:37 -05:00
  • 281ad63d2b split testing support in the LMS. Victor Shnayder 2013-12-31 10:44:34 -05:00
  • 653df428f1 Improve code clarity. cahrens 2014-03-05 12:59:09 -05:00
  • 9b2a78b12d Increase max-width for breadcrumb trail. cahrens 2014-03-05 12:06:37 -05:00
  • efe3833a30 Use display_name_with_default instead of display_name. cahrens 2014-03-05 12:01:24 -05:00
  • 72e876fe40 Prevent reflected XSS in instructor dashboard. Dave St.Germain 2014-03-03 13:56:25 -05:00
  • cd42c91726 Merge pull request #2818 from edx/alex/allow_html_in_grader_msg Han Su Kim 2014-03-05 11:25:31 -05:00
  • 5e14d045b6 Merge pull request #2814 from gsehub/xblock-mentoring Han Su Kim 2014-03-05 11:22:05 -05:00
  • 0864d57588 Activate XBlocks by default in LMS & Studio Xavier Antoviaque 2014-03-05 10:38:32 -04:00
  • 3856257e80 xblock-mentoring: Add repository to requirements & installed apps Xavier Antoviaque 2014-03-02 07:16:27 -04:00
  • edafb7c09a Merge pull request #2800 from edx/ahodges/documentation/reformatevents Mark Hoeber 2014-03-05 11:04:55 -05:00
  • cefb47669a Reformatted event type info to get it out of wide tables Alison Hodges 2014-03-03 17:07:31 -05:00
  • c7785d8f54 Allow HTML in grader messages. Alexander Kryklia 2014-02-24 15:19:31 +02:00
  • b0a4cc7aaf Merge pull request #2817 from edx/jarv/update-js-draw-commit Han Su Kim 2014-03-05 10:23:15 -05:00
  • 955950164a updating commit John Jarvis 2014-03-04 09:04:51 -05:00
  • ad714a1435 Merge pull request #2517 from ionis-education-group/remove-video-autoplay Jay Zoldak 2014-03-05 10:19:52 -05:00
  • 6772faa0a5 Merge pull request #2796 from edx/alex/no_default_subs_en Alexander Kryklia 2014-03-05 16:49:54 +02:00
  • f5eb5286a2 Merge pull request #2802 from ionis-education-group/gender-education-translation Ned Batchelder 2014-03-05 07:35:54 -05:00
  • 0dbabc7ad8 Support xblocks with children on the container page. cahrens 2014-03-04 12:52:43 -05:00
  • 40fbbdf1e4 Merge pull request #2804 from edx/jarv/update-jsdraw-commit John Jarvis 2014-03-04 16:49:38 -05:00
  • 469bf774b0 Merge pull request #2809 from edx/zoldak/bok-choy-coverage Jay Zoldak 2014-03-04 16:42:36 -05:00
  • 810883c1ef Create coverage reports for bok choy tests in Jenkins Jay Zoldak 2014-03-04 15:36:03 -05:00
  • 8e4b924bfc Merge pull request #2806 from edx/frances/fix/lms-modal-button Han Su Kim 2014-03-04 11:07:00 -05:00
  • 5ddab10065 Merge pull request #2805 from edx/gprice/comment-edit-button-key-activation Han Su Kim 2014-03-04 11:06:44 -05:00
  • 68a679b351 making LMS modal buttons more flexible to handle longer strings in translation, eg. French Frances Botsford 2014-03-04 10:58:39 -05:00
  • b4caf75cbb Make forum comment buttons activate by keyboard Greg Price 2014-03-03 17:56:07 -05:00
  • 10688f99f4 Add translator comments for 'other' and 'none' strings Bertrand Marron 2014-03-04 16:40:16 +01:00
  • 92411bd291 Merge pull request #2754 from edx/dcs/a11y-shorter-titles Dave St.Germain 2014-03-04 10:05:52 -05:00
  • 4099fc9af0 Correct misaligned django-cas integration Carson Gee 2014-02-24 13:18:22 -05:00
  • 04ff0b4fe2 updating commit John Jarvis 2014-03-04 09:04:51 -05:00
  • ccb776e928 Catch exception if for en no default subs is uploaded. Alexander Kryklia 2014-03-03 19:02:59 +02:00
  • a6d0c78d3f Merge pull request #2785 from edx/will/studio-oa-validation-fix Will Daly 2014-03-04 08:00:42 -05:00
  • 6cb458b46a Translate gender and education level from user profile Bertrand Marron 2014-03-04 11:22:32 +01:00
  • 601b5a8ceb Merge pull request #2518 from edx/dcs/a11y-code-grader Dave St.Germain 2014-03-03 17:57:46 -05:00
  • 1d2175dce0 Merge pull request #2774 from edx/gprice/edit-forum-comment-bok-choy Greg Price 2014-03-03 15:37:05 -05:00
  • 35a3ebd92f Merge pull request #2761 from edx/jbau/add-userid-to-FieldDataCache Jason Bau 2014-03-03 12:08:09 -08:00
  • db8ad0d20b Add bok choy tests for forum comment editing Greg Price 2014-02-28 15:41:25 -05:00
  • 61bf75bb16 Merge pull request #2788 from edx/sylvia/documentation/DOC-65 Mark Hoeber 2014-03-03 14:26:10 -05:00
  • 42f4f948c3 Corrected info about angle brackets in labels Sylvia Pearce 2014-03-03 10:13:37 -05:00
  • b44d902594 Merge pull request #2787 from edx/markhoeber/documentation/stud-1332 Mark Hoeber 2014-03-03 13:24:43 -05:00
  • bb3bcf0337 Merge pull request #2783 from edx/sarina/remove-assert-from-validate Sarina Canelake 2014-03-03 12:51:55 -05:00
  • c0caca74a7 Merge pull request #2784 from edx/usman/lms2205-progress-page-inconsistency Usman Khalid 2014-03-03 22:16:08 +05:00
  • 9360760376 Merge pull request #2794 from edx/marco/bug-fix/html-xmodule marcotuts 2014-03-03 11:43:52 -05:00
  • 17e95f184a bug fix for HTML xmodule styling which caused first line of text to be cut off. STUD-1380 marco 2014-03-03 11:18:57 -05:00
  • 3802e8f539 Merge pull request #2779 from edx/sarina/embargo-logging Sarina Canelake 2014-03-03 10:59:37 -05:00
  • 030004bcef Merge pull request #2789 from edx/zoldak/fix-ora-test Jay Zoldak 2014-03-03 10:54:40 -05:00
  • 5f581958f8 Merge pull request #2790 from edx/sarina/030314-language-update Sarina Canelake 2014-03-03 10:27:33 -05:00
  • 5fc53402ab Update translations (autogenerated message) Sarina Canelake 2014-03-03 10:25:39 -05:00
  • 975c3e612e Merge pull request #2760 from edx/marco/bulk-email/images marcotuts 2014-03-03 10:20:30 -05:00
  • 0a7ecea623 Merge pull request #2721 from rocha/rocha/add-answer-values Gabe Mulley 2014-03-03 10:19:23 -05:00
  • 82d48b5ab3 Import BrokenPromise Jay Zoldak 2014-03-03 10:16:04 -05:00
  • 60f2a25ee8 Edits from review Mark Hoeber 2014-03-03 10:13:38 -05:00
  • 25d4b93dec Removed all Push mode information Mark Hoeber 2014-03-03 09:45:11 -05:00
  • a1f3db772c Continue showing edit dialog until saving is complete to allow user to correct validation errors. Will Daly 2014-03-01 22:36:50 -05:00
  • 5e1751c346 Increases precision of percentages shown in 'Total' bar on the progress page. Usman Khalid 2014-03-03 18:57:28 +05:00
  • c74f30baa4 Remove assert stmt from i18n validate script Sarina Canelake 2014-03-03 09:02:29 -05:00
  • f74a0f4f55 Merge pull request #2782 from edx/sarina/030314-language-update Sarina Canelake 2014-03-02 22:38:09 -05:00
  • 341bc150fb Update translations (autogenerated message) Sarina Canelake 2014-03-02 22:34:06 -05:00
  • 94fea8e822 Add map to problem_check event with descriptions of student answers Gabe Mulley 2014-02-25 14:53:50 -05:00
  • f79cefe19a Add logging to embargo middleware Sarina Canelake 2014-03-02 18:27:18 -05:00
  • c4401fdc7f Merge pull request #2553 from edx/cdodge/microsite-cleanup chrisndodge 2014-02-28 17:38:19 -05:00
  • 52b8d0c0f0 Merge pull request #2346 from edx/dcadams/student_metrics_tab David Adams 2014-02-28 14:26:56 -08:00
  • 3881ffdc0d New tab (Metrics) in instructor dashboard Kristin Stephens 2013-08-02 14:41:42 -07:00
  • 9a23be5379 Merge pull request #2769 from edx/sylvia/documentation/STUD-1293 srpearce 2014-02-28 16:36:31 -05:00
  • aa43689a93 This PR addresses the open feedback on the Microsites feature Chris Dodge 2014-02-10 22:19:21 -05:00
  • 19707d2776 Edits to polls and problem randomization Sylvia Pearce 2014-02-28 16:18:11 -05:00
  • f400f1a6a3 Merge pull request #2773 from edx/release Adam 2014-02-28 16:03:11 -05:00
  • a5132493ff Merge pull request #2716 from edx/cdodge/prevent-clickjacking chrisndodge 2014-02-28 15:57:51 -05:00
  • 6d3c62b237 Merge pull request #2766 from edx/han/Vagrantfile Han Su Kim 2014-02-28 15:56:28 -05:00
  • 01971c6c2f adjusted color of russian social network image to be a lighter gray marco 2014-02-28 15:48:18 -05:00
  • aa2949f1ed Merge pull request #2772 from edx/ned/install-jsdraw Adam 2014-02-28 15:28:27 -05:00
  • 9bccb3e45c also delete two files associated with Vagrantfile in edx-platform Han Su Kim 2014-02-28 15:03:06 -05:00
  • fce30825df allow the prevention of the LMS/CMS from being renderable in an iframe Chris Dodge 2014-02-24 22:09:31 -05:00
  • a1dc347c1a Merge pull request #2767 from edx/dcs/a11y-forgot-a-label Dave St.Germain 2014-02-28 14:19:16 -05:00
  • 38916f8528 Merge pull request #2713 from edx/cdodge/add-auth-to-wiki chrisndodge 2014-02-28 14:15:59 -05:00