Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,892 Commits 1 Branch 0 Tags
756f75951dca8311ff0d642af2ef3abddbf2c9b3
Commit Graph

4249 Commits

Author SHA1 Message Date
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
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
Diana Huang
156afb6d77 Remove duplicate login dialog. 2013-03-25 15:16:00 -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
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
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
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
Victor Shnayder
21e58d009a Remove associate legal council posting, per request from Tess 2013-03-20 00:05:13 -04:00
Will Daly
e7f8c7c676 pep8 fixes 2013-03-19 16:00:43 -04:00
Will Daly
39aa25c2d6 Removed file that was added accidentally. 2013-03-19 15:57:24 -04:00
Will Daly
66434d7d05 Moved XQueue mock from terrain into LMS, so that the 
server is not created for cms tests.
 2013-03-19 15:55:05 -04:00
Will Daly
20ccf5937b Implemented CodeResponse lettuce tests 2013-03-19 15:55:05 -04:00
e0d
39d451d92a Merge pull request #1687 from MITx/hotfix/edz/pinning 
Allow backwards compatibility for forums pinning UI.
 2013-03-19 09:31:14 -07:00
Calen Pennington
0209c883bb Remove trailing whitespace 2013-03-19 10:41:38 -04:00
Jay Zoldak
a70a23a48e Merge pull request #1680 from MITx/feature/will/courseware_lettuce_tests 
Feature/will/courseware lettuce tests
 2013-03-18 12:24:19 -07:00
Jay Zoldak
b6e82afb0e Merge pull request #1681 from MITx/fix/will/fix_broken_jasmine_lms_tests 
Fix/will/fix broken jasmine lms tests
 2013-03-18 11:53:22 -07:00
Will Daly
568f557dfc Pep8 fixes 
Changed constant to uppercase
 2013-03-18 13:57:26 -04:00
chrisndodge
eff6f1d182 Merge pull request #1690 from MITx/feature/cale/no-student-state-instructor-dash 
Skip over fields that are scoped to students when looping through the Co...
 2013-03-18 10:21:37 -07:00
Calen Pennington
3fbde821dd Skip over fields that are scoped to students when looping through the CourseModule fields in the instructor dashboard 2013-03-18 13:09:10 -04:00
Calen Pennington
a4f10bfdaf Small pylint cleanup 2013-03-18 12:45:46 -04:00
Calen Pennington
9dda977ece Handle days_early_for_beta possibly being a string 2013-03-16 20:38:32 -04:00
Carlos Andrés Rocha
a4451bdcd2 XBlock SDK announcement 
LMS Lighthouse [#261]
 2013-03-16 14:26:14 -07:00
Will Daly
e41bb8462c Added lettuce tests for script (customresponse) problems. 
Increased wait time for login screen to reduce false positives.
 2013-03-15 14:04:22 -04:00
Will Daly
8423816076 LMS contentstore lettuce tests now dynamically create courses in mongo 
using terrain.factories.py and capa.tests.response_xml_factory
 2013-03-15 14:04:22 -04:00
Will Daly
a20a3a02bb Refactored lettuce problem test assertion that a problem is 
correct/incorrect/unanswered
 2013-03-15 14:02:21 -04:00