Commit Graph

17975 Commits

Author SHA1 Message Date
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
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
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
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
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
John Jarvis
d69bbf272e using new template for "coming-soon" 2013-05-06 12:30:18 -04: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
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
d8c22dbeb3 Add a Django setting for course allowed to run unsafe code. 2013-05-06 11:39:21 -04:00
Will Daly
7b26c50e32 Added instructions for clearing the cache before running tests 2013-05-06 11:39:20 -04:00
Will Daly
ac660ead3e Added load test of CustomResponse 2013-05-06 11:39:20 -04:00
Ned Batchelder
5e7d328e7f Use the Django cache for sandboxed code execution. 2013-05-06 11:39:19 -04:00
Ned Batchelder
ceb6cedaae Fix merge 2013-05-06 11:39:19 -04:00
Ned Batchelder
5acb225816 Print the full traceback when execution fails. 2013-05-06 11:39:17 -04:00
Ned Batchelder
839c568474 Hmm, turns out exec wants just one dict to properly simulate Python module execution. 2013-05-06 11:39:17 -04:00
Ned Batchelder
ec7a04fdb3 A /debug/run_python endpoint for staff to test the sandboxing of Python code. 2013-05-06 11:39:17 -04:00
Victor Shnayder
fe12c64523 Merge pull request #1951 from edx/victor/epfl-desc
update EPFL profile.  LH # 374
2013-05-06 08:34:48 -07:00
Victor Shnayder
06846d9187 update EPFL profile. LH # 374 2013-05-06 11:06:05 -04:00
Ned Batchelder
5d4b61c7f5 Better configuration for codejail. 2013-05-06 10:55:05 -04:00
Ned Batchelder
7c498be606 Move packages around so we can install packages into the sandbox. 2013-05-06 10:55:05 -04:00
Ned Batchelder
249ba4be33 Finish the test for computed_answer 2013-05-06 10:55:04 -04:00
Ned Batchelder
a6677aa0a8 Computed answers are run through safe_exec. 2013-05-06 10:55:04 -04:00
Ned Batchelder
6297d64528 Now these can be in the same test class 2013-05-06 10:55:04 -04:00
Ned Batchelder
ff1df569cb Refactor submitting problems so we don't need custom code for each test. 2013-05-06 10:55:04 -04:00
Ned Batchelder
33abe54e0d Work in progress to sandbox the uses of eval in LMS. 2013-05-06 10:55:03 -04:00
Ned Batchelder
9249bafd00 Add a test of a bad answer also. 2013-05-06 10:55:03 -04:00
Ned Batchelder
e69a073161 Add a test for the Python in schemaresponse, and refactor the tests while I was in there. 2013-05-06 10:55:03 -04:00
Ned Batchelder
9827a0e218 Oops, this line can go too. 2013-05-06 10:55:03 -04:00
Ned Batchelder
9cc43f1d9b Simplify this test setup. 2013-05-06 10:55:03 -04:00
jarv
bf5ac6c263 Merge pull request #1950 from edx/jarv/drupal-new/iframe
Jarv/drupal new/iframe
2013-05-06 07:46:28 -07:00
Jay Zoldak
8ef88fa5b0 Fix tests that randomly fail when run in concurrent jobs on jenkins. 2013-05-06 10:24:38 -04:00
David Baumgold
b344976fe7 Making linters happier 2013-05-03 15:08:28 -04:00
Diana Huang
c9a6fe18f0 Create new marketing_link function to abstract link generation
and use it for the new marketing site links.
2013-05-03 15:06:24 -04:00
Diana Huang
e4e6c0dd7b Add new URLS to MKTG_URLS. 2013-05-03 15:05:03 -04:00