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
Calen Pennington
1f593428d4
Fix metadata introspection in course admin page
2013-03-08 21:17:19 -05:00
Calen Pennington
6395745c2b
Clean up serialization on some fields
2013-03-08 21:17:19 -05:00
Brian Wilson
bed7dbdb6b
fix plumbing for anchors and chapters.
2013-03-08 18:25:33 -05:00
Carlos Andrés Rocha
fb407e3cb8
Merge pull request #1633 from MITx/fix/will/choicegroup_html_render_error
...
Fixed undefined variable error in choicegroup.html
2013-03-08 14:30:59 -08:00
cahrens
89ea88cdf2
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-03-08 16:09:01 -05:00
cahrens
a68cdd35d8
Add advanced_modules course setting back in.
2013-03-08 16:07:59 -05:00
Calen Pennington
035829289e
Parse weight as a float when reading from a string
2013-03-08 16:01:27 -05:00
e0d
7eee7a0d2a
Merge pull request #1635 from MITx/fix/cale/handle-grading-json-breakage
...
Set grading policy to an empty dict if it can't be decoded from json
2013-03-08 12:47:37 -08:00
Calen Pennington
8bb0c64ff9
Set grading policy to an empty dict if it can't be decoded from json
2013-03-08 15:36:19 -05:00
Calen Pennington
e3f7e6024f
Only display settings in the cms advanced settings page
2013-03-08 15:22:49 -05:00
Calen Pennington
248ce8803b
Make annotable module use the new xmodule format
2013-03-08 15:09:59 -05:00
Don Mitchell
3d9878515e
Merge pull request #1634 from MITx/bug/christina/advanced-settings
...
Need to trigger invalid instead of error, after changes for new version ...
2013-03-08 12:03:51 -08:00
Calen Pennington
93db5acc15
Make display_name defaulting explicit
2013-03-08 14:58:09 -05:00
cahrens
f5dd5d35e9
Need to trigger invalid instead of error, after changes for new version of Backbone.
2013-03-08 14:51:29 -05:00
Will Daly
607f27e715
Fixed undefined variable error in choicegroup.html
2013-03-08 14:06:45 -05:00
Christina Roberts
5eb43a627c
Merge pull request #1632 from MITx/fix/zoldak/lettuce-click
...
Fix lettuce tests so all studio ones are working and faster
2013-03-08 11:04:50 -08:00
Chris Dodge
e4dea025d0
Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged
2013-03-08 13:53:25 -05:00
Chris Dodge
5e3b084c1a
fix regression where wrap_xmodule_display got set to True for 'about' and 'info'
2013-03-08 13:50:58 -05:00
Calen Pennington
79ad2ecd39
Only run setup_debug once the page has finished loading
2013-03-08 13:39:19 -05:00
Jay Zoldak
c5a9ec5e86
Speed up the lettuce test for no policy settings.
2013-03-08 13:34:28 -05:00
Jay Zoldak
3c3f6c3cbe
Revert lettuce css_find function to not fail if it does not find the element.
2013-03-08 13:34:28 -05:00
Calen Pennington
1962d247bf
Make allow_anonymous and allow_anonymous_to_peers use field access in templates
2013-03-08 13:23:06 -05:00
Calen Pennington
d8b99e1e8e
Make remote_gradebook use the new field instead of metadata
2013-03-08 13:21:58 -05:00
