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
Will Daly
f69778b367
Changed lettuce test log_in step to log in programatically
...
rather than using the login dialog.
2013-03-20 17:08:19 -04:00
Carlos Andrés Rocha
c5385ff42c
Update Berkeley logos
...
LMS Lighthouse [#260 ]
2013-03-20 14:46:08 -04:00
Diana Huang
af1af8c6d1
Address code review feedback:
...
- improve docstrings
- only pass in the state for a particular input and
not the whole dictionary
- refactor some common code
- minor syntax cleanup
2013-03-20 14:14:54 -04:00
David Ormsbee
f133d3181b
Merge pull request #1706 from MITx/fix/cale/simple-lazy-object
...
Force instantiation of the user before querying
2013-03-20 11:08:57 -07:00
Victor Shnayder
83665515d8
Remove director of engineering job posting per request from Tess
2013-03-20 13:45:01 -04:00
Jay Zoldak
23364d8b0f
Merge branch 'master' into feature/zoldak/refactor-factories
2013-03-20 13:36:01 -04:00
Calen Pennington
154a441033
Only use .pk for queries, and not on inserts
2013-03-20 13:24:25 -04:00
Calen Pennington
cbed66280a
Fix pep8 and pylint errors
2013-03-20 13:20:28 -04:00
Jay Zoldak
8428119856
Merge pull request #1696 from MITx/feature/will/coderesponse_lettuce_tests
...
Feature/will/coderesponse lettuce tests
2013-03-20 10:20:11 -07:00
Calen Pennington
36443163f6
Force instantiation of the user before querying
...
Without accessing .pk, it's possible for the user object to still be a
SimpleLazyObject, which breaks Django's query engine
http://stackoverflow.com/questions/11875737/django-filtering-drafts-by-user-causes-error
2013-03-20 12:59:34 -04:00
Your Name
32f75bfe9e
added pinning UI to inline
2013-03-20 11:58:47 -04:00
Jay Zoldak
6048bc2832
Pep8 fixes for factory refactor
2013-03-20 11:31:12 -04:00
Will Daly
5411fc765e
Refactored lettuce test of capa problems to use
...
world.css_click() helper instead of directly
calling splinter.
2013-03-20 11:27:28 -04:00
Will Daly
2867476115
Added __init__.py and test_mock_xqueue_server.py,
...
which should have been included in the last commit
2013-03-20 11:18:41 -04:00
Will Daly
8f055ab037
Moved mock_xqueue_server to its own subpackage within
...
lms/djangoapps/courseware/
Separated tests of the mock server into test_mock_xqueue_server.py
2013-03-20 11:14:42 -04:00
Jay Zoldak
e45ccbf389
Leave CourseEnrollment factor refactoring as a TODO.
2013-03-20 11:12:54 -04:00
Jay Zoldak
16773aac63
More factory refactoring.
2013-03-20 09:38:53 -04:00
Jay Zoldak
3576a3154b
Repoint factory references in lettuce tests to world.
2013-03-20 09:38:52 -04:00
Jay Zoldak
daadaffb61
Add mongo contentstore to acceptance.py for lettuce tests for lms
2013-03-20 09:38:52 -04:00
Diana Huang
eda6169b8b
Pass along a url creator as opposed to just a url through
...
the ModuleSystem.
2013-03-20 09:23:25 -04:00
Kevin Chugh
359de858b4
merge master
2013-03-20 09:21:51 -04:00
Your Name
9964e4c2bb
local fix to merge conflict
2013-03-20 09:16:26 -04:00
Your Name
6ddff7fcb3
stash merge
2013-03-20 09:04:14 -04:00
Victor Shnayder
21e58d009a
Remove associate legal council posting, per request from Tess
2013-03-20 00:05:13 -04:00
