David Baumgold
ec79ebd4a7
Updated Backbone.js and Underscore.js
...
Backbone 1.0.0, Underscore 1.4.4
2013-05-08 09:29:15 -04:00
Will Daly
b19c80ccb5
Merge pull request #1957 from edx/fix/will/bug_392
...
Added unit tests for safe_key() to resolve bug 392.
2013-05-08 06:23:49 -07:00
VikParuchuri
fb4685fe9a
Merge pull request #1976 from edx/vik/fix/oe-bugs
...
Vik/fix/oe bugs
2013-05-07 14:54:17 -07:00
Vik Paruchuri
5cd9641f24
Update peer grading comment
2013-05-07 17:35:00 -04:00
Vik Paruchuri
530ac51c1c
Add .error callback back in
2013-05-07 17:33:34 -04:00
Arthur Barrett
eca155f99a
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-07 17:27:40 -04:00
Vik Paruchuri
2648a19cc2
Fix check for use for single location
2013-05-07 17:08:14 -04:00
Vik Paruchuri
e0d1eca6aa
Delete two lines. without this, the xblock fields are never created in cases where the module is "fresh" (ie has no existing data)
2013-05-07 16:56:08 -04:00
Will Daly
aaa383b8ca
safe_key() now hashes the prefix/version as well, just in case
...
these are configured to be too long in the settings.
2013-05-07 15:48:51 -04:00
Vik Paruchuri
1398b55713
Comment touched modules
2013-05-07 15:48:19 -04:00
Vik Paruchuri
9e03280f50
Make peer grading fields stringy and fix js to avoid strange error
2013-05-07 15:33:15 -04:00
Diana Huang
2947ce246f
Better error handling for when marketing urls are missing from the settings.
2013-05-07 13:17:30 -04:00
cahrens
9e1c935b60
Merge branch 'master' into feature/christina/fields
2013-05-07 12:39:45 -04:00
Christina Roberts
729ca900e6
Merge pull request #1920 from edx/feature/christina/fields
...
Pass additional field information from editable_metadata_fields, remove system_metadata_fields variable.
2013-05-07 09:38:34 -07:00
Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Chris Dodge
3c747f0e6e
consolidate the list of permissions
2013-05-07 11:53:02 -04:00
Chris Dodge
81ecf0c5df
add unit test to verify forum seeding occurs when creating new courses
2013-05-07 11:18:15 -04:00
Will Daly
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
Added __init__.py, which should have been in the last commit
Pep8/Pylint fixes
2013-05-06 17:26:18 -04:00
Diana Huang
a081ba4bbb
Merge pull request #1934 from edx/diana/drupal/fix-lms-links
...
Fix links between marketing site and courseware.
2013-05-06 14:14:29 -07:00
Jay Zoldak
c2cd75469b
Change the methodology to ignore .js files by default. Any .js files that are coded can be handled individually.
2013-05-06 17:05:47 -04:00
Chris Dodge
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
2013-05-06 16:04:25 -04:00
cahrens
594d28a653
Pass default value through.
2013-05-06 16:03:41 -04:00
Chris Dodge
57eca325d2
move some files from lms/djangoapps/django_comment_client to common/djangoapps/django_comment_common
2013-05-06 15:59:35 -04:00
Will Daly
4f33b8e0c0
Fixed a UnicodeEncodeError that occurred when generating cache keys
...
from non-ASCII unicode code submissions.
2013-05-06 15:04:20 -04:00
Diana Huang
6110b54ca8
Address code review feedback
...
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
2013-05-06 14:56:06 -04:00
Jay Zoldak
522751e425
Ignore the js files that are compiled from coffeescript when running the xmodule jasmine tests
2013-05-06 14:28:05 -04:00
Greg Price
ec3c8458e7
Merge pull request #1911 from edx/feature/gprice/feedback-button
2013-05-06 11:03:41 -07:00
Arthur Barrett
04e75485ba
merged master branch into feature/abarrett/lms-notes-app. resolved conflicts in lms/envs/common.py and lms/templates/static_htmlbook.html.
2013-05-06 13:40:38 -04:00
Greg Price
00729a8c13
Add an omnipresent help tab to the LMS
...
The help tab opens a modal dialog that directs the user at various resources
(e.g. the site FAQ and course forums) and allows the user to submit feedback
to the feedback endpoint (which will ultimately create a ticket for the
student support team).
2013-05-06 13:35:52 -04:00
Greg Price
87072a9a58
Add an endpoint for submission of Zendesk tickets by end users
...
This functionality requires the Zendesk URL, user, and API key to be specified
in django.conf.settings. Also, add a flag to MITX_FEATURES (enabled by default)
to control the endpoint and the front-end feature (yet to be added).
2013-05-06 13:35:51 -04:00
Diana Huang
a8ea201b6a
Move the link map to the settings.
2013-05-06 12:55:42 -04:00
cahrens
84ff2a0941
Merge branch 'master' into feature/christina/fields
2013-05-06 12:42:18 -04:00
Christina Roberts
66185423a2
Merge pull request #1945 from edx/feature/christina/computed_default
...
Get rid of _computed_default.
2013-05-06 09:28:37 -07:00
Ned Batchelder
e3de0dc847
A fuller unit test with a real 8.02x problem.
2013-05-06 11:39:22 -04:00
Ned Batchelder
403218ec6b
If sandboxed code raises an exception, the exception will be cached.
2013-05-06 11:39:21 -04:00
Ned Batchelder
001ef7b0fe
Use only safe characters for the cache key
2013-05-06 11:39:21 -04:00
Ned Batchelder
d7ea1dafe8
On second thought, make can_execute_unsafe_code a function returning a boolean.
2013-05-06 11:39:21 -04:00
Ned Batchelder
f1fac732cf
A new boolean on XModuleSystem that determines whether to allow execution of untrusted unsandboxed code.
2013-05-06 11:39:21 -04:00
Ned Batchelder
f4d84e67e1
Build the XModuleSystem anew for each test so we can fiddle with it safely.
2013-05-06 11:39:21 -04:00
Ned Batchelder
0ba4b680f9
Minor fixes of test_system in xmodule tests
2013-05-06 11:39:21 -04:00
Ned Batchelder
477fe670dd
All re-randomization has to be bucketed to get a reasonable cache hit rate.
2013-05-06 11:39:20 -04:00
Will Daly
0b2aedb4fe
Added datadog monitoring of safe_exec() time
2013-05-06 11:39:20 -04:00
Ned Batchelder
baa6b4e3e4
The cache key for safe_exec has to be hashed to keep it a reasonable size.
2013-05-06 11:39:20 -04:00
Ned Batchelder
09fbbe7bfa
Codejail is in its own repo now.
2013-05-06 11:39:20 -04:00
Ned Batchelder
adde939831
Clarify some comments in tests.
2013-05-06 11:39:20 -04:00
Ned Batchelder
726e8db13e
Add more docs
2013-05-06 11:39:20 -04:00
Ned Batchelder
fb5343237a
jail_code can execute a provided file also.
2013-05-06 11:39:20 -04:00
Ned Batchelder
9683098f3d
Python should have -E, not sure of a clean way to do it, but this at least only applies it to python.
2013-05-06 11:39:20 -04:00
Ned Batchelder
bde976dad2
Refactor code_jail to accommodate non-Python code.
2013-05-06 11:39:19 -04:00
Ned Batchelder
55e910aafc
Not sure why my branch was ahead of master for the version of distribute. Make them the same.
2013-05-06 11:39:19 -04:00
