Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

10188 Commits

This Branch
This Branch
All Branches
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
2551243dfa Install the static_replace app for the management command 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
5eae9c3a40 Make lms and cms coverage reports cover common/djangoapps 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
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
Vik Paruchuri
e8a690df5e Update peer grading tests 2013-02-05 10:46:00 -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
Diana Huang
f3be02d772 Merge branch 'master' into diana/rubric-ui-improvements 2013-02-05 09:13:14 -05:00
Diana Huang
4bb4c458a8 Merge branch 'master' into feature/diana/close-oe-problems 2013-02-05 09:12:08 -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
Your Name
837f54c055 inline cohorting almost done 2013-02-04 20:10:08 -05:00
ichuang
8ff3dde605 for require_attempted display "attempted" instead of "completed" 2013-02-04 19:54:36 -05:00
Vik Paruchuri
443c3eda4f Tests for peer grading service may be fixed. 2013-02-04 18:37:28 -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
Vik Paruchuri
18814196f0 Make things slightly robust 2013-02-04 18:31:32 -05:00
Victor Shnayder
b6614f6939 add initial test that only tests the descriptor 2013-02-04 18:28:22 -05:00
Vik Paruchuri
725f0c632c Remove get statements, fix module_render 2013-02-04 18:27:25 -05:00
Vik Paruchuri
009a8c5f63 Fix issue with passing rubric scores back to controller 2013-02-04 18:17:23 -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
Vik Paruchuri
bf97a6a9a9 Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule 
Conflicts:
	lms/djangoapps/open_ended_grading/peer_grading_service.py
 2013-02-04 17:55:55 -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
Vik Paruchuri
5d8aade8e7 Explain django settings imports 2013-02-04 16:57:09 -05:00
Vik Paruchuri
c4c674367f Remove unneccesary imports 2013-02-04 16:54:36 -05:00
Vik Paruchuri
83b7533a12 Fix CSS to fit all elements on the page 2013-02-04 16:49:32 -05:00
Vik Paruchuri
cbd0895aad Add in single peer grading problem view 2013-02-04 16:42:14 -05:00
Your Name
a8a9975914 Merge branch 'feature/kevin/groups_ui_changes' of github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-02-04 16:40:22 -05:00
Your Name
6e8e74aaf5 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-02-04 16:32:04 -05:00