Commit Graph

14212 Commits

Author SHA1 Message Date
Chris Dodge
78c8358957 clean up pyling violations from views.py 2013-03-11 14:51:44 -04:00
David Ormsbee
0605c94113 Merge pull request #1636 from MITx/feature/brian/htmlbook
Initial implementation of htmlbook.
2013-03-11 11:38:46 -07:00
Calen Pennington
de46666a7f Use .get to avoid key errors during inheritance 2013-03-11 14:38:16 -04:00
Calen Pennington
07059d0dfc Iterate over metadata items when setting module info 2013-03-11 14:32:56 -04:00
cahrens
40af08aa2d Saving tests in progress 2013-03-11 14:01:45 -04:00
Chris Dodge
3568db73e3 initial wiring of 404/500 error pages for Studio 2013-03-11 13:54:44 -04:00
Calen Pennington
7e1349775c Don't write data to metadata when updating course grading 2013-03-11 13:53:59 -04:00
Brian Wilson
53f85f2a07 return empty list if no html or pdf textbook appears in policy.json 2013-03-11 13:52:43 -04:00
Calen Pennington
a943117608 Log ErrorDescriptor creation as a warning 2013-03-11 13:42:07 -04:00
Brian Talbot
0c9280667e Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-11 13:28:54 -04:00
Brian Talbot
a496cc0a1e studio - Sass Cleanup: moved all page/view specific css to their own views and created forms specific sheet 2013-03-11 13:28:28 -04:00
Calen Pennington
c1dbd98526 Fix bad reference to item_location 2013-03-11 13:07:28 -04:00
David Ormsbee
aceb666076 Merge pull request #1642 from MITx/fix/rocha/numericresponse-exponential
Make numeric response handle plus sign exponential correctly
2013-03-11 10:03:44 -07:00
Christina Roberts
ce1807b735 Merge pull request #1641 from MITx/fix/cdodge/delete-not-removing-parent-reference
delete_item should update the parent's list of children to reflect the d...
2013-03-11 10:00:39 -07:00
Carlos Andrés Rocha
5f95c6848c Make numeric response handle plus sign exponential correctly
NumericResponse was failing to accept as correct an answer with a plus
sign in the exponential. For example: 5.0e+1 was marked as incorrect
if the answer was 50. However, 5.0e1 was marked as correct. This
caused confusion, since the answer shown to students included the plus
sign.

LMS Lighthouse [#242]
2013-03-11 12:53:01 -04:00
Calen Pennington
81527d60d8 Move pep8 and pylint into test suite, so that we can rachet down the number of violations 2013-03-11 12:27:56 -04:00
Calen Pennington
7b5427006c Save lcp state on initialization (for seed initialization) 2013-03-11 12:25:45 -04:00
Brian Talbot
82a00104c2 studio - settings: revised markup and styling around disabled/readonly fields 2013-03-11 12:24:43 -04:00
Calen Pennington
881e137fb0 Save lcp state when a problem is saved 2013-03-11 12:23:24 -04:00
Brian Wilson
cd95872b52 htmlbook-specific styling to make Heroes text presentable. 2013-03-11 11:56:48 -04:00
Brian Talbot
603d11577f studio - settings: matched up styling/treatment of disabled input fields in schedule/details settings view to new advanced settings UI 2013-03-11 11:40:36 -04:00
Brian Talbot
524db5e3f9 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-11 11:35:25 -04:00
Brian Talbot
72a7ec9e07 studio - advanced settings: removed new/delete controls from advanced policies and makde key fields readonly/disabled since we're now showing all policy metadata 2013-03-11 11:31:48 -04:00
Will Daly
a777a9e6e3 Updated broken tabs.js Jasmine tests. 2013-03-11 11:27:49 -04:00
Will Daly
6b94090e67 Fixed jasmine test issue with cms caused by previous change
to order of file import.  Introduced static_files list
in files.json (supported in original django_jasmine implementation)
that loads static files before any compiled files.
2013-03-11 11:27:49 -04:00
Will Daly
618de5df25 Fixed import error for histogram.coffee 2013-03-11 11:27:49 -04:00
Will Daly
20b04c9bf2 Fixed broken calculator test in lms coffee scripts 2013-03-11 11:27:49 -04:00
Julian Arni
588b27c9dc Added Descriptor method, fixed order issue. 2013-03-11 11:17:12 -04:00
David Ormsbee
7806acc7cb Merge pull request #1638 from MITx/feature/diana/show-correctness
Add the ability to hide correctness markers
2013-03-11 08:14:18 -07:00
Brian Wilson
2199ae673b add checks that book_index is in range 2013-03-11 11:10:08 -04:00
Brian Talbot
7a9fdb9069 studio - sass clean up: in progress business with git ignore issues 2013-03-11 11:04:43 -04:00
Calen Pennington
fcc3113bbf Merge pull request #1637 from MITx/fix/cdodge/performance-optimize-comment-client-use-jumpto
Fix/cdodge/performance optimize comment client use jumpto
2013-03-11 08:02:28 -07:00
Calen Pennington
95f8f811c5 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
2013-03-11 10:49:29 -04:00
Calen Pennington
9c85d920ee Fixing tests created on master 2013-03-11 10:48:06 -04:00
Chris Dodge
d38b37f0b4 delete_item should update the parent's list of children to reflect the delete operation. Also added unit test 2013-03-11 10:47:22 -04:00
Brian Wilson
fcb618f04e fix basic alignment issue with html textbook display 2013-03-11 10:38:32 -04:00
e0d
5b0849d4fc Merge pull request #1640 from MITx/feature/cale/specify-ruby-1.9.3
Specify that mitx should use ruby 1.9.3-p374 for consistancy with prod
2013-03-11 07:37:58 -07:00
Calen Pennington
a1febce86b Specify that mitx should use ruby 1.9.3-p374 for consistancy with prod 2013-03-11 10:33:09 -04:00
David Ormsbee
ac62fc0f66 Merge branch 'master' into jmpm-analytics 2013-03-11 10:29:51 -04:00
Diana Huang
421e169e1e Update tests with new attributes. 2013-03-11 10:29:18 -04:00
David Ormsbee
43ec6eaa52 Merge pull request #1639 from MITx/feature/dave/delft_logo
Update of Delft logo (lighthouse ticket #234)
2013-03-11 07:21:55 -07:00
David Ormsbee
a8ff7911f6 Update of Delft logo (lighthouse ticket #234) 2013-03-11 10:21:03 -04:00
Diana Huang
0c949d20c9 Add the ability to hide correctness markers
with a custom message for when they submit something.
2013-03-11 10:12:33 -04:00
David Ormsbee
a0dd6d9832 add entry for ANALYTICS_SERVER_URL to aws.py 2013-03-11 10:05:36 -04:00
David Ormsbee
4d4869b176 Remove HTTP-based logging leftover from early experiments. 2013-03-11 01:24:25 -04:00
Chris Dodge
cbcda0fc65 oops didn't mean to commit the test API key 2013-03-10 11:14:25 -04:00
Chris Dodge
18ee1018e6 optimize forum page rendering as we don't pre-compute the link urls to inline discussions. We can use jump_to urls and then figure out the link path if/when end-user clicks on it. This saves a lot of unnecessary round trips to the DB as path computation is expensive, especially when it being done for every discussion module in a course in a loop. 2013-03-10 11:11:17 -04:00
David Ormsbee
5f125e6807 Merge branch 'master' into jmpm-analytics 2013-03-10 01:09:03 -05:00
David Ormsbee
cc82ffe10a Give a more comprehensive grade distribution of problems analytic 2013-03-10 00:48:46 -05:00
David Ormsbee
3bb3cf3ca3 Consolidate some of the analytic fetching logic in the instructor dashboard. 2013-03-09 18:52:20 -05:00