Brian Wilson
bb7bc88847
merge out from master
2013-03-27 18:04:58 -04:00
Brian Wilson
99778b1b5b
add fixes for 500 bugs (lighthouse 287 and 293) by requiring login for accessing licenses and inline discussions. Add unit tests for licenses, and rearrange tests based off of (the former) PageLoad. Also cleanups for pylint and pep8.
2013-03-27 17:59:56 -04:00
Will Daly
9c671163fd
Added exc_info=True to log.warning
...
Changed log.exception to log.warning
2013-03-27 17:11:02 -04:00
Will Daly
df1be87739
* Changed 404 errors to 400 errors
...
* Removed duplicate traceback log message
* Now provide string, not Exception, as second tuple item to raise
2013-03-27 15:20:40 -04:00
Will Daly
ac86687fa1
Added exception handling that solves SchematicResponse exceptions
...
causing a 500 error.
When XModule raises a ProcessingError during an AJAX request,
this module_render now returns a 404 to further reduce number of 500
responses.
2013-03-27 14:33:59 -04:00
Victor Shnayder
b0356e32b2
Merge pull request #1589 from MITx/peter/symbolic
...
Added support for superscripts in variables
2013-03-27 10:40:50 -07:00
Will Daly
cddc868656
Login URL resolves differently in LMS and CMS, which breaks login_test
...
when loaded by rake test_cms
I moved the test into lms/courseware/tests so they run correctly.
2013-03-27 13:01:10 -04:00
brianhw
a04881ceda
Merge pull request #1740 from MITx/fix/vik/peer-image-grading
...
Fix/vik/peer image grading
2013-03-27 09:06:54 -07:00
Victor Shnayder
2cf815ae01
Merge pull request #1750 from MITx/fix/cale/anonymous-modx-dispatch
...
Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes...
2013-03-27 07:13:05 -07:00
Calen Pennington
521843876e
Make the django_comment_client return errors that can't be parsed as JSON just as simple strings when in an ajax context
2013-03-27 08:10:25 -04:00
Calen Pennington
2c0e5b82ff
Return a 403 when an anonymous user attempts to hit modx_dispatch. Fixes https://www.pivotaltracker.com/story/show/46916015 and https://www.pivotaltracker.com/story/show/46916029
2013-03-27 07:29:22 -04:00
Arthur Barrett
7784a29e61
add simple notes view
2013-03-26 14:47:12 -04:00
Carlos Andrés Rocha
f70511ebef
Merge pull request #1737 from MITx/diana/fix-login-dialog
...
Remove duplicate login dialog.
2013-03-26 10:28:26 -07:00
Will Daly
0500ba4dd5
Disabled pylint warnings for lettuce steps:
...
* Missing docstring
* Redefining name from outer scope
2013-03-26 11:46:31 -04:00
Will Daly
27d5ebf027
pep8 fixes
2013-03-26 11:44:57 -04:00
Will Daly
00d25b684c
Moved modulestore flush code into terrain/course_helpers
2013-03-26 11:44:57 -04:00
Will Daly
4528490fac
Refactored lms/coureware lettuce tests to use terrain helpers
...
for common ui manipulations
2013-03-26 11:44:56 -04:00
Will Daly
6dd86f7a97
Refactored courseware_common and open_ended to use ui helpers
2013-03-26 11:44:56 -04:00
Will Daly
5e69050a16
Elminated unused functions from courseware/features/courses.py
...
and moved the rest to common.py
2013-03-26 11:44:56 -04:00
Will Daly
b0eb73302b
Moved some courseware/features/common.py steps into
...
terrain/steps.py
2013-03-26 11:44:56 -04:00
John Jarvis
506a5252b2
converting password_reset_confirm back to django template from mako
2013-03-26 11:06:39 -04:00
Vik Paruchuri
97cb4910a7
Add in default bucket, edit image url checks
2013-03-26 11:04:14 -04:00
Vik Paruchuri
df935d422d
Fix issues with open ended image grading and peer grading centralized module finder.
2013-03-26 09:52:26 -04:00
Arthur Barrett
d636f4fab0
Merge branch 'master' into feature/abarrett/lms-notes-app
2013-03-25 19:04:58 -04:00
Arthur Barrett
63349dab9c
fixed update/delete responses
2013-03-25 19:04:23 -04:00
Arthur Barrett
0f486b16e9
add creation time to output
2013-03-25 18:54:28 -04:00
Arthur Barrett
131c63b697
refactored model and api to search/filter by page uri
2013-03-25 18:47:28 -04:00
Will Daly
37e7d68cef
pep8 and pylint fixes
2013-03-25 16:46:31 -04:00
Will Daly
c660229b25
Added checking for problem answer state after a problem is checked
2013-03-25 16:37:59 -04:00
Brian Talbot
f5aaf309e8
edx.org - added in visual spacing for confirmed state of password recovery modal
2013-03-25 15:16:50 -04:00
Diana Huang
156afb6d77
Remove duplicate login dialog.
2013-03-25 15:16:00 -04:00
Brian Talbot
e716530692
edx.org - added necessary JS and Sass to disabled login/register button when form is submitting
2013-03-25 14:52:13 -04:00
Brian Talbot
dc1a7f5d6a
edx.org - changed status message UI to be hidden by default (rather than with JS) for the time being for page load/render's sake
2013-03-25 13:59:30 -04:00
Arthur Barrett
0574eb49ad
initialize annotator on any element by note:init event
2013-03-25 13:36:38 -04:00
Your Name
5ba583ed7b
Merge branch 'master' of github.com:MITx/mitx
2013-03-25 11:46:27 -04:00
Victor Shnayder
f0e1b477f7
Merge pull request #1703 from MITx/feature/diana/matlab-input
...
Matlab Input Type
2013-03-25 08:27:56 -07:00
Your Name
6d9e5ef6e5
Merge branch 'master' of github.com:MITx/mitx
2013-03-25 10:17:58 -04:00
Chris Dodge
fd973442b1
if we have to reload a module and already have the descriptor, we don't need to refect the descriptor (which results in another DB round-trip. We just need the student state.
2013-03-22 13:57:53 -04:00
marco
f8eacff683
styled textbook css to look closer to the discussion forum navigation
2013-03-22 11:04:44 -04:00
marco
9fdac385e1
Merge branch 'master' into ux/marco/textbook
2013-03-22 10:29:05 -04:00
Arthur Barrett
7120998938
refactoring notes js
2013-03-21 17:18:45 -04:00
John Jarvis
57dd2e728c
Adding a new cookie to determine logged in status for the edx mktg site
...
When a user logs in this will drop a new cookie 'edxloggedin' that will
match the value and expire date of the django session cookie.
When a user logs out the cookie will be removed
2013-03-21 17:17:35 -04:00
Chris Dodge
a5845a2087
remove discussion caching for now. It might be overkill and I need to figure out how to serialize out the resultset into the cache as writing modules into the cache causes a pickle error
2013-03-21 15:46:57 -04:00
marco
7ecf0e5bc1
small positioning adjustments to inline pins;
2013-03-21 14:27:10 -04:00
Arthur Barrett
76e338d82b
added template for notes view
2013-03-21 12:33:27 -04:00
Will Daly
6728f16ae4
Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests
...
Conflicts:
lms/djangoapps/courseware/features/problems.py
2013-03-21 10:49:04 -04:00
marco
f45cc6fb35
changes to textbook styling
2013-03-20 21:30:05 -04:00
Will Daly
2fc96d5fb7
Fixed a merge issue about code response
2013-03-20 17:18:26 -04:00
Will Daly
7a282a9c54
Edited comments, ran pep8
2013-03-20 17:08:19 -04:00
Will Daly
911308cba2
Changed check for unanswered problems so that it now looks for
...
an "unanswered" div or span. This is much faster than
asserting that correct/incorrect is NOT present.
2013-03-20 17:08:19 -04:00
