Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 06cc9e9598 Merge pull request #2886 from edx/marco/studio-editing-styles marcotuts 2014-03-10 16:42:53 -04:00
  • f50e58ad7f adjusted visual styling for editing state of xblocks, html, and video components which had extra padding applied to it from the container page xblock styling STUD-1410 marco 2014-03-10 16:22:32 -04:00
  • d21e68301e Merge pull request #2885 from cpennington/merge-release-2014-03-10 Calen Pennington 2014-03-10 16:22:21 -04:00
  • 31a070d480 Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10 Calen Pennington 2014-03-10 16:21:08 -04:00
  • 2f3d2ecac0 Fix undefined references to pytz David Baumgold 2014-03-10 16:19:10 -04:00
  • 603a97fa79 Merge pull request #2880 from edx/cale/fix-crazy-items-error Han Su Kim 2014-03-10 15:34:52 -04:00
  • 08ed1c5439 Merge pull request #2832 from edx/gprice/create-account-lang-pref Greg Price 2014-03-10 15:13:15 -04:00
  • fa29a35ab8 Save language preference on account creation Greg Price 2014-03-10 13:28:12 -04:00
  • a10d8d41d2 Merge pull request #2878 from edx/sarina/LMS-2302 Sarina Canelake 2014-03-10 12:51:17 -04:00
  • 0a79b30ec4 Delay import of xmodule packages until after sys.path fixup Calen Pennington 2014-03-07 09:24:09 -05:00
  • 760027bd2a Normalize the representation of Scope.content data in MongoModulestore FieldData Calen Pennington 2014-03-06 23:40:23 -05:00
  • 73f75f23bb Update import location of prefer_xmodules Xavier Antoviaque 2014-03-06 18:11:36 -04:00
  • c3ae0306f1 Only add mentoring application to INSTALLED_APPS when in virtualenv Xavier Antoviaque 2014-03-05 15:21:11 -04:00
  • cdfb5c0c07 Put language modal in alphabetical order LMS-2302 Sarina Canelake 2014-03-10 11:07:13 -04:00
  • 171650d253 Merge pull request #2870 from edx/bugfix/ichuang/capa-display-status ichuang 2014-03-10 10:47:47 -04:00
  • c543dbb695 Merge pull request #2869 from edx/bugfix/ichuang/textline-inline-for-jspre ichuang 2014-03-10 10:47:01 -04:00
  • 8824973759 Fixed module urls creation in legacy instructor dashboard. Usman Khalid 2014-03-10 19:22:57 +05:00
  • ede0916ab8 Merge pull request #2876 from edx/sarina/update-translations-031014 Sarina Canelake 2014-03-10 10:11:40 -04:00
  • 5e8f5611d7 Update translations (autogenerated message) Sarina Canelake 2014-03-10 10:10:08 -04:00
  • 26773ee172 Merge pull request #2873 from edx/sarina/update-dummy Sarina Canelake 2014-03-10 09:58:32 -04:00
  • cac669364f more robust capa math preprocessor test, and new test for inline ichuang 2014-03-10 13:51:02 +00:00
  • aaf4515ac3 remove old version of codemirror, to prevent confusion Dave St.Germain 2014-03-10 09:43:56 -04:00
  • a2bcf545e4 Update dummy Esperanto strings Sarina Canelake 2014-03-08 19:11:15 -05:00
  • 76de7f6055 Merge pull request #2855 from edx/anton/fix-fullscreen-in-flash jmclaus 2014-03-10 14:08:18 +01:00
  • 8d15acc962 Merge pull request #2559 from edx/usman/lms2136-wiki-access Usman Khalid 2014-03-10 17:13:40 +05:00
  • d335713da5 Export CourseDescriptor wiki_slug field to xml. Usman Khalid 2014-03-04 18:34:24 +05:00
  • 8f3cfa5a5f When creating a course in studio set a unique wiki_slug for it. Usman Khalid 2014-03-04 00:32:27 +05:00
  • 7b185db751 Refactored permissions check for course_wiki pages. Usman Khalid 2014-02-11 18:17:39 +05:00
  • 3c55c91c5a Added get_courses_for_wiki(self, wiki_slug) to mongo, xml and mixed modulestores. Usman Khalid 2014-02-18 15:14:56 +05:00
  • 98c66d9035 Added get_courses_for_wiki method. Don Mitchell 2014-02-12 15:59:58 -05:00
  • 07ed368505 BLD-905: Fix video resizing in Flash mode. polesye 2014-03-07 13:16:36 +02:00
  • 21db0bff78 Merge pull request #2871 from edx/sarina/idash-analytics-wording Sarina Canelake 2014-03-08 17:05:48 -05:00
  • 472d8f5f52 Minor changes to instructor Analytics tab Sarina Canelake 2014-03-08 08:51:36 -05:00
  • a35d524de2 fix text-input-dynamath_data test in test_input_templates.py ichuang 2014-03-08 03:12:40 +00:00
  • eb1cc23ca5 fix capa textline display to leave "inline" alone upon status change ichuang 2014-03-08 02:43:07 +00:00
  • 8d0db64f78 fix capa textline to properly use inline if specified when using js preprocessor ichuang 2014-03-08 01:00:40 +00:00
  • 2da9042cc6 Merge pull request #2863 from edx/sarina/violations Sarina Canelake 2014-03-07 17:27:05 -05:00
  • 2eaddefb3d Merge pull request #2866 from edx/release Han Su Kim 2014-03-07 15:15:57 -05:00
  • 1900f937fc Merge pull request #2868 from edx/sarina/idash-analytics-wording Sarina Canelake 2014-03-07 14:51:43 -05:00
  • 6be6ec4e79 Minor changes to instructor Analytics tab Sarina Canelake 2014-03-07 14:44:21 -05:00
  • f42d42d1f8 Merge branch 'master' into release Han Su Kim 2014-03-07 14:39:09 -05:00
  • 13c076e628 Merge pull request #2736 from johncox-google/johncox/feature/auth Ned Batchelder 2014-03-07 14:28:41 -05:00
  • 680005592e Merge pull request #2864 from edx/cale/fix-crazy-items-error Han Su Kim 2014-03-07 14:23:24 -05:00
  • 9e88fb15c2 Merge pull request #2844 from edx/jmclaus/feature_download_transcript_button_with_options jmclaus 2014-03-07 19:51:18 +01:00
  • 3a740c0479 BLD-844: Add possibility to download transcripts in different formats. jmclaus 2014-02-25 09:38:24 +01:00
  • ae562f5e5b typo error in this file causing it to fail to install Han Su Kim 2014-03-07 12:25:07 -05:00
  • 87495891b6 Fix some simple pep8 and pylint violations Sarina Canelake 2014-03-07 11:51:59 -05:00
  • 6e94919561 Delay import of xmodule packages until after sys.path fixup Calen Pennington 2014-03-07 09:24:09 -05:00
  • 2c9585ea5d Merge pull request #2811 from edx/andya/container-unit-tests Andy Armstrong 2014-03-07 11:31:41 -05:00
  • 5f2de7653f Normalize the representation of Scope.content data in MongoModulestore FieldData Calen Pennington 2014-03-06 23:40:23 -05:00
  • 81cfb6c3bd Update import location of prefer_xmodules Xavier Antoviaque 2014-03-06 18:11:36 -04:00
  • bde9513539 Only add mentoring application to INSTALLED_APPS when in virtualenv Xavier Antoviaque 2014-03-05 15:21:11 -04:00
  • 9ef1fe0153 Merge pull request #2860 from edx/sarina/lms-2092 Sarina Canelake 2014-03-07 10:54:44 -05:00
  • e7bc771bb7 Update discussions documentation LMS-2092 Sarina Canelake 2014-03-07 10:22:45 -05:00
  • 502384b889 Rename "Forum" roles on inst dash LMS-2092 Sarina Canelake 2014-03-07 10:03:06 -05:00
  • b227c311b1 Merge pull request #2858 from edx/sarina/lms-2109 Sarina Canelake 2014-03-07 09:30:56 -05:00
  • 58eaaf29ff Merge pull request #2813 from edx/anton/fix-transcript-in-full-screen-mode Anton Stupak 2014-03-07 16:27:57 +02:00
  • 69e7b73e9d Adjust wording around grade reports LMS-2109 Sarina Canelake 2014-03-07 08:31:22 -05:00
  • fe8e6026a1 BLD-852: Fix video positioning in full view mode. polesye 2014-02-27 17:50:17 +02:00
  • c34fef6c72 Merge pull request #2850 from edx/sarina/lms-1548 Sarina Canelake 2014-03-07 08:10:38 -05:00
  • b292f6c276 Merge pull request #2792 from edx/anton/fix-cc-button Anton Stupak 2014-03-07 12:55:02 +02:00
  • 65adb7b272 BLD-896: Fix cc button in HTML5 videos. polesye 2014-03-03 09:04:44 +02:00
  • 8ecfa8679a Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names. John Cox 2014-02-19 14:54:09 -08:00
  • 4121df4788 Fix "Course started?" display on beta dash LMS-1548 Sarina Canelake 2014-03-06 18:55:54 -05:00
  • 78fe797e14 Merge pull request #2846 from edx/sarina/fix-splittest-quality Sarina Canelake 2014-03-06 19:48:19 -05:00
  • 29be1288ba Clean up quality violations in split_test module Sarina Canelake 2014-03-06 09:44:54 -05:00
  • bf754c867b Merge pull request #2848 from antoviaque/xblock-mentoring-optionalapp-fix Han Su Kim 2014-03-06 18:26:11 -05:00
  • 76ae57c7ec Update import location of prefer_xmodules Xavier Antoviaque 2014-03-06 18:11:36 -04:00
  • b3ac3b6f4d Merge pull request #2283 from carsongee/cg/feature/git_branch_import Carson Gee 2014-03-06 17:38:34 -05:00
  • b67b89e562 Fixed bug of checking out the same branch multiple times and code review fixes Translator comments and language fixes Carson Gee 2014-02-20 11:45:13 -05:00
  • 62628f6bd2 Only add mentoring application to INSTALLED_APPS when in virtualenv Xavier Antoviaque 2014-03-05 15:21:11 -04:00
  • d754791213 Make course_id a required arg to split.create_course and remove attempt to make it unique. Instead raise exception on dupe. STUD-1359 Don Mitchell 2014-03-06 17:21:10 -05:00
  • 0db4a899f4 Merge branch 'release' Han Su Kim 2014-03-06 16:57:06 -05:00
  • bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved Han Su Kim 2014-03-06 16:56:16 -05:00
  • 9d55c88c76 Add option for importing a course from a named branch of a git repo Carson Gee 2014-01-23 13:17:50 -05:00
  • b0af8ff421 Merge pull request #2702 from carsongee/cg/cas_fixes Carson Gee 2014-03-06 16:17:13 -05:00
  • 07cec31887 Add Han Su Kim to AUTHORS Ned Batchelder 2014-03-06 15:20:36 -05:00
  • 166748a340 Fix Paul-Olivier Dehaye's AUTHOR entry. Ned Batchelder 2014-03-06 14:26:45 -05:00
  • 9425974b40 Merge pull request #2837 from ionis-education-group/shopping-cart-unicode-fix Ned Batchelder 2014-03-06 14:16:53 -05:00
  • f89396fae8 Merge pull request #2799 from edx/markhoeber/documentation/release-notes-3-4-14 Mark Hoeber 2014-03-06 14:02:11 -05:00
  • 4db9d0c1a4 Merge pull request #2719 from edx/markhoeber/documentation/stud-1314 Mark Hoeber 2014-03-06 13:04:36 -05:00
  • dd19ac64e1 External URL change in Files & Upoads Mark Hoeber 2014-02-25 13:09:35 -05:00
  • 72f127de55 Release notes 3-3-14 Mark Hoeber 2014-03-03 15:51:11 -05:00
  • 028e6a013f Merge pull request #2835 from edx/dcadams/fix_class_dashboard_setting David Adams 2014-03-06 09:06:27 -08:00
  • 683f12ec70 Fix typo in transcripts_utils. Alexander Kryklia 2014-02-26 17:31:08 +02:00
  • efa8bd6755 Add method to clear mako template lookups Bertrand Marron 2014-03-06 17:04:51 +01:00
  • d1442e7b2a Merge pull request #2839 from edx/sarina/fix-rake-i18n Sarina Canelake 2014-03-06 10:30:07 -05:00
  • fbc76c5c48 i18n tests don't regenerate checked-in eo files Sarina Canelake 2014-03-06 08:58:09 -05:00
  • 06c0aa530a Merge pull request #2803 from edx/zub/bugfix/std1248-handoutlocmapp zubair-arbi 2014-03-06 16:43:15 +05:00
  • b4c8e63f9f Merge pull request #2744 from edx/valera/move_slider_and_vcr_to_start_time_2 Valera Rozuvan 2014-03-06 13:42:40 +02:00
  • c17cb38cd9 add location of handouts in loc_mapper STUD-1248 zubiar-arbi 2014-03-04 17:41:37 +05:00
  • 01def12de4 Merge pull request #2762 from edx/zub/bugfix/std1336-switcheditors zubair-arbi 2014-03-06 15:53:43 +05:00
  • 01c5cd5dc4 Fix unicode issue in shopping cart Bertrand Marron 2014-03-06 11:41:24 +01:00
  • b85130bb29 Show start time or starting position on slider and VCR. Valera Rozuvan 2014-02-26 15:13:22 +02:00
  • 84a70279f6 properly set tinymce editor startContent STUD-1336 zubiar-arbi 2014-02-28 18:21:31 +05:00
  • dcb169fb37 Moved CLASS_DASHBOARD setting into the FEATURES dict. David Adams 2014-03-05 15:47:23 -08:00
  • f484807419 make embargo template theme-able Sef Kloninger 2014-03-05 15:19:32 -08:00
  • bc12869a00 Add more tests for the container page Andy Armstrong 2014-03-04 17:32:03 -05:00
  • b44780812c Merge pull request #2738 from edx/dbarch/mixed_ms_router Don Mitchell 2014-03-05 17:17:07 -05:00
  • a5d9ed5b04 Merge pull request #2821 from edx/ahodges/documentation/problemcheck Alison Hodges 2014-03-05 16:36:19 -05:00