Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,905 Commits 1 Branch 0 Tags
be07c7f86f5ef48414020a08e5dfddec4f22cada
Commit Graph

1501 Commits

Author SHA1 Message Date
cahrens
be07c7f86f Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 12:01:54 -05:00
cahrens
bf2a945a6c Starting to add toolbar items. 2013-01-07 12:01:12 -05:00
Don Mitchell
42246142dd Numerical response now works and round tripping works. 2013-01-07 11:50:37 -05:00
cahrens
4740965413 Skip tests instead of commenting them out (for merge that is coming). 2013-01-07 10:49:10 -05:00
cahrens
05428f5b07 Comment out markdown in optionresponse.yaml, hook up toXML method. 2013-01-05 15:08:09 -05:00
cahrens
164d8a50f1 Move toXML code into edit.coffee, create unit test scaffolding. 2013-01-05 14:39:58 -05:00
cahrens
96bad91353 Comment out Jasmine tests that are failing. 2013-01-05 14:07:34 -05:00
cahrens
65ee5105e2 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-05 13:16:44 -05:00
Don Mitchell
2e527a6ae0 Fixed all regex's in toXml (I hope) and added 2 markdown templates 2013-01-04 17:15:44 -05:00
cahrens
2859cfddd0 minor cleanup 2013-01-04 12:37:00 -05:00
cahrens
ecfc96c73b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-04 09:57:15 -05:00
cahrens
e017363ae1 Tabs now showing. 2013-01-04 09:56:52 -05:00
Don Mitchell
591f1be8ba Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-04 09:51:47 -05:00
Don Mitchell
d99e7f5d33 Supports markdown 2013-01-04 09:51:36 -05:00
cahrens
5493fd586a Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-04 09:05:09 -05:00
cahrens
6d732c217b Tabs now showing. 2013-01-04 09:04:27 -05:00
Don Mitchell
7dfa4e2cba Tabla rasa problem for expert authors 2013-01-03 17:20:40 -05:00
Don Mitchell
3e16e4cf5f Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 14:43:00 -05:00
Don Mitchell
ac5b48e827 Treat metadata['markdown'] as not key/value editable but still 
persistable.
 2013-01-03 14:42:40 -05:00
cahrens
533f4876b5 Rename, add css file. 2013-01-03 14:27:32 -05:00
cahrens
8dd02c7ec7 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 14:11:58 -05:00
cahrens
f443c66bcd Rename, add css file. 2013-01-03 14:11:53 -05:00
Don Mitchell
d11243578b Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-03 13:50:16 -05:00
Don Mitchell
63791b2a6b Numerical response template has markdown init 2013-01-03 13:46:45 -05:00
cahrens
b4312cbfef Starting the markdown editor. 2013-01-03 13:39:01 -05:00
Don Mitchell
f3ba15731c Cache to swap branches 2013-01-03 13:04:30 -05:00
cahrens
e09a8e4a9b Don't show markdown if it doesn't exist. 2013-01-03 12:50:38 -05:00
Don Mitchell
47ca316d25 populate markdown into problem editor template 2013-01-03 12:02:45 -05:00
Don Mitchell
4e9d5c8a6a Placeholders for markdown editor js and reference to pull it in from 
CapaDescriptor. Overrode XMLEditorDescription
 2013-01-03 11:15:06 -05:00
Don Mitchell
31141299e8 Cache to pull CR's cleanup of branch 2013-01-03 11:00:41 -05:00
Chris Dodge
c0f12e69f7 fixes on the export. There's some attributes not being handled correctly 2012-12-27 16:15:52 -05:00
Chris Dodge
625237601f Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/export 
Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
 2012-12-27 14:16:40 -05:00
Don Mitchell
53b73ca3da Merge pull request #1208 from MITx/feature/cdodge/clone-course 
fix up some thumbnail issues. Also we need to manage the user permission...
 2012-12-27 09:26:51 -08:00
Chris Dodge
28d9827468 fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course 2012-12-27 10:20:28 -05:00
Don Mitchell
83bc9d7bf8 Grader unit tests (partial) 2012-12-26 15:48:37 -05:00
Don Mitchell
b65775c300 Merge pull request #1195 from MITx/feature/christina/misc 
Fix typo in Formula Response name (Studio #101).
 2012-12-20 14:15:01 -08:00
cahrens
37b83c1ecf Fix typo in Formula Response name (Studio #101). 2012-12-20 17:06:12 -05:00
Chris Dodge
b40a8a3e9e implement course clone and delete functionality from the command line 2012-12-20 13:55:15 -05:00
chrisndodge
c407012f2d Merge pull request #1168 from MITx/bug/dhm/dec12 
Import default grading_policy was setting it to a unicode empty string
 2012-12-17 10:17:23 -08:00
Calen Pennington
c546c36858 Merge pull request #1147 from MITx/fix/zoldak/cms-jasmine 
Do not copy already compiled coffee to js files from xmodule video and a...
 2012-12-17 09:39:43 -08:00
Don Mitchell
e2526a37d3 Import default grading_policy was setting it to a unicode empty string 
rather than an empty dict and thus screwing up later updates.
 2012-12-17 11:50:40 -05:00
Chris Dodge
d18f42224c fix crash of custom tags when running against Mongo datastores. Mongo's 'system' does not have a course_id attribute defined, which makes it asymmetric to XmlFilesystem store 2012-12-17 10:41:54 -05:00
cahrens
dd7ed956dd Bug fix for Studio #55. 2012-12-14 11:37:45 -05:00
Jay Zoldak
c485e441a9 Do not copy already compiled coffee to js files from xmodule video and also do not save them in git 2012-12-13 14:26:27 -05:00
Chris Dodge
10b417c85e initial checkin of export 2012-12-13 11:53:52 -05:00
chrisndodge
6ab97b6fd9 Merge pull request #1125 from MITx/feature/dhm/cms-settings 
Feature/dhm/cms settings
 2012-12-13 06:52:49 -08:00
Christina Roberts
c87eb08b1e Bug fix for Lighthouse #22. 
html names are automatically converted to the symbols they describe.
 2012-12-12 12:57:31 -05:00
Chris Dodge
95c6719447 initial commit. Add 'import_path' field to the GridFS so that when we export, we know where it originated from 2012-12-12 10:57:06 -05:00
Don Mitchell
0a91a98dd0 Merge remote-tracking branch 'origin/feature/cale/cms-master' into 
feature/dhm/cms-settings

Conflicts:
	cms/djangoapps/contentstore/course_info_model.py
	cms/djangoapps/contentstore/views.py
	cms/static/js/models/course_info.js
	cms/static/js/template_loader.js
	cms/static/js/views/course_info_edit.js
	cms/templates/base.html
	cms/templates/course_info.html
	cms/urls.py
 2012-12-11 10:55:10 -05:00
Don Mitchell
39024a7fee Grading mostly working 2012-12-10 16:32:33 -05:00