Vik Paruchuri
b1726dae99
Fix prompt UI in combined open ended to close by default and be collapsible
2013-02-07 13:48:32 -05:00
Vik Paruchuri
5ef4af5afd
Fix peer and staff grading interfaces
2013-02-07 12:54:36 -05:00
Vik Paruchuri
baba8d3a36
Add collapse action into staff grading view
2013-02-07 12:42:05 -05:00
Vik Paruchuri
3457b86bd0
Fix JS, style student response box
2013-02-07 12:36:57 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
Vik Paruchuri
c195fe65cd
Restyle rubric list, submission container
2013-02-07 11:10:29 -05:00
Vik Paruchuri
198885f7e0
Move elements around, do some restyling
2013-02-07 10:40:15 -05:00
Vik Paruchuri
b30407d7c8
Work on showing results properly
2013-02-07 10:22:33 -05:00
Calen Pennington
2b637fe511
Fix loads of local static files when running in dev mode
2013-02-07 10:13:53 -05:00
Diana Huang
cab9bfcd55
Minor cleanup
2013-02-07 10:08:34 -05:00
Diana Huang
12ff015bff
Include due date parsing in new versioned xmodule.
2013-02-07 10:00:05 -05:00
Vik Paruchuri
de8e1e9472
Change around some names, restyle rubric
2013-02-07 09:57:41 -05:00
Vik Paruchuri
03a6572bbe
Restyle status, get rubric to work properly
2013-02-07 09:49:56 -05:00
Diana Huang
e6957a01a4
Merge branch 'master' into feature/diana/close-oe-problems
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-02-07 09:44:31 -05:00
Diana Huang
97655d0358
Remove the requirement that the problem peer grading module
...
has to have a certain naming structure
2013-02-07 09:40:30 -05:00
Vik Paruchuri
9a5a988116
Revert peer grading problem to master version
2013-02-07 09:29:24 -05:00
Vik Paruchuri
2542b6cb72
Merge remote-tracking branch 'origin/master' into feature/vik/improve-oe-ui
2013-02-07 09:26:40 -05:00
Vik Paruchuri
6a6962df9e
Alter rubric list, restyle rubric
2013-02-07 09:26:27 -05:00
Brian Wilson
33a5a5fd9f
add implementation for fixed_time_module
2013-02-07 05:17:56 -05:00
Victor Shnayder
37b735d708
Merge pull request #1454 from MITx/hotfix/dave/youtube_object
...
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 22:37:41 -05:00
Kevin Chugh
d047d826c7
update coffeescript to hide cohort choice if first commmentable is not cohorted
2013-02-06 22:00:03 -05:00
Victor Shnayder
18ddd1ee56
Merge pull request #1453 from MITx/victor/protex
...
Victor/protex
2013-02-06 18:03:53 -08:00
Julian Arni
a770e34bec
Adding multiple-choice loncapa integration.
2013-02-06 20:54:43 -05:00
jmclaus
2627a2f12c
Protex now loads correctly in every scenario
2013-02-06 20:49:23 -05:00
jmclaus
98865bb7c0
Loading bug fixed by ugly hack
2013-02-06 20:49:16 -05:00
jmclaus
85b92f30de
GWT now does no set any target shape in onModuleLoad()
2013-02-06 20:49:06 -05:00
jmclaus
e27b1e04a7
Fixed small alighment pb, decreased font size of text box
2013-02-06 20:48:57 -05:00
jmclaus
3bd7e1b703
Crisper AA letters, canvases non-selectable
2013-02-06 20:48:48 -05:00
jmclaus
ef232c5976
Few bug fixes
2013-02-06 20:48:40 -05:00
jmclaus
f6dacff41e
Fixed layout, increased size of markers on proteins
2013-02-06 20:48:32 -05:00
jmclaus
5737f58b95
Added GWT Protex - reads target shape from xml writes answer to hidden input field
2013-02-06 20:48:25 -05:00
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Victor Shnayder
0141f31d33
add warning message to sample-post.py
2013-02-06 18:57:25 -05:00
Victor Shnayder
edf96036c8
Merge remote-tracking branch 'origin/master' into 7012x-clean
2013-02-06 18:53:14 -05:00
Carlos Andrés Rocha
536333cbb5
Refactor how editamolecule displays messages
2013-02-06 18:31:00 -05:00
ichuang
b5ba88f0af
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/conditional-xmodule-icon-and-errortracker
...
Conflicts:
common/lib/xmodule/xmodule/conditional_module.py
2013-02-06 18:15:36 -05:00
ichuang
c16f688802
conditional xmod: add errortracker msg and inherit icon from child
2013-02-06 18:10:25 -05:00
Victor Shnayder
66889b8724
Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes
...
Feature/kevin/groups ui changes
2013-02-06 14:41:41 -08:00
Carlos Andrés Rocha
d4afa02b12
Modify editamolecule to load GWT scripts dynamically
2013-02-06 17:40:44 -05:00
Victor Shnayder
0dd9c24e74
Merge pull request #1447 from MITx/debug/dave/pearson_js_error
...
Throw the error back up if we don't have a console to log it to.
2013-02-06 14:16:44 -08:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
David Ormsbee
e5fda33eff
Throw the error back up if we don't have a console to log it to.
2013-02-06 17:13:22 -05:00
Victor Shnayder
92eb88d464
Merge pull request #1444 from MITx/feature/cale/dev-staticfiles
...
Make local dev work by trying checking staticfiles_storage for both the ...
2013-02-06 14:02:04 -08:00
Vik Paruchuri
463f31618d
Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images
2013-02-06 16:37:52 -05:00
Vik Paruchuri
48719a7a45
Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui
...
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
lms/static/sass/course/_staff_grading.scss
2013-02-06 16:04:01 -05:00
Vik Paruchuri
cf81fb27e8
Add in close date to metadata
2013-02-06 15:55:39 -05:00
Vik Paruchuri
733faebaf0
Fix git issue
2013-02-06 15:28:05 -05:00
Vik Paruchuri
5a51d142bb
Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
2013-02-06 15:26:01 -05:00
Brian Wilson
bfc4527590
Switch timed_module to store location, and use to navigate from timer when timer displays on non-exam course pages.
2013-02-06 15:23:11 -05:00
