Commit Graph

  • 3e9d1b395e Merge pull request #3097 from edx/dcs/paver-reqs Dave St.Germain 2014-03-28 09:40:35 -04:00
  • 2561c0106e Merge pull request #3064 from edx/nimisha/studio-reorder-and-hide-tabs Nimisha Asthagiri 2014-03-28 06:55:54 -04:00
  • 1bd6792a08 Support for "View Live" on Pages page. Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS. Do not display empty collection tabs. Updated Changelog. Nimisha Asthagiri 2014-03-27 12:18:41 -04:00
  • 3b0f71482e Studio - revising markup, templates and styling for page editing UI: Brian Talbot 2014-03-26 15:29:35 -04:00
  • d865e9096e Add the ability to reorder Pages and hide the Wiki page. Nimisha Asthagiri 2014-03-25 12:54:27 -04:00
  • 6bcae9aa94 Merge pull request #3085 from edx/valera/make_youtube_mocked_server_serve_youtube_api Valera Rozuvan 2014-03-28 11:10:40 +02:00
  • 3f41aae9f7 Make YouTube mocked server serve YouTube API Valera Rozuvan 2014-03-27 03:05:53 +02:00
  • b35994f12e Merge pull request #3090 from edx/valera/update_youtube_stub_server_doc Valera Rozuvan 2014-03-28 09:15:35 +02:00
  • 59333915c6 Reduce false cache misses when evaluating prerequisites Dave St.Germain 2014-03-28 00:23:23 -04:00
  • d6052675da Support emitting analytical events from xblocks running in the LMS Gabe Mulley 2014-03-27 12:48:53 -04:00
  • 30f7f1cfa1 Merge pull request #3071 from edx/ahodges/documentation/bulkbeta Alison Hodges 2014-03-27 17:50:18 -04:00
  • 8e41323588 LMS-1287: Added section for batch add of beta testers Alison Hodges 2014-03-26 11:31:30 -04:00
  • a6bde7cc9e Fix broken test due to refactoring. Dave St.Germain 2014-03-27 16:44:07 -04:00
  • a820b3f7a8 Merge pull request #2793 from edx/dcs/mat-17 Dave St.Germain 2014-03-27 16:12:45 -04:00
  • 0501775d64 Add an option to prevent multiple logins of the same user. Dave St.Germain 2014-03-03 11:11:38 -05:00
  • f03a94b0f2 Update doc string for YouTube stub server. Valera Rozuvan 2014-03-27 20:18:13 +02:00
  • 6517b06708 Merge pull request #3092 from edx/valera/fix_tender Valera Rozuvan 2014-03-27 21:15:12 +02:00
  • e50fad6475 Fix failing tender. Valera Rozuvan 2014-03-27 20:36:08 +02:00
  • ba8faeadb4 Merge branch 'release' Carlos Andrés Rocha 2014-03-27 14:11:57 -04:00
  • 0e2e19e066 Update testing.md file. Valera Rozuvan 2014-03-27 20:01:56 +02:00
  • 012f3f14f4 Merge pull request #3082 from edx/db/rake-coffee-to-paver-skip-collect David Baumgold 2014-03-27 13:20:03 -04:00
  • fffe1c4ad1 Merge pull request #3069 from edx/markhoeber/documentation/doc-196 Mark Hoeber 2014-03-27 11:10:45 -04:00
  • a29485960d Update course_about.html Jason Zhu 2014-03-27 23:00:02 +08:00
  • ca63c67f8e Release notes 3/26/14 Mark Hoeber 2014-03-25 15:23:14 -04:00
  • 26f133904c Merge pull request #3083 from carsongee/cg/git_export_lazy_translation_fix Carson Gee 2014-03-26 23:24:52 -04:00
  • 2c03c63990 Properly get lazily translated exception message Carson Gee 2014-03-26 21:36:32 -04:00
  • 450592f0ba Skip collectstatic when falling through from rake assets:coffee David Baumgold 2014-03-26 21:09:20 -04:00
  • 97f30aaedf Merge pull request #3081 from edx/sef/paver-fix-devstack-theme David Baumgold 2014-03-26 19:49:38 -04:00
  • 6ed59014d5 fix paver theming on devstack (SERVICE_VARIANT support) Sef Kloninger 2014-03-26 16:28:54 -07:00
  • 7c5ff94e23 Merge pull request #3075 from edx/db/paver-find-theme-dir David Baumgold 2014-03-26 17:54:28 -04:00
  • 37c4cb360a Help paver find the theme directory David Baumgold 2014-03-26 15:14:17 -04:00
  • 5f9ef9a402 Concept added to Studio advanced components Piotr Mitros 2014-03-26 14:35:55 -04:00
  • 2e174f2aa7 Merge pull request #3070 from edx/adam/middleware Adam 2014-03-26 13:18:13 -04:00
  • 704024f8a5 Merge pull request #2928 from edx/markhoeber/documentation/stud-1347 Mark Hoeber 2014-03-26 14:24:03 -04:00
  • 2d452d8bb2 Merge pull request #3005 from singingwolfboy/db/paver David Baumgold 2014-03-26 13:41:05 -04:00
  • e394a19222 Merge pull request #3067 from edx/christina/revert_tinymce Christina Roberts 2014-03-26 13:14:37 -04:00
  • 8cbdfbafe2 Documentation for static page changes Mark Hoeber 2014-03-13 09:56:50 -04:00
  • c79ddd7322 Merge pull request #3048 from louyihua/master David Baumgold 2014-03-26 11:08:15 -04:00
  • 2c79c1fe2f Revert to older version of TinyMCE. cahrens 2014-03-26 11:01:06 -04:00
  • 0316f3b758 i18n: make emails in lms translatable louyihua 2014-03-25 13:58:49 +08:00
  • 2cb94d82d3 Merge pull request #3047 from edx/valera/add_ipdb_requiement Valera Rozuvan 2014-03-26 16:32:29 +02:00
  • 76e592634a Some more str->unicode fixes in instructor and courseware apps. Usman Khalid 2014-03-25 20:32:19 +05:00
  • 62fdf33c6f Merge pull request #2938 from edx/waheed/lms2167-show-submission-history-not-internationalized Waheed Ahmed 2014-03-26 18:31:41 +05:00
  • 674345931e Removing ipython from edx dependencies. Valera Rozuvan 2014-03-25 01:18:15 +02:00
  • de72759cf2 Merge pull request #3033 from edx/anton/fix-flaky-video-acceptance-tests Anton Stupak 2014-03-26 13:57:57 +02:00
  • a1c957ecd3 BLD-951: Fix flaky tests. polesye 2014-03-24 13:01:21 +02:00
  • 94af663683 Submission history view not internationalized. LMS-2167 Waheed Ahmed 2014-03-14 16:38:47 +05:00
  • 2c0636da8d Merge pull request #3055 from edx/jmclaus/feature_iframe_template jmclaus 2014-03-26 05:58:59 +01:00
  • 61752e69ff Added template for iFrames. [BLD-611] jmclaus 2014-03-25 09:45:44 +01:00
  • 2a3509f798 Merge pull request #3046 from edx/andya/fix-xblock-loading-in-studio Andy Armstrong 2014-03-25 17:25:57 -04:00
  • a37d2c1b93 Fix Studio's XBlock dependency loading issues Andy Armstrong 2014-03-24 19:19:17 -04:00
  • 4801b4b392 Merge pull request #3060 from edx/db/display-error-pages David Baumgold 2014-03-25 15:36:51 -04:00
  • f5f7b77d4e Display error page templates, for testing purposes David Baumgold 2014-03-25 14:55:12 -04:00
  • 64265ee58a Merge pull request #3032 from IONISx/feature-enable-mktg-site-is-missing David Baumgold 2014-03-25 13:22:28 -04:00
  • 65faf178eb Merge pull request #3057 from edx/pmitros/concept-xblock-prototype Piotr Mitros 2014-03-25 12:28:52 -04:00
  • 20805974cd Merge Piotr Mitros 2014-03-25 12:28:02 -04:00
  • 7323341a4b Changed str->unicode in common/djangoapps/utils/. Usman Khalid 2014-03-25 17:53:23 +05:00
  • 820924fd83 Insert *right* at the front David Baumgold 2014-03-20 14:31:52 -04:00
  • 1219bd757e Pull Paver requirements out into a separate file David Baumgold 2014-03-19 15:17:45 -04:00
  • 4fbfbf11ff write_stderr() function is unnecessary David Baumgold 2014-03-19 14:24:57 -04:00
  • e9b0cc713a from __future__ import print_function David Baumgold 2014-03-19 14:22:35 -04:00
  • 6f38ea438a Change if not args.skip_collect to if args.collect David Baumgold 2014-03-19 14:21:54 -04:00
  • 44dad41ede Switch from Rake to Paver Will Daly 2014-02-14 20:04:41 -05:00
  • 05a13aa0c3 Merge pull request #3056 from edx/sarina/032514-language-update Sarina Canelake 2014-03-25 11:22:11 -04:00
  • ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase Will Daly 2014-03-25 10:59:05 -04:00
  • bd4eb72e31 Concept XBlock prototype Piotr Mitros 2014-03-25 10:58:35 -04:00
  • 9c2a476dcb Update translations (autogenerated message) Sarina Canelake 2014-03-25 10:46:53 -04:00
  • 274224bf6c Merge pull request #3051 from louyihua/fix-cms-email-translation David Baumgold 2014-03-25 10:40:13 -04:00
  • bf7aef1bcf Convert CAPA inputtype statuses from strings to objects, in order to simplify css class management and internationalization of status strings (potentially) displayed to the user. Dave St.Germain 2014-03-20 11:59:53 -04:00
  • 440d9ddb89 Install edx-ora2 Support for displaying submissions API scores in Progress page. Will Daly 2014-03-13 08:49:13 -04:00
  • 963f568582 Merge pull request #2972 from mulby/gabe/clarify-answer-dist Gabe Mulley 2014-03-25 08:40:37 -04:00
  • 2a658ed8b5 i18n: Fix the chinese name of chinese language louyihua 2014-03-25 20:35:44 +08:00
  • b70b232205 i18n: Fix typo in studio's email louyihua 2014-03-25 16:51:24 +08:00
  • de15848e9b Merge pull request #2622 from edx/alex/fix_duplicate_code_in_transcripts_ajax Alexander Kryklia 2014-03-25 10:36:21 +02:00
  • 22205c35c8 Merge pull request #2985 from edx/zub/story/deletecoursefromlocmapper zubair-arbi 2014-03-25 12:44:04 +05:00
  • 3539c56f89 Added image tags to the whitelist for matlab Dave St.Germain 2014-03-24 14:53:21 -04:00
  • 3f31833178 Clean up references to answer distribution-like things Gabe Mulley 2014-03-18 13:34:16 -04:00
  • 62a2a6501d Added image tags to the whitelist for matlab Dave St.Germain 2014-03-24 14:53:21 -04:00
  • 8aaabd7461 Merge pull request #3041 from edx/adam/fix-data-download Adam 2014-03-24 14:43:58 -04:00
  • 93844b3ad1 Merge pull request #3025 from edx/dcs/fix-matlab-response Dave St.Germain 2014-03-24 13:54:36 -04:00
  • 5cb145054d Fixes BLD-948 by escaping messages from xqueue, preventing malformed html from getting onto the page. The client will then unescape the html and display it. Dave St.Germain 2014-03-21 15:54:22 -04:00
  • 2244ba5ef2 Merge pull request #3028 from edx/sarina/LMS-2262 Sarina Canelake 2014-03-24 13:24:01 -04:00
  • 4398443fe8 Merge pull request #3036 from edx/sarina/032414-language-update Sarina Canelake 2014-03-24 13:22:46 -04:00
  • 14ef43e961 Merge pull request #3039 from edx/valera/separate_youtube_urls Valera Rozuvan 2014-03-24 19:14:59 +02:00
  • 1c8eed853e Moved all YouTube related URLs to a separate namespace. Valera Rozuvan 2014-03-24 15:45:18 +00:00
  • 156b531293 Merge pull request #2732 from edx/alex/fix_typo Alexander Kryklia 2014-03-24 18:20:46 +02:00
  • 7da3819154 Update translations (autogenerated message) Sarina Canelake 2014-03-24 11:01:22 -04:00
  • 76a2ac9833 Add Malaysian, Catalan languages Sarina Canelake 2014-03-18 14:14:36 -04:00
  • c2ede18de5 More helpful UX in beta membership widget Sarina Canelake 2014-03-21 17:17:10 -04:00
  • f1c19d02d7 fix typo in data download tab (LMS-2441) Adam Palay 2014-03-24 11:59:55 -04:00
  • f3c23e89d5 Merge pull request #3027 from edx/andya/asset-loading-indicator Andy Armstrong 2014-03-24 11:53:38 -04:00
  • 664f78dcb1 Merge pull request #2657 from edx/christina/tinymce-upgrade Andy Armstrong 2014-03-24 11:53:17 -04:00
  • e55bca6bf1 Merge pull request #3023 from edx/db/unicode-server-error-page David Baumgold 2014-03-24 11:24:02 -04:00
  • c9e9f6e6d5 Remove duplicate code in transcripts_ajax. Alexander Kryklia 2014-02-18 16:48:31 +02:00
  • 0a6bb2734f Merge pull request #2934 from edx/ahodges/documentation/ABanalytics Alison Hodges 2014-03-24 11:10:12 -04:00
  • 0de52014d0 Updates for DOC-83, new SQL table and event types for A/B testing Alison Hodges 2014-03-13 15:35:00 -04:00
  • f92c337235 Add a loading indicator to the Files & Uploads page. Andy Armstrong 2014-03-21 17:13:00 -04:00
  • c8eaa53452 Fix typos. cahrens 2014-03-24 10:49:29 -04:00
  • 7b24172614 Update tests for minor UI changes. cahrens 2014-03-24 10:45:09 -04:00
  • 9d04a9270b remove course location from loc_mapper on delete zubiar-arbi 2014-03-19 17:09:21 +05:00