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

2080 Commits

Author SHA1 Message Date
cahrens
b3d168b6f2 Make editor names consistent. 2013-01-09 16:20:38 -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
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
cahrens
94696786c0 Merge in Don's change. 2013-01-08 14:57:15 -05:00
cahrens
bc10d080df Save work 2013-01-08 13:39:16 -05:00
Don Mitchell
735aa13496 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 16:48:57 -05:00
Don Mitchell
e46a76da98 xml conversion unit tests plus a fix to the conversion which they 
brought to light
 2013-01-07 16:48:42 -05:00
cahrens
5711a9af68 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 15:32:39 -05:00
cahrens
d7b05e485d Add insertion of problem types. 2013-01-07 15:32:11 -05:00
Don Mitchell
d8d4c37331 Yaml files now generate markdown in a readable and xml convertable 
format. The xml converter works.
 2013-01-07 13:57:21 -05:00
chrisndodge
791c00cd7b Merge pull request #1233 from MITx/feature/cdodge/cms-master-merge2 
Feature/cdodge/cms master merge2
 2013-01-07 09:57:33 -08:00
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Don Mitchell
9dad3ba90d Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 12:33:55 -05:00
Don Mitchell
c2f0ea49bd Hopefully fixed yamls for markdown 2013-01-07 12:32:54 -05:00
cahrens
75b9740932 Update for Don's change. 2013-01-07 12:08:34 -05:00
cahrens
e296d52c7d merge 2013-01-07 12:06:12 -05:00
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
9ec658cf7d Skip tests that aren't passing. This is a few capa test points, all of sequence, and all video tests. 2013-01-07 10:25:42 -05:00
cahrens
534c294e08 Merge branch 'feature/cale/cms-master' into feature/christina/misc 2013-01-07 09:59:42 -05:00
cahrens
ab1173cfdc Merge with cms-master. 2013-01-07 09:59:08 -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
Chris Dodge
1d7baccb38 add info-icon.png 2013-01-04 11:41:16 -05:00
Chris Dodge
349fd89eb8 fix tests on merge 2013-01-04 10:32:31 -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