cahrens
a4196ffa00
Relative path seems to work.
2013-01-17 21:15:38 -05:00
cahrens
8cca193903
Add a comment.
2013-01-17 21:06:05 -05:00
cahrens
a1bb533b60
Workaround for sandbox.
2013-01-17 21:04:17 -05:00
cahrens
77865f7ab2
Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce
2013-01-17 14:22:18 -05:00
cahrens
5f05ec83f1
Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly.
2013-01-17 13:11:47 -05:00
Chris Dodge
fe964ec8ba
disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate
2013-01-17 13:11:16 -05:00
cahrens
b6fcf3a51e
Some refactoring from Brian's submission.
2013-01-17 10:36:04 -05:00
chrisndodge
358c56da9e
Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes
...
Fix/cdodge/filesystem xml fixes
2013-01-17 05:55:22 -08:00
Brian Talbot
f34fd5c426
studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js
2013-01-16 16:55:11 -05:00
cahrens
bc80779f6f
Fix bug related to creation of thumbnails for non-image files.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
2013-01-16 15:40:14 -05:00
Brian Talbot
e8ba078d4e
studio HTML editor - codemirror/tinymce toggle work - wip
2013-01-16 14:54:28 -05:00
cahrens
cc5a5e2996
Fix multiple choice checkbox.
...
#117
2013-01-16 12:52:05 -05:00
Brian Talbot
ed6134ea11
abstracted out common editor styles shared by problem and html editors
2013-01-15 14:14:31 -05:00
Brian Talbot
623769e9d8
separated common editor UI from problem and HTML editor SCSS - wip
2013-01-15 09:57:48 -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
cahrens
1f681b4dcf
Visual Editor work.
2013-01-14 15:41:13 -05:00
cahrens
29f49895d3
Pretty much works.
2013-01-14 15:41:12 -05:00
cahrens
db9875758f
Saving work.
2013-01-14 15:41:12 -05:00
cahrens
c4ec8ead4a
Work in progress, related to rich HTML editor.
2013-01-14 15:41:12 -05:00
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
