Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,002 Commits 1 Branch 0 Tags
b3f00a672504e70e66a38d9d35f85df48ff70afd
Commit Graph

4289 Commits

Author SHA1 Message Date
Jay Zoldak
a5b1428bba Merge pull request #1760 from MITx/feature/will/speed_up_unit_tests 
Feature/will/speed up unit tests
 2013-03-29 10:53:10 -07:00
Jay Zoldak
d044d5c48d a few more pep8 fixes 2013-03-29 13:15:33 -04:00
Jay Zoldak
b63aae221e small pep8 pylint and superclass fixes 2013-03-29 10:41:27 -04:00
Will Daly
5bf839c9a9 Guard against trying to load a template when checking pages. 2013-03-28 16:55:20 -04:00
Ned Batchelder
252f9364a6 Merge pull request #1761 from MITx/content/rocha/utaustinx-courses 
Content/rocha/utaustinx courses
 2013-03-28 10:26:02 -07:00
Carlos Andrés Rocha
a15baa97c5 Add UTAustinX landing page 2013-03-28 13:23:58 -04:00
Carlos Andrés Rocha
4050da6b4c Enable meta-universities (organizations that contain other) 2013-03-28 13:23:50 -04:00
Will Daly
f652fb5f73 Pylint and pep8 fixes 2013-03-28 12:51:09 -04:00
Jay Zoldak
c9a7be6b9b Merge pull request #1727 from MITx/feature/will/lettuce_test_helpers 
Feature/will/lettuce test helpers
 2013-03-28 07:26:14 -07:00
Will Daly
13c01ec3fc Randomized instructor page tests 2013-03-28 10:03:05 -04:00
Don Mitchell
fece937669 Merge pull request #1758 from MITx/fix/cdodge/use-request-scroped-cache-for-metadata 
Fix/cdodge/use request scoped cache for metadata inheritance
 2013-03-28 06:51:20 -07:00
Will Daly
bf37d4a9a3 Randomized loading of test pages for dark launch test 2013-03-28 09:33:51 -04:00
Will Daly
c48f119cec Skip test of mock_xqueue_server 2013-03-28 09:13:28 -04:00
Will Daly
3eefb7d5ec Resolved conflicts from rebase to master; fixed keyword error caught by 
pylint
 2013-03-28 08:58:56 -04:00
Will Daly
27a31230bf Removed full course tests 2013-03-28 08:55:45 -04:00
Will Daly
7978c581db Changed test for checking all pages to checking a random page 2013-03-28 08:55:16 -04:00
Chris Dodge
b609a96902 ummm. forgot to commit stuff 2013-03-27 22:51:52 -04:00
Brian Wilson
c639799a07 fix missing import 2013-03-27 18:12:48 -04:00
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
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
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
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
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