Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
3da841ea2b Pin codejail to a specific commit so it will get installed properly on deploying. 2013-05-06 17:16:35 -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
Arthur Barrett
45cca10fb9 remove debugging from default notes view 2013-05-06 17:01:35 -04:00
Arthur Barrett
0e1b3999e8 add limit and offset params to search endpoint 2013-05-06 17:01:17 -04:00
Steve Strassmann
0b0a4a7564 pull from master 2013-05-06 16:57:32 -04:00
Chris Dodge
5ba22ec89b fix another broken test 2013-05-06 16:56:37 -04:00
Chris Dodge
40e3410121 fix broken unit tests 2013-05-06 16:51:36 -04:00
Diana Huang
13d29b8e72 Fix indentation of settings dictionaries. 2013-05-06 16:49:10 -04:00
Chris Dodge
c20dd7d903 forgot to remove enough stuff from the django admin path 2013-05-06 16:40:25 -04:00
Jay Zoldak
2ffaea7ade Merge pull request #1949 from edx/fix/zoldak/modulestore-tests 
Fix tests that intermittently fail when run in concurrent jobs on jenkins.
 2013-05-06 13:32:27 -07:00
Chris Dodge
a92910db20 update lms to reflect where comment models.py is now in common 2013-05-06 16:23:32 -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
3858f1b706 update cms envs 2013-05-06 16:02:13 -04:00
Chris Dodge
30d266b430 seed forum permissions when creating new courses 2013-05-06 16:01:14 -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
Arthur Barrett
ceefdf0161 user must be authenticated to view notes tab 2013-05-06 15:52:32 -04:00
Ned Batchelder
8ad87a693b Merge pull request #1954 from edx/fix/will/md5-unicode-error 
Fix UnicodeEncodeError when generating cache keys
 2013-05-06 12:45:47 -07: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
Arthur Barrett
c5728fb036 fix undefined variable name error in mako template 2013-05-06 14:48:51 -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
Steve Strassmann
8e735b4deb Merge branch 'master' of https://github.com/edx/mitx into feature/straz/transifex 2013-05-06 14:06:12 -04:00
Steve Strassmann
bec2ca4086 cleanup headers of files pulled from transifex. 2013-05-06 14:05: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
203a958e68 Outline textareas in red on a form submission error 
This was previously done for input but not textarea.
 2013-05-06 13:35:52 -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
jarv
f18321cda2 Merge pull request #1919 from edx/feature/gprice/drupal-auto-enroll-on-registration 
Update course registration flow for non-modal registration and login
 2013-05-06 10:31:29 -07: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
John Jarvis
d69bbf272e using new template for "coming-soon" 2013-05-06 12:30: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
David Baumgold
8d7eb03577 Merge pull request #1930 from edx/fix-readme 
MOAR README
 2013-05-06 09:26:49 -07:00
John Jarvis
424d295686 syntax errors 2013-05-06 12:00:46 -04:00
John Jarvis
e852574a17 adding 404 handling for courses that do not exist 2013-05-06 11:54:09 -04:00
Ned Batchelder
e3de0dc847 A fuller unit test with a real 8.02x problem. 2013-05-06 11:39:22 -04:00
Ned Batchelder
7cb3987f94 Ugh, missing import. 2013-05-06 11:39:21 -04:00
Ned Batchelder
686eb64949 An example of how to set the CPU limit for codejail. 2013-05-06 11:39:21 -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
d8c22dbeb3 Add a Django setting for course allowed to run unsafe code. 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
7b26c50e32 Added instructions for clearing the cache before running tests 2013-05-06 11:39:20 -04:00