ichuang
15d1bc372d
clean up xqueue callback url generation; allow override from settings
2013-03-31 19:40:39 +00:00
ichuang
de5fa56b19
add dump of description of grading configuration to instructor dashboard
2013-03-31 13:18:54 +00:00
ichuang
febcb51133
make psychometrics curve fitting more robust
2013-03-31 12:52:29 +00:00
ichuang
26f14aaf6d
fix psychoanalyze (compatibility with new xblock)
2013-03-31 12:41:12 +00:00
ichuang
f1cc6e8597
fix psychoanalyze - make compatible with xblock
2013-03-31 12:40:43 +00:00
ichuang
14899b9066
fix lms migration to be compatible with xblock
2013-03-31 12:35:08 +00:00
Brian Wilson
23d96b2533
change submission history to be ordered by id
2013-03-29 21:16:20 -04:00
Chris Dodge
02f97858f6
move the provisioning seeding from LMS into Common. Add provisioning seeding calling from create new course view.
2013-03-29 16:32:53 -04:00
Brian Wilson
29731ec40b
management command to remove excess input_state entries
2013-03-29 15:20:34 -04:00
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
Brian Wilson
50fd7ee7a4
fix test
2013-03-29 12:01:10 -04:00
Jay Zoldak
b63aae221e
small pep8 pylint and superclass fixes
2013-03-29 10:41:27 -04:00
Kevin Chugh
5534d8bdce
fix mega merge conflicts
2013-03-29 07:33:52 -04:00
Will Daly
5bf839c9a9
Guard against trying to load a template when checking pages.
2013-03-28 16:55:20 -04:00
Chris Dodge
8fdeee06ed
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
...
Conflicts:
cms/one_time_startup.py
common/lib/xmodule/xmodule/modulestore/mongo.py
2013-03-28 13:27:29 -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
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
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
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
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
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
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
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
