Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,481 Commits 1 Branch 0 Tags
39769ea99778dfbb46eb7b17389819c8ebabe9f5
Commit Graph

8481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
39769ea997 allow for optional 'COURSE_DIR' parameter for the import rake target so that we can import only a single course 2013-01-14 22:51:56 -05:00
Chris Dodge
1cb2a6724d add some additional logging for optional verbosity 2013-01-14 22:31:21 -05:00
Chris Dodge
3e736ae9c6 fix crash on command line import when no namespace rename has been given 2013-01-14 22:23:15 -05:00
Chris Dodge
9f73294959 add end_date.html file 2013-01-14 12:23:36 -05:00
Chris Dodge
b5776a775e add another assert test 2013-01-14 12:17:51 -05:00
Chris Dodge
edb913f6ac add tests for about content overrides 2013-01-14 12:12:40 -05:00
Chris Dodge
ac7eceb636 be sure to first import 'extra' course content from base folder as well as a special override folder for the course run 2013-01-14 11:16:48 -05:00
chrisndodge
0919c185f6 Merge pull request #1265 from MITx/bug/dhm/jan13 
Handle metadata from save being empty
 2013-01-11 07:55:51 -08:00
Don Mitchell
c05d887904 Handle metadata from save being empty 2013-01-11 10:39:57 -05:00
chrisndodge
5368a9ad3e Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf 
Decrease the number of queries needed for LMS courseware
 2013-01-11 07:23:00 -08:00
Christina Roberts
4eca8254ae Merge pull request #1264 from MITx/feature/cas/speed-editor 
Cheat sheet for heading and explanation.
 2013-01-11 06:53:26 -08:00
Don Mitchell
26e55f34a4 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-11 09:39:25 -05:00
Christina Roberts
5e28e59817 Merge pull request #1262 from MITx/feature/cas/speed-editor 
explanation markdown
 2013-01-11 06:37:26 -08:00
Don Mitchell
d53ca05d6c Placeholder images for cheat sheet 2013-01-11 09:37:08 -05:00
Don Mitchell
e095a139b9 Cheat sheet updated for header and explanation. Video removed. 2013-01-11 09:36:29 -05:00
Don Mitchell
495814c01a Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-10 17:00:13 -05:00
Don Mitchell
5205ada498 Merge pull request #1261 from MITx/fix/zoldak/studio-toggle-bdd-tests 
Add BDD lettuce tests for studio overview toggle section feature.
 2013-01-10 13:52:55 -08:00
Don Mitchell
c289575b49 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-10 16:40:32 -05:00
Don Mitchell
fa2a243068 Explanation markup 2013-01-10 16:40:05 -05:00
Jay Zoldak
64e8f9c0cd Add BDD lettuce tests for studio overview toggle section feature. 2013-01-10 16:00:40 -05:00
Don Mitchell
c74605abf0 Merge pull request #1258 from MITx/fix/cdodge/export-create-recursive-folders 
the parent directory might not already exist, so we have to call makedir...
 2013-01-10 11:46:21 -08:00
Chris Dodge
dc8f23d6ae the parent directory might not already exist, so we have to call makedir with recursive=true to auto-create any parent folders 2013-01-10 14:41:19 -05:00
Calen Pennington
cb3b17d44c Catch ItemNotFound errors at the top of get_module, rather than in get_module_for_descriptor, to maintain previous LMS behavior 2013-01-10 14:30:12 -05:00
cahrens
708736c42d Unit tests around the save method (xml and markdown). 2013-01-10 14:27:50 -05:00
chrisndodge
010a1f2735 Merge pull request #1257 from MITx/feature/cas/speed-editor 
Feature/cas/speed editor
 2013-01-10 10:58:33 -08:00
Calen Pennington
0726294c35 Use get_child_descriptors for grades.py 2013-01-10 13:55:46 -05:00
Calen Pennington
89a0b82e5c Decrease the number of queries needed for LMS courseware 
This cuts the number of queries in 6.002 courseware loads from ~650 to
~5-40. Still to do: cache CustomTag templates so that we only load them
once per request.
 2013-01-10 13:55:46 -05:00
cahrens
993d59b230 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-10 13:50:57 -05:00
cahrens
58837066b0 A couple renames. 2013-01-10 13:50:21 -05:00
Don Mitchell
70e5344949 Merge pull request #1256 from MITx/fix/cdodge/import-ordering-error 
make sure we commit the course module first when importing. There's a sn...
 2013-01-10 10:40:30 -08:00
Christina Roberts
a7887721af Merge pull request #1255 from MITx/bug/btalbot/unit-editing 
Moving Static Component View Under Modal While Editing
 2013-01-10 10:35:31 -08:00
Chris Dodge
76059b52e7 make sure we commit the course module first when importing. There's a sneaky little ordering dependency where we can't save a static tabe until the course module has been saved. This is because - when saving a static tab - we have to scribble on the course module's metadata to point to it. 2013-01-10 13:24:40 -05:00
Brian Talbot
4128f37a1f studio - moving a component's static view visually below modal while editing 2013-01-10 13:18:26 -05:00
Christina Roberts
e5d73107bd Merge pull request #1254 from MITx/bug/dhm/jan13 
update timepicker to fix minutes bug
 2013-01-10 09:25:38 -08:00
Christina Roberts
b3af587ba0 Merge pull request #1247 from MITx/feature/btalbot/cms-sectiontoggling 
Course Overview Section Collapse/Expand Toggling
 2013-01-10 09:04:26 -08:00
cahrens
bcafc5fdfb Bug fix for modal cover not going way when click outside of edit (#106). 2013-01-10 11:07:11 -05:00
Don Mitchell
04582f4e7c Update timepicker b/c it wasn't handling minutes from 01-09 and they'd 
fixed it
 2013-01-10 11:05:14 -05:00
chrisndodge
ee9b9d0422 Merge pull request #1249 from MITx/feature/cas/speed-editor 
Feature/cas/speed editor
 2013-01-09 17:52:46 -08:00
chrisndodge
171d4c34b0 Merge pull request #1250 from MITx/bug/dhm/jan13 
Fixed time picker race condition for grace period. Still quirky in that
 2013-01-09 17:39:02 -08:00
Don Mitchell
96a7db62cd Fixed time picker race condition for grace period. Still quirky in that 
in rounds down times from :01-:09 to :00 (and perhaps others). I think
that's a bug or setting in timepicker.
 2013-01-09 17:55:02 -05:00
Don Mitchell
d1c888b119 Put init code in a document ready event handler. 2013-01-09 16:37:45 -05:00
Don Mitchell
7f836e77a7 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 16:28:36 -05:00
Don Mitchell
35e353e06b Oops, xxp was going to (x) xp :-( now ( ) xxp :-) 2013-01-09 16:28:25 -05:00
cahrens
2caa5a518f Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 16:20:51 -05:00
cahrens
b3d168b6f2 Make editor names consistent. 2013-01-09 16:20:38 -05:00
Christina Roberts
700ae5bf53 Merge pull request #1248 from MITx/fix/cdodge/discussion-boards 
change over the 'get all discussion models' to use get_items() which is ...
 2013-01-09 13:19:00 -08:00
Don Mitchell
603c6ce296 Get rid of extra space at beginning of markdown for templates 2013-01-09 16:17:58 -05:00
Chris Dodge
d4f30b378e remove commented out line and add a new comment. also remove debugging trace output 2013-01-09 16:05:09 -05:00
Don Mitchell
d0e06e1a35 With improved unit tests to test machavellian (sic) patterns 2013-01-09 16:03:09 -05:00
Chris Dodge
e11706ef07 change over the 'get all discussion models' to use get_items() which is better supported in Mongo-backed stores 2013-01-09 15:53:22 -05:00