Victor Shnayder
|
d7570de5d7
|
Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display
fix bug in conditional - videos were not playing, because a js function changed syntax
|
2013-02-04 14:14:18 -08:00 |
|
ichuang
|
0c07f03d68
|
XModule.loadModules only takes @el as argument now
|
2013-02-04 17:04:39 -05:00 |
|
Christina Roberts
|
2306e7c1e8
|
Merge pull request #1417 from MITx/feature/christina/misc2
Try, try again.
|
2013-02-04 12:56:26 -08:00 |
|
Christina Roberts
|
43c2acdb1f
|
Merge pull request #1416 from MITx/feature/dhm/dnd
Brian's CSS updates.
|
2013-02-04 12:50:36 -08:00 |
|
cahrens
|
aac179f135
|
Try, try again.
|
2013-02-04 15:48:05 -05:00 |
|
Sarina
|
25bede9005
|
Merge pull request #1414 from MITx/feature/victor/showanswer-past-due
Feature/victor/showanswer past due
|
2013-02-04 12:39:13 -08:00 |
|
Victor Shnayder
|
fe42d8e9a8
|
fix typo, add comment
|
2013-02-04 15:04:20 -05:00 |
|
Brian Talbot
|
ffd585ae56
|
studio - resolved safari/webkit display issue with unit editing window's wrapper background color
|
2013-02-04 14:44:17 -05:00 |
|
Brian Talbot
|
6ca55b8458
|
studio - overview drag and drop: removed unused scss and hid new unit button while dragging
|
2013-02-04 14:35:04 -05:00 |
|
Christina Roberts
|
517f756ffa
|
Merge pull request #1413 from MITx/feature/christina/misc2
See if this helps with the tab-changing race condition.
|
2013-02-04 10:34:37 -08:00 |
|
cahrens
|
39479d9e18
|
See if this helps with the tab-changing race condition.
|
2013-02-04 13:28:34 -05:00 |
|
Christina Roberts
|
be5dd6d25a
|
Merge pull request #1411 from MITx/feature/dhm/dnd
Attempt to patch the dnd hesitation fixes onto master
|
2013-02-04 09:29:07 -08:00 |
|
Victor Shnayder
|
486e747b18
|
Merge pull request #1407 from MITx/feature/ichuang/conditional-xmodule-v2
Provides "stop" feature via a new "conditional" XModule
|
2013-02-04 09:20:07 -08:00 |
|
jarv
|
723f47f4cc
|
Merge pull request #1412 from MITx/feature/jarv/service-variant-default
Defaulting service_variant to a blank string
|
2013-02-04 09:06:24 -08:00 |
|
Don Mitchell
|
902cdefefa
|
Added comments for unused 2nd arg on generateCheckHoverState
|
2013-02-04 12:05:49 -05:00 |
|
John Jarvis
|
7c39e38539
|
Defaulting service_variant to a blank string
|
2013-02-04 12:05:45 -05:00 |
|
Don Mitchell
|
50eced5b32
|
Attempt to patch the dnd hesitation fixes onto master
|
2013-02-04 11:34:59 -05:00 |
|
Christina Roberts
|
a6e0fb91ef
|
Merge pull request #1406 from MITx/bug/bug152
Move dnd code from base.js to a js file only loaded by overview.html
|
2013-02-04 06:19:17 -08:00 |
|
ichuang
|
e59b0b87b1
|
add docs for conditional module; clean up a bit more
|
2013-02-03 21:07:23 -05:00 |
|
ichuang
|
4446ddb292
|
cleaned up conditional module a bit; add test for conditional module
|
2013-02-03 20:59:05 -05:00 |
|
ichuang
|
95ef12169a
|
extend conditional module to add require_attempted
|
2013-02-03 18:53:51 -05:00 |
|
ichuang
|
1d29e1f2f4
|
comment out some debug in conditional_module; leave undeleted for future tests
|
2013-02-03 18:53:51 -05:00 |
|
ichuang
|
363ca7031e
|
add coffeescript/js for conditional module, does XModule.loadModules
|
2013-02-03 18:53:51 -05:00 |
|
ichuang
|
19051e40d2
|
use ajax for doing conditional_module
|
2013-02-03 18:53:51 -05:00 |
|
ichuang
|
8db96abb18
|
conditional_module.html
|
2013-02-03 18:53:51 -05:00 |
|
ichuang
|
95b8134731
|
initial implementation of conditional_module; doesn't load dynamically yet
|
2013-02-03 18:53:51 -05:00 |
|
VikParuchuri
|
01fab2ec68
|
Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes
Feature/vik/combined xmodule changes
|
2013-02-01 15:46:33 -08:00 |
|
Vik Paruchuri
|
9310dcbe0d
|
Remove reload test
|
2013-02-01 18:31:50 -05:00 |
|
Don Mitchell
|
1595bd9b0e
|
Move dnd code from base.js to a js file only loaded by overview.html
|
2013-02-01 17:20:58 -05:00 |
|
Vik Paruchuri
|
b609bbeeed
|
Fix JS tests
|
2013-02-01 15:36:05 -05:00 |
|
John Jarvis
|
1c09d9cacb
|
For prod environments only log info and up
|
2013-02-01 13:34:29 -05:00 |
|
John Jarvis
|
f525b17b1a
|
pep8 cleanup
|
2013-02-01 13:13:16 -05:00 |
|
John Jarvis
|
8b01298969
|
Removing duplicate loggers
|
2013-02-01 13:11:14 -05:00 |
|
John Jarvis
|
4a08bc7759
|
Adding service_variant and a little pep8 cleanup
|
2013-02-01 13:10:26 -05:00 |
|
Ned Batchelder
|
6b6d8a94d0
|
Don't use PyYAML's .load() for reading YAML, use .safe_load() to avoid security problems.
|
2013-02-01 10:50:01 -05:00 |
|
Christina Roberts
|
14ca42a5dc
|
Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists
temporary style sync up for course info lists
|
2013-02-01 06:51:35 -08:00 |
|
Calen Pennington
|
dce65f2ab7
|
Merge pull request #1404 from MITx/feature/edz/service-variant
service variant code for loading different config
|
2013-02-01 06:49:51 -08:00 |
|
Brian Talbot
|
61de4c028a
|
temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog)
|
2013-02-01 09:41:51 -05:00 |
|
Vik Paruchuri
|
c4b9288c6d
|
Add comment describing why commented out code is there
|
2013-02-01 09:32:29 -05:00 |
|
Vik Paruchuri
|
78dda49764
|
Fix jasmine tests?
|
2013-02-01 09:28:52 -05:00 |
|
e0d
|
969737c58e
|
service variant code for loading different config
|
2013-01-31 21:43:35 -05:00 |
|
David Ormsbee
|
a89503431f
|
Merge pull request #1403 from MITx/style/btalbot/lms-calendartables
lms - syllabus/calendar table styling fixes
|
2013-01-31 15:17:38 -08:00 |
|
Brian Talbot
|
f6cd4c75b8
|
lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling
|
2013-01-31 18:15:20 -05:00 |
|
Vik Paruchuri
|
c5e80b9543
|
Fix open ended module tests
|
2013-01-31 17:34:33 -05:00 |
|
Vik Paruchuri
|
d6f8def733
|
Move over rubric parsing logic to rubric module
|
2013-01-31 17:18:32 -05:00 |
|
Vik Paruchuri
|
b22bad7fa1
|
Add in some removed imports (fix tests)
|
2013-01-31 17:11:44 -05:00 |
|
Vik Paruchuri
|
5eff483c76
|
Fix max score in combined xmodule tests
|
2013-01-31 17:08:13 -05:00 |
|
Vik Paruchuri
|
524047a11e
|
Fix key error in open ended child
|
2013-01-31 17:06:37 -05:00 |
|
Vik Paruchuri
|
01cdc6e7f8
|
Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
Conflicts:
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
|
2013-01-31 16:50:10 -05:00 |
|
Don Mitchell
|
aad5015a82
|
Merge pull request #1398 from MITx/feature/christina/misc2
Fixes date bug (#149).
|
2013-01-31 10:59:07 -08:00 |
|