Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9,830 Commits 1 Branch 0 Tags
f1f2bd8fd25b75fbc3dd62f7f0fa2aaccbc2eaba
Commit Graph

9830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
f1f2bd8fd2 Start adding tests for static replacement 2013-02-05 11:06:46 -05:00
Calen Pennington
401f564e6a Fix data directory passed to replace_static_urls 2013-02-05 11:06:46 -05:00
Calen Pennington
ba7bd9022b Replace the correct /course/ urls, rather than /courses/ 2013-02-05 11:06:46 -05:00
Calen Pennington
0da1467a90 Pull out missing variable 2013-02-05 11:06:46 -05:00
Calen Pennington
88fc2e3756 Fix unbalanced paren in regex 2013-02-05 11:06:45 -05:00
Calen Pennington
04879a83d3 Rejigger how /course and /static urls are replaced, to make the logic slightly more comprehensible 2013-02-05 11:06:45 -05:00
Calen Pennington
b05ead864f Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"" 
This reverts commit c4f56620df.
 2013-02-05 11:06:45 -05:00
Don Mitchell
82b2dc7193 Merge pull request #1427 from MITx/feature/christina/misc2 
Do not do finds within the event method. Decreases likelihood of hitting...
 2013-02-05 07:19:40 -08:00
cahrens
286616e659 Do not do finds within the event method. Decreases likelihood of hitting bug in older versions of Chrome. 
https://edx.lighthouseapp.com/projects/102637/tickets/153
 2013-02-05 09:50:34 -05:00
David Ormsbee
ecce3e5761 Merge pull request #1426 from MITx/debug/dave/sass 
Comment out YUI compressor (cause *something* is still causing CSS compression)
 2013-02-05 05:59:59 -08:00
David Ormsbee
818cd3aa48 Comment out YUI compressor (cause *something* is still causing CSS compression) 2013-02-05 08:58:59 -05:00
Victor Shnayder
2ab3d1b167 Merge pull request #1425 from MITx/feature/ichuang/conditional-module-text-improvement 
for conditional require_attempted display "attempted" instead of "completed"
 2013-02-04 18:54:56 -08:00
ichuang
8ff3dde605 for require_attempted display "attempted" instead of "completed" 2013-02-04 19:54:36 -05:00
Victor Shnayder
82afc477fa Merge pull request #1396 from MITx/feature/victor/randomization 
Feature/victor/randomization
 2013-02-04 15:37:07 -08:00
Victor Shnayder
b6614f6939 add initial test that only tests the descriptor 2013-02-04 18:28:22 -05:00
David Ormsbee
fae51815d8 Merge pull request #1420 from MITx/debug/dave/sass 
Force it to do expanded mode, because it's still generating compressed CSS output
 2013-02-04 15:04:03 -08:00
David Ormsbee
aeaad6f58d Force it to do expanded mode, because it's still generating compressed CSS output 2013-02-04 18:03:05 -05:00
Diana Huang
fb777de18d Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging 
Feature/vik/peer grading flagging
 2013-02-04 14:45:59 -08:00
Vik Paruchuri
1dab4aba96 Fix accidental commit of dev.py 2013-02-04 17:44:09 -05:00
Vik Paruchuri
e8803985f2 Fix JS on after event handling 2013-02-04 17:41:44 -05:00
David Ormsbee
4999a8e95f Merge pull request #1419 from MITx/debug/dave/sass 
Remove compressed flag from SASS call in pipeline so we can diff the gen...
 2013-02-04 14:36:31 -08:00
David Ormsbee
9f634aba3c Remove compressed flag from SASS call in pipeline so we can diff the generated CSS 2013-02-04 17:33:26 -05:00
Vik Paruchuri
d89ab000d2 Fix a function call 2013-02-04 17:30:45 -05:00
Vik Paruchuri
f019225d16 Fix reloading 2013-02-04 17:23:34 -05:00
Vik Paruchuri
eb049bda9e Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging 2013-02-04 17:18:59 -05:00
Vik Paruchuri
7f96fbb3d1 Address review comments 2013-02-04 17:15:07 -05:00
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
Vik Paruchuri
8bd7b60aca Add in key to mock peer grading service 2013-02-04 10:50:07 -05:00
Vik Paruchuri
c991c0489c Fix open ended test with flagging 2013-02-04 10:26:25 -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