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

11877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
1b07b85ef2 Removed extra 'pass' statement 2013-03-26 13:43:26 -04:00
Will Daly
47e47303dc Refactored CustomResponse to use the same private 
func to handle all errors related to execution of
python code.

CustomResponse now returns subclasses of Exception
instead of general Exceptions

CustomResponse no longer includes tracebacks
in the exceptions it raises (and shows to students)
 2013-03-26 13:36:27 -04:00
Don Mitchell
c370bb6a61 Merge pull request #1741 from MITx/feature/rocha/fix-advertised-start 
Use advertised_start as a simple string
 2013-03-26 09:48:12 -07:00
Carlos Andrés Rocha
586f566b42 Use advertised_start as a simple string 
LMS Lighthouse [#297]
 2013-03-26 11:54:32 -04:00
Don Mitchell
a603f25466 Merge pull request #1739 from MITx/bug/christina/studio 
Allow clearing of dates (except for course start date).
 2013-03-26 07:44:42 -07:00
cahrens
f681d4300d More cleanup in base.js. 2013-03-26 10:42:44 -04:00
cahrens
83eda6ac93 Merge branch 'master' into bug/christina/studio 2013-03-26 10:34:37 -04:00
cahrens
69c95ca785 Newline cleanup. 2013-03-26 09:51:24 -04:00
Calen Pennington
83c0feb84c Merge pull request #1738 from MITx/fix/cdodge/too-many-depth-levels 
it appears we are taking one too many round trips to do when pre-fetchin...
 2013-03-26 03:42:19 -07:00
Chris Dodge
269152c4f2 add a test scenario to count RT to database when prefetching children. This uses a shim function on pymongo's collection.find to do the counting 2013-03-25 23:15:35 -04:00
Chris Dodge
d8f1c2b41a add unit test for proper depth build out 2013-03-25 22:49:39 -04:00
Victor Shnayder
8350fe141b Merge pull request #1735 from MITx/fix/will/bug_258 
Fix bug #258: multiple choice with choice names ending with 0 cause multiple choice answers marked incorrect
 2013-03-25 14:37:40 -07:00
cahrens
ce884c44ee Newline cleanup. 2013-03-25 17:26:59 -04:00
cahrens
fa63bcce94 Allow clearing of dates (except for course start date). 
https://edx.lighthouseapp.com/projects/102637/tickets/231
 2013-03-25 17:25:49 -04:00
Don Mitchell
3e43e6d3f2 Merge pull request #1736 from MITx/bug/christina/studio 
Don't assume input fields will be within a div-- PART 2!
 2013-03-25 13:52:02 -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
Chris Dodge
7dcb1bf7c6 it appears we are taking one too many round trips to do when pre-fetching children. This can be very expensive as the tree gets wider the deeper we go. For example, in courseware we want depth=2 (course, chapter, sequential). But looking at log output we were also getting verticals, which there can be a lot of. This should cut down on the total data we are grabbing from the DB. 2013-03-25 16:09:13 -04:00
cahrens
ccd4db9ac3 Writing test. 2013-03-25 15:24:53 -04:00
Will Daly
3084361042 Updated template to correctly handle checkbox values 2013-03-25 15:12:06 -04:00
Will Daly
1df35507a3 Changed 'in' to '==' to fix bug #258 2013-03-25 14:13:47 -04:00
Don Mitchell
8c1b7a7160 Merge pull request #1734 from MITx/fix/rocha/course-xmodule-test 
Fix incorrect date in test for course xmodule
 2013-03-25 08:34:12 -07:00
Carlos Andrés Rocha
a5a126ac93 Fix incorrect date in test for course xmodule 2013-03-25 11:28:40 -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
Diana Huang
4bda05d9eb Fix seed assignment priority and add clearer documentation 2013-03-25 11:22:56 -04:00
Don Mitchell
a91f1278cb Merge pull request #1733 from MITx/bug/christina/studio 
Don't assume input fields will be within a div.
 2013-03-25 08:12:47 -07:00
cahrens
c39ff353ea Don't assume input fields will be within a div. 
https://edx.lighthouseapp.com/projects/102637/tickets/232
 2013-03-25 11:09:33 -04:00
Diana Huang
cda0fa0aa5 Check for None specifically when setting a new seed. 2013-03-25 11:08:51 -04:00
Mark L. Chang
d7057ef56d Merge pull request #1732 from MITx/bug/christina/studio 
Upadate link to static documentation.
 2013-03-25 07:58:14 -07:00
Victor Shnayder
235cce1323 Merge pull request #1713 from MITx/jmclaus/edit-molecule-css-fix 
CSS from JSME doesn't affect surrounding content now
 2013-03-25 07:51:02 -07:00
cahrens
ecf395d692 Upadate link to static documentation. 2013-03-25 10:39:35 -04:00
chrisndodge
71712ef05d Merge pull request #1729 from MITx/bug/dhm/date-parse 
Bug/dhm/date parse
 2013-03-25 07:15:04 -07:00
Don Mitchell
264ca65640 Add some comments 2013-03-25 09:37:00 -04:00
Brian Talbot
a26a7c860b Merge pull request #1728 from MITx/bug/christina/cursor-move 
Don't save subsection and unit names until the change event.
 2013-03-25 06:15:04 -07:00
Christina Roberts
a2518ff697 Merge pull request #1730 from MITx/feature/zoldak/pylint-docstring 
Pylint to not require docstring for tests
 2013-03-25 06:10:28 -07:00
Jay Zoldak
2c4506b79f Pylint to not require docstring for tests 2013-03-22 17:13:58 -04:00
Don Mitchell
884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse 
Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py
 2013-03-22 16:56:31 -04:00
Calen Pennington
b9dca0618f Merge pull request #1726 from MITx/fix/cdodge/grading-perf-regression 
if we have to reload a module and already have the descriptor, we don't ...
 2013-03-22 13:46:03 -07:00
Don Mitchell
056b7d3427 More unit tests which found another timezone assumption :-) 2013-03-22 16:45:21 -04:00
David Ormsbee
5863ba5ac4 Merge pull request #1686 from MITx/feature/vaxxxa/docs-poll-conditional-xml 
Feature/vaxxxa/docs poll conditional xml
 2013-03-22 13:30:47 -07:00
Don Mitchell
862a7d13e9 pep8: line length 2013-03-22 16:17:37 -04:00
Don Mitchell
8370124e2b Make to and from json for dates use iso format esp for timezone. 2013-03-22 16:16:32 -04:00
cahrens
dfdc2cb7d8 Remove console.log. 2013-03-22 16:11:43 -04:00
cahrens
39714a17d9 Merge branch 'master' into bug/christina/cursor-move 
Conflicts:
	cms/static/js/base.js
 2013-03-22 16:03:52 -04:00
Don Mitchell
2dcfd1eba1 Merge pull request #1719 from MITx/feature/btalbot/studio-checklists 
Add course checklists to Studio
 2013-03-22 12:49:30 -07:00
cahrens
eebef1e647 Don't save subsection and unit names until the change event. Fixes bugs #18 and #228. 2013-03-22 15:32:13 -04:00
Christina Roberts
1069c2c40a Merge pull request #1722 from MITx/bug/btalbot/studio-pagetitles 
Synced up Studio View <titles> with UI headings
 2013-03-22 11:02:16 -07:00
cahrens
505a382421 Re-enable all the tests! 2013-03-22 14:00:20 -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
Christina Roberts
1ea3a4e77b Merge pull request #1724 from MITx/bug/btalbot/studio-viewlivebutton 
studio - "view live version" of unit button label change
 2013-03-22 10:34:55 -07:00