Calen Pennington
330a2eac80
Don't break the course if the grading policy is broken
2013-01-14 13:18:54 -05:00
Calen Pennington
95478922d0
Whitespace fixes
2013-01-14 13:18:54 -05:00
Calen Pennington
86be73f6a2
Make errors during course loading not break the site, but just hide that course instead
2013-01-14 13:16:22 -05:00
Calen Pennington
f91a5f0e23
Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes
...
Fix/cdodge/filesystem xml fixes
2013-01-14 09:34:25 -08: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
Brian Talbot
1cf5e10a34
revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet
2013-01-13 12:47:30 -05:00
Brian Talbot
04e9447367
added in icons for header and explanation markdown elements
2013-01-13 12:15:29 -05:00
Don Mitchell
033264b58d
Change case of Explanation to match markdown (although it's functionally
...
equivalent)
2013-01-11 16:57:00 -05:00
Don Mitchell
7d8276b6c5
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 16:52:10 -05:00
cahrens
a4b6851e6c
Remove some dead css.
2013-01-11 16:11:09 -05:00
Don Mitchell
ab7be1a6e0
Unit tests
2013-01-11 15:22:30 -05:00
Don Mitchell
5920142f71
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 15:05:30 -05:00
Don Mitchell
755bf709a5
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-11 14:44:38 -05:00
Chris Dodge
9479ef3c84
fix up call signatures for get_parent_locations()
2013-01-11 14:29:53 -05:00
Brian Talbot
7d445f5630
studio - tweaking problem editor's advanced editor toggle control UI and prompt message
2013-01-11 14:25:22 -05:00
Chris Dodge
08adf9c0d5
Merge branch 'master' into feature/cdodge/cms-master-merge3
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/search.py
common/lib/xmodule/xmodule/modulestore/xml.py
doc/development.md
lms/envs/common.py
2013-01-11 14:04:46 -05:00
Chris Dodge
476e6c7b3b
need to add the depth parameter to the DraftMongoStore implementation of get_instance
2013-01-11 11:57:41 -05:00
Don Mitchell
64507bd5fd
Drop down for markup done but w/o new icons
2013-01-11 10:36:42 -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
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
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
Carlos Andrés Rocha
8f21d7a738
Add property to course module to check if a course is new
...
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.
Also adds a property to check how many days are left until the course starts.
2013-01-10 15:57:29 -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
cahrens
708736c42d
Unit tests around the save method (xml and markdown).
2013-01-10 14:27:50 -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
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
chrisndodge
ee9b9d0422
Merge pull request #1249 from MITx/feature/cas/speed-editor
...
Feature/cas/speed editor
2013-01-09 17:52:46 -08: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
Don Mitchell
603c6ce296
Get rid of extra space at beginning of markdown for templates
2013-01-09 16:17:58 -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
Don Mitchell
373c8eb2a7
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 15:36:28 -05:00
Don Mitchell
8245ebac83
On menu based markdown conversion,
...
be picky about x as marker for correct requiring it to be first
non-whitespace char on line, followed by whitespace, followed eventually
but another non-whitespace char
strip trailing newline from selection.
2013-01-09 15:36:16 -05:00
cahrens
914132f802
remove tiny mce link CSS
2013-01-09 15:10:41 -05:00
cahrens
1252181fe1
Code review cleanup.
2013-01-09 14:11:13 -05:00
Don Mitchell
144c6bca8b
Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor
2013-01-09 11:38:23 -05:00
Don Mitchell
fff9afdeb8
Minor cleanups
2013-01-09 11:38:01 -05:00
cahrens
64387a4f0c
Tom cruft to be deleted, problem editor CSS moved to correct location.
2013-01-09 11:06:18 -05:00
Chris Dodge
9b72d11473
add some comments to the change
2013-01-09 10:47:29 -05:00
Chris Dodge
fd600e5be2
add some simple in-mem caching for course TOC. This is a problem when running against Mongo since courses are created/disposed very frequently
2013-01-09 10:38:32 -05:00
cahrens
d53669fcb9
Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor
2013-01-09 09:41:35 -05:00
cahrens
b97955965a
Warn user when going to XML Editor. Cleanup and comments.
2013-01-09 09:39:46 -05:00
Calen Pennington
5a95dd28b1
Merge pull request #1227 from MITx/feature/ichuang/fix-capa-contextualize-text-for-option-response-and-mc
...
fix capa to add contextualize_text for optionresponse and multiplechoice
2013-01-09 06:08:45 -08:00
David Ormsbee
1122cdb286
Added more comments in response to code review.
2013-01-08 16:37:31 -05:00
