Commit Graph

  • 55b67e39bb Merge pull request #680 from edx/peterb/move-numpy-seterr Peter Baratta 2013-08-15 07:31:03 -07:00
  • 6f657c1124 Import to fix internationalization Vik Paruchuri 2013-08-15 10:30:16 -04:00
  • 80619da429 Review fixes Julian Arni 2013-08-15 10:21:32 -04:00
  • 5f3dd37f98 Move the silencing of numpy's warnings into test_calc.py Peter Baratta 2013-08-14 16:17:40 -04:00
  • 0db4c98782 Merge pull request #658 from edx/bugfix/ichuang/delete_course_group_not_exist chrisndodge 2013-08-15 04:57:43 -07:00
  • 8ba9497fd9 Merge pull request #675 from edx/anton/disable_0-25x_speed Valera Rozuvan 2013-08-14 19:46:58 -07:00
  • 501c089f41 capa optioninput template was missing msg output (needed for hints) ichuang 2013-08-14 21:51:40 -04:00
  • 3ed4198204 Contentstore views pylint fixes Julian Arni 2013-08-14 19:10:00 -04:00
  • c5d52b8b74 turn off i18n Adam Palay 2013-08-14 17:03:21 -04:00
  • bcb4ae0751 Merge pull request #683 from edx/adam/turn-off-i18n Adam 2013-08-14 14:10:26 -07:00
  • 4855fd5af4 turn off i18n Adam Palay 2013-08-14 17:03:21 -04:00
  • 6a1e88cf77 Merge pull request #681 from edx/sarina/hotfix/fix-combinedopenended Sarina Canelake 2013-08-14 13:53:52 -07:00
  • f438922a88 Fix error seen in combinedopenended modules Sarina Canelake 2013-08-14 16:28:46 -04:00
  • c65c9eb069 Merge pull request #657 from edx/zoldak/fix-i18n-enroll Jay Zoldak 2013-08-14 13:18:00 -07:00
  • cc86fb3f23 Merge pull request #676 from edx/diana/course-modes Diana Huang 2013-08-14 12:33:55 -07:00
  • 7d44379c99 Add admin site for CourseMode Diana Huang 2013-08-14 15:13:11 -04:00
  • 4c469cc414 Merge pull request #666 from edx/jarv/add-get-grades John Jarvis 2013-08-14 11:42:51 -07:00
  • 7dc7406d3c updating help for --course John Jarvis 2013-08-14 14:42:24 -04:00
  • 22b1ef3472 Initial migrations for course modes Diana Huang 2013-08-14 13:26:32 -04:00
  • 6c6ba54e84 Create Course Modes django app Diana Huang 2013-08-14 11:57:26 -04:00
  • c9807db308 styling of peer review interface for students along with minimal adjustments to the staff grading interface as well. added internationalization of peer grading strings. marco 2013-08-14 14:12:04 -04:00
  • 57a8063517 Merge pull request #651 from edx/ormsbee/enrollment_modes David Ormsbee 2013-08-14 10:45:27 -07:00
  • 3ce87583ab Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode. David Ormsbee 2013-08-12 09:20:13 -04:00
  • 6416a21aa5 Merge branch 'release' Jay Zoldak 2013-08-14 12:11:52 -04:00
  • 7b6dcbba05 Merge pull request #673 from edx/hotfix/adam/help-modal Jay Zoldak 2013-08-14 09:08:29 -07:00
  • b4df2c4d73 Add filter for playback rates. Anton Stupak 2013-08-14 18:10:33 +03:00
  • 72fdc414ca change FEEDBACK_SUBMISSION_EMAIL to @example.com in dev settings Adam Palay 2013-08-14 10:57:03 -04:00
  • 5fd09ca1ee add dummy FEEDBACK_SUBMISSION_EMAIL for debugging Adam Palay 2013-08-13 16:11:51 -04:00
  • 970f5f60d3 fix syntax error in help_modal Adam Palay 2013-08-13 12:53:39 -04:00
  • 6594401d2f if mktg, redirects faq to mktg. else, to '/help' Adam Palay 2013-08-01 14:54:50 -04:00
  • 13ef870b1b pylint/pep8 cleanup. cahrens 2013-08-14 09:54:30 -04:00
  • aed29cb01f Add get_instance method. cahrens 2013-08-14 09:50:00 -04:00
  • 70d5ec6ea4 Make it clear that get_course_for_item is only a helper method in mongo modulestore. cahrens 2013-08-14 09:04:58 -04:00
  • 642a4fa2f3 Merge pull request #659 from edx/valera/bugfix_tabbing_video_controls Valera Rozuvan 2013-08-14 02:01:31 -07:00
  • b583a4e793 Optimizing code. Caching an element selector. Valera Rozuvan 2013-08-14 11:56:13 +03:00
  • 99ae63777e Removed unnecessary tabindex = 0 from <a /> - they get it by default. Valera Rozuvan 2013-08-14 11:51:15 +03:00
  • 3b326c3072 Fixing spelling typos in comments. Valera Rozuvan 2013-08-14 11:48:59 +03:00
  • efac70e6b3 Adding documentation to the event handlers for volume and speed control. Valera Rozuvan 2013-08-13 16:06:05 +03:00
  • da3e21ceee Fixed tabbing backwards. Valera Rozuvan 2013-08-13 14:51:47 +03:00
  • 0a5d261fc4 For YouTube videos tabbing from Speeds to Volume closes Speeds dialog. Valera Rozuvan 2013-08-13 12:40:01 +03:00
  • 05539b1bbe Removed unnecessary tabindex -1 from Video template. Valera Rozuvan 2013-08-13 12:29:15 +03:00
  • 3a970d1490 restyled controls area for motion through multiple scored peer reviews marco 2013-08-13 20:56:53 -04:00
  • a2225aad01 Merge pull request #655 from rocha/cleanup-xmodule-test-imports Carlos Andrés Rocha 2013-08-13 14:48:26 -07:00
  • bc1ba63bc9 Merge pull request #669 from edx/zoldak/release-changelog Jay Zoldak 2013-08-13 14:13:07 -07:00
  • 3d83e836bd Merge branch 'release' Jay Zoldak 2013-08-13 17:10:12 -04:00
  • 9fb329609d Merge pull request #663 from edx/nate/anonymized_id_mapping Joe Blaylock 2013-08-13 13:56:14 -07:00
  • 575345ecb2 Merge pull request #668 from edx/fix/adam/lms-help-button Adam 2013-08-13 13:54:22 -07:00
  • 172d415929 add dummy FEEDBACK_SUBMISSION_EMAIL for debugging Adam Palay 2013-08-13 16:11:51 -04:00
  • 307d27db9a fix syntax error in help_modal Adam Palay 2013-08-13 12:53:39 -04:00
  • 4fc8aaab02 if mktg, redirects faq to mktg. else, to '/help' Adam Palay 2013-08-01 14:54:50 -04:00
  • f8ef72cd5b added video changes to the changelog Lyla Fischer 2013-08-13 15:38:11 -04:00
  • 5410e43694 Merge pull request #660 from edx/feature/msteele/enable-dev Miles Steele 2013-08-13 12:23:34 -07:00
  • e0aa46ab2d Make split mongo read-only API consistent with other modulestores. cahrens 2013-08-13 15:06:08 -04:00
  • ab81000665 visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins. marco 2013-08-13 14:42:34 -04:00
  • d6530fa633 Anonymized ID mapping fixups Joe Blaylock 2013-08-13 11:35:23 -07:00
  • e4994b15cd Add mgmt cmd to generate anonymized ID mapping Nate Hardison 2013-07-19 10:28:43 -07:00
  • e312344dfa Fix initial loading bug. Peter Baratta 2013-08-13 13:28:00 -04:00
  • d0a64f2c2a adding django-admin commands to dump grades to a csv file John Jarvis 2013-08-13 13:29:48 -04:00
  • cd838e2652 Merge pull request #644 from edx/fix/cdodge/remove-unused-import-code chrisndodge 2013-08-13 09:57:40 -07:00
  • 86c7e2c4db Merge pull request #648 from edx/zoldak/release-changelog Jay Zoldak 2013-08-13 09:01:56 -07:00
  • 8951ab7a66 Merge pull request #650 from edx/fix/adam/i18n-templates Adam 2013-08-13 08:39:46 -07:00
  • c913aeb077 Merge pull request #649 from edx/fix/adam/preview-enroll Adam 2013-08-13 08:34:42 -07:00
  • 5d8e07eb63 replace html strings wtih tokens in templates Adam Palay 2013-08-13 11:02:44 -04:00
  • eafd7138b7 add PLATFORM_NAME and BUGS_EMAIL to cms/envs/common Adam Palay 2013-08-13 10:35:06 -04:00
  • 5d4edc61a7 add settings.PLATFORM_NAME to password_reset_confirm context Adam Palay 2013-08-12 17:27:18 -04:00
  • 5ed8d557c2 put wiki templates back into Django templating Adam Palay 2013-08-12 15:50:34 -04:00
  • 39b829761a fix password reset templates Adam Palay 2013-08-12 10:08:02 -04:00
  • 5a7b72667e replace html strings wtih tokens in templates Adam Palay 2013-08-13 11:02:44 -04:00
  • 9ea2be5377 Merge pull request #643 from edx/peter-fogg/course-creation-validation Peter Fogg 2013-08-13 08:11:40 -07:00
  • 47ae2f6429 enable instructor dashboard in lms/envs/dev Miles Steele 2013-08-13 11:05:20 -04:00
  • 55ad55b9ca add PLATFORM_NAME and BUGS_EMAIL to cms/envs/common Adam Palay 2013-08-13 10:35:06 -04:00
  • f88de3920a Merge pull request #627 from edx/christina/restful-url Christina Roberts 2013-08-13 07:34:22 -07:00
  • 271e9076f0 Merge pull request #632 from rocha/ignore-invalid-youtube-ids Carlos Andrés Rocha 2013-08-13 06:21:44 -07:00
  • b3aa20db64 Correctly clear fields when cancelling course create. Peter Fogg 2013-08-12 17:18:29 -04:00
  • 03bcd19b8d catch error in delete_course management script when group does not exist ichuang 2013-08-13 08:46:21 -04:00
  • c09da60fe3 The enrollment_action value enroll should not be translated. Jay Zoldak 2013-08-13 08:43:09 -04:00
  • 64433db0bd add changelog entry Chris Dodge 2013-08-12 21:38:53 -04:00
  • 03449895f2 add studio changes Chris Dodge 2013-08-12 21:34:26 -04:00
  • 82ae9e775d Cleanup some xmodule tests imports and data directory location Carlos Andrés Rocha 2013-08-12 20:37:55 -04:00
  • 8a527d16a6 Fix error when there is an invalid YouTube property in a video module Carlos Andrés Rocha 2013-08-09 18:01:49 -04:00
  • f9ab433e26 add settings.PLATFORM_NAME to password_reset_confirm context Adam Palay 2013-08-12 17:27:18 -04:00
  • 18a979bb4d put wiki templates back into Django templating Adam Palay 2013-08-12 15:50:34 -04:00
  • c611470e97 Correct non-unique course validation; code cleanup; better error style. Peter Fogg 2013-08-12 16:28:04 -04:00
  • a5bb971c9b add static_asset_path metadata to course, and honor its use in link rewriting ichuang 2013-08-12 20:26:20 +00:00
  • 1b111b1d29 add ability to import course (into CMS / edge) without static content, and without rewriting static links. changes xml_importer.py and import.py ichuang 2013-08-12 20:00:46 +00:00
  • 13d54c0dd7 fix password reset templates Adam Palay 2013-08-12 10:08:02 -04:00
  • 83d12cd7bd add scroll to top on vertical view change Miles Steele 2013-08-06 14:38:44 -04:00
  • 57e1418274 Add an entry to the CHANGELOG for #512 Peter Baratta 2013-08-12 15:37:18 -04:00
  • 57d9ea3f65 add beta dash to changelog Miles Steele 2013-08-12 15:03:38 -04:00
  • a7568fbf43 Merge pull request #567 from edx/jkarni/fix/descriptorsystemruntime jkarni 2013-08-12 12:06:42 -07:00
  • 7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime Julian Arni 2013-08-12 15:04:49 -04:00
  • 25abce865f add changelog information on two features being deployed Chris Dodge 2013-08-12 14:39:59 -04:00
  • 91b23c406a Merge branch 'master' into jkarni/fix/descriptorsystemruntime Julian Arni 2013-08-12 15:00:26 -04:00
  • 6a3f0c141d Merge pull request #564 from edx/db/xblock-student-view David Baumgold 2013-08-12 11:55:40 -07:00
  • 98a47857b3 Allow version ID to appear after course ID. cahrens 2013-08-12 13:38:31 -04:00
  • 431eb8f4e7 remove 'preview' from urls in enrollment emails sent while previewing a course Adam Palay 2013-08-12 14:03:27 -04:00
  • 0db8ad28dc Merge pull request #640 from edx/adam/i18n-bug-fixes Adam 2013-08-12 11:16:22 -07:00
  • df38f80506 Merge pull request #638 from edx/will/coffee-too-many-files Will Daly 2013-08-12 11:14:23 -07:00
  • bb644bb6ae Merge pull request #645 from edx/fix/cdodge/add-tech-support-email-config chrisndodge 2013-08-12 11:10:53 -07:00
  • 7fd5a00c2c import default TECH_SUPPORT_EMAIL setting from LMS Chris Dodge 2013-08-12 14:07:03 -04:00