David Ormsbee
b947b88453
Merge pull request #1460 from MITx/fix/cdodge/remove-csrf-cookie-domain
...
remove CSRF cookie domain setting in aws.py
2013-02-07 08:17:34 -08:00
Chris Dodge
0394e33652
remove CSRF cookie domain setting in aws.py
2013-02-07 11:15:23 -05:00
Vik Paruchuri
c195fe65cd
Restyle rubric list, submission container
2013-02-07 11:10:29 -05:00
Brian Talbot
903115d6a9
studio - soft landing: refined user icon vs. dropdown icon styles
2013-02-07 11:07:18 -05:00
Christina Roberts
bfb411ad3a
Merge pull request #1459 from MITx/bug/bug161
...
Put DnD back into edit_subsection page
2013-02-07 07:46:37 -08:00
Don Mitchell
70560d2237
Put DnD back into edit_subsection page
2013-02-07 10:41:37 -05:00
Vik Paruchuri
198885f7e0
Move elements around, do some restyling
2013-02-07 10:40:15 -05:00
Vik Paruchuri
aa699905d6
Feedback and view only rubric restyle
2013-02-07 10:32:39 -05:00
Chris Dodge
faf7c64ea5
add try/catch and fallback to returning a path to the root of the course
2013-02-07 10:32:13 -05:00
Vik Paruchuri
f22849ebdd
Re-arrange feedback, fix rubric HTML issue
2013-02-07 10:29:58 -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
Brian Talbot
5674dd19c4
studio - soft landing and nav: slight visual tweaks to soft landing UI and added in support link + new tab/window and modal management JS
2013-02-07 09:58:52 -05:00
Vik Paruchuri
de8e1e9472
Change around some names, restyle rubric
2013-02-07 09:57:41 -05:00
Don Mitchell
277bd0dba6
Documentation update
2013-02-07 09:50:16 -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
ichuang
bf17341fdb
add select_related("profile")
2013-02-06 23:16:44 -05:00
David Ormsbee
a6b35853f9
Merge pull request #1455 from MITx/hotfix/dave/youtube_object
...
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 19:47:25 -08:00
David Ormsbee
976776643b
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 22:46:22 -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
e4819a1b55
Merge pull request #1452 from MITx/silly/victor/revert-forums-merge
...
Silly/victor/revert forums merge
2013-02-06 17:41:14 -08: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
884a7a61b9
Revert "Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 965e3b4c491a7d2a06a8
2013-02-06 20:27:01 -05:00
Victor Shnayder
b6ec41cae0
Merge pull request #1432 from MITx/7012x-clean
...
7012x clean
2013-02-06 15:58:29 -08: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
Victor Shnayder
2c1f3bd470
Merge pull request #1449 from MITx/fix/rocha/7012x-clean
...
Fix/rocha/7012x clean
2013-02-06 15:50:27 -08:00
Victor Shnayder
965e3b4c49
Merge pull request #1450 from MITx/feature/kevin/groups_ui_changes
...
addressed somme comments in pull request and instructor fixes and blank ...
2013-02-06 15:40:33 -08:00
Carlos Andrés Rocha
536333cbb5
Refactor how editamolecule displays messages
2013-02-06 18:31:00 -05:00
Kevin Chugh
1dd0ef274d
addressed somme comments in pull request and instructor fixes and blank group fix
2013-02-06 18:26:41 -05:00
