Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 5cd9641f24 Update peer grading comment Vik Paruchuri 2013-05-07 17:35:00 -04:00
• 530ac51c1c Add .error callback back in Vik Paruchuri 2013-05-07 17:33:34 -04:00
• eca155f99a Merge branch 'master' into feature/abarrett/lms-notes-app Arthur Barrett 2013-05-07 17:27:40 -04:00
• 0ed07779c8 kludged in the note tab panel so it can be turned on and off using the policy editor by adding "notes" to "advanced_modules." Arthur Barrett 2013-05-07 17:27:06 -04:00
• 50d8321bc5 Merge pull request #1975 from edx/fix/gprice/drupal-registration-button-text Greg Price 2013-05-07 14:21:48 -07:00
• 2648a19cc2 Fix check for use for single location Vik Paruchuri 2013-05-07 17:08:14 -04:00
• ab7795aaf6 Merge pull request #1972 from edx/fix/gprice/drupal-fix-course-link Greg Price 2013-05-07 13:59:23 -07:00
• e0d1eca6aa Delete two lines. without this, the xblock fields are never created in cases where the module is "fresh" (ie has no existing data) Vik Paruchuri 2013-05-07 16:56:08 -04:00
• 23eacdbea2 Fix registration button text Greg Price 2013-05-07 16:45:33 -04:00
• fe5fc448e6 Merge pull request #1948 from edx/feature/giulio/accessibility caesar2164 2013-05-07 13:41:04 -07:00
• 977d0d76c2 cleaning up styles to use list-input, field, group, label, input, tip, etc standards. also opted to try out initial pass at hierarchy splitting of css classes on items that repeat (li, for example) marco 2013-05-07 16:40:21 -04:00
• c6f63140a2 Hide the API key during logging. Diana Huang 2013-05-07 11:42:39 -04:00
• dadb0b6931 Fix courses link in LMS header when not logged in Greg Price 2013-05-07 16:35:08 -04:00
• 621f4c65fe Merge pull request #1971 from edx/jarv/new-mktg-url jarv 2013-05-07 13:19:10 -07:00
• 0b7af27b4b be more forgiving about the iframe url John Jarvis 2013-05-07 16:00:00 -04:00
• 91e2a39ec7 moving preventDefault() statements to the local script tag Giulio Gratta 2013-05-07 12:50:59 -07:00
• aaa383b8ca safe_key() now hashes the prefix/version as well, just in case these are configured to be too long in the settings. Will Daly 2013-05-07 15:48:51 -04:00
• 1398b55713 Comment touched modules Vik Paruchuri 2013-05-07 15:48:19 -04:00
• 9e03280f50 Make peer grading fields stringy and fix js to avoid strange error Vik Paruchuri 2013-05-07 15:33:15 -04:00
• f7f791ab69 Merge pull request #1963 from edx/feature/gprice/drupal-iframe-breakout Greg Price 2013-05-07 11:21:54 -07:00
• 87362aa887 Merge branch 'master' of github.com:edx/mitx into feature/giulio/accessibility Giulio Gratta 2013-05-07 11:21:44 -07:00
• f7719a60c7 changed offending javascript:void() hrefs on anchors to preventDefault() Giulio Gratta 2013-05-07 11:20:47 -07:00
• 129c02f0b2 forgot to remove stale comment Steve Strassmann 2013-05-07 14:12:58 -04:00
• cf8d6b8965 factor logging out of library calls Steve Strassmann 2013-05-07 14:10:59 -04:00
• 30e1dd6e8e Merge pull request #1966 from edx/diana/drupal/fix-lms-links Diana Huang 2013-05-07 10:56:06 -07:00
• 0ff4d1ca9f Merge pull request #1968 from edx/feature/gprice/drupal-course-redirects Greg Price 2013-05-07 10:34:35 -07:00
• 953af59b0d fixing some more LMS accessibility issues Giulio Gratta 2013-05-03 14:21:42 -07:00
• a266330b2d made signup form labels and close modal button accessible friendly and tweaked login form to match signup form Giulio Gratta 2013-05-02 12:02:29 -07:00
• 3eac9376dd made forgot password form close modal button accessible friendly Giulio Gratta 2013-05-02 11:18:56 -07:00
• 2dde742f38 made login form labels and close modal button accessible friendly Giulio Gratta 2013-05-02 10:45:26 -07:00
• 0ba0bb5b7a merge from master Steve Strassmann 2013-05-07 13:24:52 -04:00
• 4620f50fb1 addressed Cale's comments; switched to path.py paths Steve Strassmann 2013-05-07 13:24:38 -04:00
• 2947ce246f Better error handling for when marketing urls are missing from the settings. Diana Huang 2013-05-07 12:53:09 -04:00
• 93cbb2e422 Redirect from LMS courses page to marketing courses page Greg Price 2013-05-07 13:06:38 -04:00
• 258aebed20 Fix anonymoususer 500 error Vik Paruchuri 2013-05-07 12:58:49 -04:00
• ef27b8f787 Make register button for marketing site break out of iframe Greg Price 2013-05-07 12:41:33 -04:00
• 9e1c935b60 Merge branch 'master' into feature/christina/fields cahrens 2013-05-07 12:39:45 -04:00
• 729ca900e6 Merge pull request #1920 from edx/feature/christina/fields Christina Roberts 2013-05-07 09:38:34 -07:00
• cd4bec8750 merged master branch into feature/abarrett/lms-notes-app Arthur Barrett 2013-05-07 12:32:22 -04:00
• 6361280075 Merge pull request #1959 from edx/feature/gprice/drupal-register-button-fix Greg Price 2013-05-07 08:57:12 -07:00
• 3c747f0e6e consolidate the list of permissions Chris Dodge 2013-05-07 11:53:02 -04:00
• 2c67352606 Fix new view containing only register button to properly enroll Greg Price 2013-05-06 17:24:03 -04:00
• 81ecf0c5df add unit test to verify forum seeding occurs when creating new courses Chris Dodge 2013-05-07 11:18:15 -04:00
• 3fd8b6ff59 Merge pull request #1960 from edx/feature/gprice/drupal-reset-buttons Greg Price 2013-05-07 08:17:44 -07:00
• 7aa9a6cfa5 Merge pull request #1962 from edx/fix/btalbot/lms-mktgiframe Brian Talbot 2013-05-07 08:04:45 -07:00
• 9a01bb5e52 edx.org - adding back js-dependent register class to register button Brian Talbot 2013-05-07 11:02:02 -04:00
• 126c9f9f37 edx.org - further revision to iframe register button states: coming soon styling Brian Talbot 2013-05-07 11:00:21 -04:00
• 87fbfdce3f merge with master Steve Strassmann 2013-05-07 10:48:51 -04:00
• 3b84d77131 edx.org - resolved (in a dirty way) iframed buttons picking up style in IE and added in coming soon style treatment Brian Talbot 2013-05-07 10:25:41 -04:00
• 29a5d3b42e Merge pull request #1955 from edx/fix/zoldak/add-gitignores-xmodule-js Jay Zoldak 2013-05-07 06:09:54 -07:00
• d28c0b5f91 cleaned up styling, synced up partially to existing standards for forms, fonts, colors, etc; currently open select box issue on chrome marco 2013-05-07 08:59:28 -04:00
• ade6d4085d turn off notes js debugging Arthur Barrett 2013-05-06 19:35:41 -04:00
• 4070e019e4 modified the html static book to only enable annotator.js when notes are enabled for the course Arthur Barrett 2013-05-06 19:29:44 -04:00
• 91db1eed4c The new settings will only be read from .json files if aws.py handles them. Ned Batchelder 2013-05-06 18:06:08 -04:00
• 1b0b365fa6 Added unit tests for safe_key() to resolve bug 392. Updated safe_key() so that it: (a) avoids creating keys that are too long for memcache, and (b) handles unicode in keys, prefixes, and versions Will Daly 2013-05-06 17:08:46 -04:00
• 3da841ea2b Pin codejail to a specific commit so it will get installed properly on deploying. Ned Batchelder 2013-05-06 17:16:35 -04:00
• a081ba4bbb Merge pull request #1934 from edx/diana/drupal/fix-lms-links Diana Huang 2013-05-06 14:14:29 -07:00
• c2cd75469b Change the methodology to ignore .js files by default. Any .js files that are coded can be handled individually. Jay Zoldak 2013-05-06 16:48:37 -04:00
• 45cca10fb9 remove debugging from default notes view Arthur Barrett 2013-05-06 17:01:35 -04:00
• 0e1b3999e8 add limit and offset params to search endpoint Arthur Barrett 2013-05-06 17:01:17 -04:00
• 0b0a4a7564 pull from master Steve Strassmann 2013-05-06 16:57:32 -04:00
• 5ba22ec89b fix another broken test Chris Dodge 2013-05-06 16:56:37 -04:00
• 40e3410121 fix broken unit tests Chris Dodge 2013-05-06 16:51:36 -04:00
• 13d29b8e72 Fix indentation of settings dictionaries. Diana Huang 2013-05-06 16:49:10 -04:00
• c20dd7d903 forgot to remove enough stuff from the django admin path Chris Dodge 2013-05-06 16:40:25 -04:00
• 2ffaea7ade Merge pull request #1949 from edx/fix/zoldak/modulestore-tests Jay Zoldak 2013-05-06 13:32:27 -07:00
• a92910db20 update lms to reflect where comment models.py is now in common Chris Dodge 2013-05-06 16:23:32 -04:00
• ae9d13b53a update comment models.py to not have the dependency on get_course_by_id (which is in LMS). Also explicitly set the db_table name because django auto generates table prefixes according to the djangoapp name Chris Dodge 2013-05-06 16:04:25 -04:00
• 594d28a653 Pass default value through. cahrens 2013-05-06 16:03:41 -04:00
• 3858f1b706 update cms envs Chris Dodge 2013-05-06 16:02:13 -04:00
• 30d266b430 seed forum permissions when creating new courses Chris Dodge 2013-05-06 16:01:14 -04:00
• 57eca325d2 move some files from lms/djangoapps/django_comment_client to common/djangoapps/django_comment_common Chris Dodge 2013-05-06 15:59:35 -04:00
• ceefdf0161 user must be authenticated to view notes tab Arthur Barrett 2013-05-06 15:52:32 -04:00
• 8ad87a693b Merge pull request #1954 from edx/fix/will/md5-unicode-error Ned Batchelder 2013-05-06 12:45:47 -07:00
• 4f33b8e0c0 Fixed a UnicodeEncodeError that occurred when generating cache keys from non-ASCII unicode code submissions. Will Daly 2013-05-06 14:20:43 -04:00
• 6110b54ca8 Address code review feedback Diana Huang 2013-05-06 14:55:07 -04:00
• c5728fb036 fix undefined variable name error in mako template Arthur Barrett 2013-05-06 14:48:51 -04:00
• 522751e425 Ignore the js files that are compiled from coffeescript when running the xmodule jasmine tests Jay Zoldak 2013-05-06 14:28:05 -04:00
• 8e735b4deb Merge branch 'master' of https://github.com/edx/mitx into feature/straz/transifex Steve Strassmann 2013-05-06 14:06:12 -04:00
• bec2ca4086 cleanup headers of files pulled from transifex. Steve Strassmann 2013-05-06 14:05:05 -04:00
• ec3c8458e7 Merge pull request #1911 from edx/feature/gprice/feedback-button Greg Price 2013-05-06 11:03:41 -07:00
• 04e75485ba merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html. Arthur Barrett 2013-05-06 13:40:38 -04:00
• 203a958e68 Outline textareas in red on a form submission error Greg Price 2013-04-18 16:07:24 -04:00
• 00729a8c13 Add an omnipresent help tab to the LMS Greg Price 2013-04-24 12:06:48 -04:00
• 87072a9a58 Add an endpoint for submission of Zendesk tickets by end users Greg Price 2013-04-25 17:03:10 -04:00
• f18321cda2 Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration jarv 2013-05-06 10:31:29 -07:00
• a8ea201b6a Move the link map to the settings. Diana Huang 2013-05-06 12:55:42 -04:00
• 84ff2a0941 Merge branch 'master' into feature/christina/fields cahrens 2013-05-06 12:42:18 -04:00
• d69bbf272e using new template for "coming-soon" John Jarvis 2013-05-06 12:30:18 -04:00
• 66185423a2 Merge pull request #1945 from edx/feature/christina/computed_default Christina Roberts 2013-05-06 09:28:37 -07:00
• 8d7eb03577 Merge pull request #1930 from edx/fix-readme David Baumgold 2013-05-06 09:26:49 -07:00
• 424d295686 syntax errors John Jarvis 2013-05-06 12:00:46 -04:00
• e852574a17 adding 404 handling for courses that do not exist John Jarvis 2013-05-06 11:54:09 -04:00
• e3de0dc847 A fuller unit test with a real 8.02x problem. Ned Batchelder 2013-05-06 10:15:27 -04:00
• 7cb3987f94 Ugh, missing import. Ned Batchelder 2013-05-03 14:10:31 -04:00
• 686eb64949 An example of how to set the CPU limit for codejail. Ned Batchelder 2013-05-02 17:39:29 -04:00
• 403218ec6b If sandboxed code raises an exception, the exception will be cached. Ned Batchelder 2013-05-02 12:46:35 -04:00
• 001ef7b0fe Use only safe characters for the cache key Ned Batchelder 2013-05-02 11:42:06 -04:00
• d8c22dbeb3 Add a Django setting for course allowed to run unsafe code. Ned Batchelder 2013-05-02 11:21:38 -04:00
• d7ea1dafe8 On second thought, make can_execute_unsafe_code a function returning a boolean. Ned Batchelder 2013-05-02 10:58:38 -04:00