Calen Pennington
2b637fe511
Fix loads of local static files when running in dev mode
2013-02-07 10:13:53 -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
Victor Shnayder
18ddd1ee56
Merge pull request #1453 from MITx/victor/protex
...
Victor/protex
2013-02-06 18:03:53 -08: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
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
Vik Paruchuri
f568e49265
Fix oe version tests
2013-02-06 15:20:02 -05:00
Diana Huang
f42f84d9e8
Merge pull request #1440 from MITx/diana/rubric-ui-improvements
...
Rubric UI updates
2013-02-06 11:04:44 -08:00
Diana Huang
f3fa438018
Merge branch 'master' into feature/diana/close-oe-problems
...
Conflicts:
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/timeparse.py
2013-02-06 13:26:22 -05:00
Vik Paruchuri
f565d17b4f
Merge branch 'feature/vik/oe-versioning' into fix/vik/peer-grading-images
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-02-06 13:23:31 -05:00
Vik Paruchuri
a0febd35a0
Merge remote-tracking branch 'origin/master' into fix/vik/peer-grading-images
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-02-06 13:22:12 -05:00
Vik Paruchuri
ddda9ba55d
Try to fix tests
2013-02-06 13:19:37 -05:00
Diana Huang
4adf2f6180
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
2013-02-06 13:16:24 -05:00
Vik Paruchuri
96636681e9
Merge remote-tracking branch 'origin/master' into feature/vik/oe-versioning
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
2013-02-06 13:16:02 -05:00
Diana Huang
1f5beba383
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-06 13:12:04 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Jay Zoldak
fde6d1ba1c
Refactor tests for cms contentstore.
2013-02-06 10:42:21 -05:00
Jay Zoldak
2c5a7ccdf7
Rearrange factories and clean up imports
2013-02-06 10:36:28 -05:00
Calen Pennington
2302b40022
Fix static_replace tests
2013-02-06 10:33:36 -05:00
Calen Pennington
96eb16cd72
Make local dev work by trying checking staticfiles_storage for both the course_prefixed and non-course_prefixed urls
2013-02-06 10:08:20 -05:00
Diana Huang
f9304a88cb
Remove unneeded error type.
2013-02-06 09:15:24 -05:00
Victor Shnayder
31b8f0ce7f
Have errors go through jsmolcalc's getInfo
2013-02-05 23:27:52 -05:00
Kevin Chugh
c7a133470d
inline discussions working
2013-02-05 22:43:09 -05:00
Julian Arni
222c01b20b
Removed console logs
2013-02-05 20:15:51 -05:00
John Hess
adb77ea699
hack to fix validation issues
2013-02-05 20:15:51 -05:00
Julian Arni
05e25dadcf
Added validation warnings
2013-02-05 20:15:51 -05:00
Victor Shnayder
02eb55a913
Compiled version of Carlos' merge
2013-02-05 20:15:50 -05:00
Carlos Andrés Rocha
9bc25ff372
Replace editamolecule input type applet with GWT version
2013-02-05 20:15:50 -05:00
