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

2936 Commits

Author SHA1 Message Date
Calen Pennington
0350d15e29 Make static_replace fall back to data_directory prefix, if it doesn't find the file anywhere else 2013-02-05 11:06:46 -05:00
Calen Pennington
90107fa88f Import cache function correctly 2013-02-05 11:06:46 -05:00
Calen Pennington
10f8dbfa46 Handle options passed to clear_collectstatic_cache 2013-02-05 11:06:46 -05:00
Calen Pennington
ae5d3cbc57 Add admin command to flush the staticfiles cache 2013-02-05 11:06:46 -05:00
Calen Pennington
8592db92bf Add more tests of static_replace 2013-02-05 11:06:46 -05:00
Calen Pennington
f1f2bd8fd2 Start adding tests for static replacement 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
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
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
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
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
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
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
John Jarvis
7c39e38539 Defaulting service_variant to a blank string 2013-02-04 12:05:45 -05: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
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
d9517877a4 Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging 2013-02-01 18:32:48 -05:00
Vik Paruchuri
9310dcbe0d Remove reload test 2013-02-01 18:31:50 -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
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
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
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
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