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

8411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
67b72a92bc Merge remote-tracking branch 'origin/feature/cas/speed-editor' into feature/cas/speed-editor 2013-01-09 10:50:16 -05:00
cahrens
5daa6e7b73 Tom cruft to be deleted. 2013-01-09 10:49:59 -05:00
Don Mitchell
b8f530e865 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 10:49:20 -05:00
Don Mitchell
2d8ddb0dcb Ever slightly more rigorous test. actually look for the markdown field 
in the model as well as the ancillary info
 2013-01-09 10:47:03 -05:00
cahrens
d53669fcb9 Merge branch 'feature/cale/cms-master' into feature/cas/speed-editor 2013-01-09 09:41:35 -05:00
cahrens
b704645f99 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-09 09:40:34 -05:00
cahrens
b97955965a Warn user when going to XML Editor. Cleanup and comments. 2013-01-09 09:39:46 -05:00
Don Mitchell
21f5c2d89a Merge pull request #1240 from MITx/feature/zoldak/cms-bdd-testing 
Set up the framework for running lettuce tests against studio
 2013-01-09 06:30:03 -08:00
chrisndodge
2b87940828 Merge pull request #1241 from MITx/bug/dhm/jan13 
Fix iframe conversion problem (111)
 2013-01-09 06:14:27 -08:00
chrisndodge
21fc7340d6 Merge pull request #1243 from MITx/fix/cdodge/missing-setting-for-cms 
add required video setting
 2013-01-09 06:12:50 -08:00
Chris Dodge
b8074b8bb4 add required video setting 2013-01-09 09:11:43 -05:00
Brian Talbot
2a1e102fca studio - resolving merge conflict with cms/templates/unit.html 2013-01-09 08:56:58 -05:00
Brian Talbot
f60a9d8d35 studio - problem speed editor: tweaking presentation of problem sub menu further 2013-01-09 08:54:40 -05:00
Don Mitchell
83b7997d12 Added unit tests and generalized a catch 2013-01-08 16:43:42 -05:00
Brian Talbot
75447eb80d studio - problem speed editor: revised html and DOM for problem sub menu 2013-01-08 15:43:02 -05:00
cahrens
c7feee5b67 Delete speed-editor.js and cruft from unit.html. 2013-01-08 15:39:45 -05:00
Don Mitchell
1708dc4080 Use html rather than xml parsing for course updates 2013-01-08 15:13:37 -05:00
cahrens
4ac15daf44 Fix formatting. 2013-01-08 15:04:48 -05:00
cahrens
94696786c0 Merge in Don's change. 2013-01-08 14:57:15 -05:00
cahrens
f616aecd81 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 
Conflicts:
	common/lib/xmodule/xmodule/js/src/problem/edit.coffee
 2013-01-08 14:56:59 -05:00
Jay Zoldak
f056f0624d Set up the framework for running lettuce tests against studio 2013-01-08 14:44:45 -05:00
cahrens
bc10d080df Save work 2013-01-08 13:39:16 -05:00
Don Mitchell
ae4e7815a9 CapaDescriptor new unit tests 2013-01-08 13:16:38 -05:00
chrisndodge
7377f4bda3 Merge pull request #1238 from MITx/fix/cdodge/turn-of-module-wrappers 
make sure we turn off module wrappers for the 'ancillary' course content
 2013-01-08 08:25:53 -08:00
Don Mitchell
6e2b4a07d8 Added is_empty to model presented to unit.html 2013-01-08 11:18:57 -05:00
Chris Dodge
99750a6812 make sure we turn off module wrappers for the 'ancillary' course content 2013-01-08 11:18:41 -05:00
Don Mitchell
76f2ef6f7c Empty template now recognized as allowing markdown editing 
Save saves markdown and updates the xml
 2013-01-08 10:53:45 -05:00
Don Mitchell
ca32a8b0c0 Merge pull request #1237 from MITx/fix/cdodge/return-bad-request 
be sure to return an instance of the class
 2013-01-07 13:49:11 -08: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
Chris Dodge
c7d81cc425 be sure to return an instance of the class 2013-01-07 16:28:30 -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
82b48dd20b put back in .gitmodules which got accidentally deleted 2013-01-07 12:43:18 -05: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
Jay Zoldak
0e9cf17b82 Merge pull request #1232 from MITx/feature/christina/misc 
Feature/christina/misc
 2013-01-07 08:43:48 -08:00
cahrens
c443cd83fa Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-07 11:17:05 -05:00
Don Mitchell
12abdbce73 Added 'has_markdown' property to templates in unit.html so that we can 
differentiate them in the drop down (just added MD to names for
now--brian's doing the official differentiation)
 2013-01-07 10:55:10 -05:00
cahrens
b108435a32 Make xmodule Jasmine tests fail build. 2013-01-07 10:51:32 -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