Arthur Barrett
2838dba199
fix pep8 violations
2013-05-09 15:12:22 -04:00
Arthur Barrett
244261f1cf
added more unit tests
2013-05-09 14:31:38 -04:00
Arthur Barrett
f1f65c563e
fix failing unit test in lms.envs.test env
2013-05-09 11:51:24 -04:00
Vik Paruchuri
fd46ebd1fa
Move some functions, make notification tests more robust
2013-05-08 19:04:07 -04:00
Arthur Barrett
c7197cd567
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-05-08 18:04:24 -04:00
Arthur Barrett
bf21211b25
adding some tests
2013-05-08 18:03:41 -04:00
dcadams
2ef3bcc92d
Commit just to get Jenkins to rerun.
2013-05-08 14:52:18 -07:00
dcadams
dcabac8edf
Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement
2013-05-08 14:48:29 -07:00
Arthur Barrett
1eb05cfd4e
remove unnecessary count
2013-05-08 15:07:36 -04:00
Arthur Barrett
0f70b0aa8a
refactored api resource map and added total to search query
2013-05-08 14:09:29 -04:00
Chris Dodge
d8d4111a99
Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master
2013-05-08 12:15:26 -04:00
Arthur Barrett
894cfd1f48
update doc strings in api
2013-05-07 18:45:40 -04:00
John Jarvis
0b7af27b4b
be more forgiving about the iframe url
...
If anything after mktg/ does not parse as a course-id return "coming soon"
This will prevent 404 errors when urls are incorrect on the marketing
site.
2013-05-07 16:00:00 -04:00
Vik Paruchuri
1398b55713
Comment touched modules
2013-05-07 15:48:19 -04:00
Greg Price
93cbb2e422
Redirect from LMS courses page to marketing courses page
...
(Only if marketing site is enabled)
2013-05-07 13:06:38 -04:00
Vik Paruchuri
258aebed20
Fix anonymoususer 500 error
2013-05-07 12:58:49 -04:00
Arthur Barrett
cd4bec8750
merged master branch into feature/abarrett/lms-notes-app
2013-05-07 12:32:22 -04:00
Arthur Barrett
4070e019e4
modified the html static book to only enable annotator.js when notes are enabled for the course
2013-05-06 19:29:44 -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
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
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
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
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
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
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
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
