Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
19401f29d9 Minor javascript updates 2013-01-08 10:22:07 -05:00
Brian Talbot
b41f68c801 pearson registration - changing registration status states to progress-based states UI - wip 2013-01-07 17:14:11 -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
Diana Huang
3f254fc3c7 Merge branch 'master' into diana/peer-grading-views 2013-01-07 15:57:39 -05:00
Diana Huang
02247172a2 Fix some interstitial page CSS 2013-01-07 15:55:14 -05:00
Diana Huang
bbc5cd50bc Add in default value for MOCK_PEER_GRADING 2013-01-07 15:49:48 -05:00
Diana Huang
b7473f8017 Make mock service return useful data 2013-01-07 15:40:01 -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
Victor Shnayder
1db70050ff Merge pull request #1235 from MITx/fix/zoldak/clarify-doc 
Clarify the syntax of the rake fasttest command
 2013-01-07 12:29:11 -08:00
Jay Zoldak
d3fd6ac151 Clarify the syntax of the rake fasttest command 2013-01-07 15:23:08 -05:00
Brian Talbot
2ec11e5b92 pearson registration - refined error output and accommodation field display toggling 2013-01-07 15:15:50 -05:00
Diana Huang
e1ec4eec71 Get tests to pass by creating a mock peer grading service 2013-01-07 14:46:32 -05:00
Victor Shnayder
e428e9cb2a Merge pull request #1234 from MITx/fix/zoldak/clarify-doc 
Clarify that you need to start up the mongo daemon
 2013-01-07 11:19:27 -08:00
Jay Zoldak
0c6e8c4820 Clarify that you need to start up the mongo daemon 2013-01-07 14:08:18 -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
Carlos Andrés Rocha
60f5089941 Merge pull request #1231 from MITx/content/rocha/job-page-update 
Fix typos in job and faq pages
 2013-01-07 07:31:48 -08: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
Carlos Andrés Rocha
56f1c6aad9 Fixed extra characters in faq page 2013-01-07 10:14:00 -05:00
Robert Chirwa
faa2373256 Fix typo in the job page 
Signed-off-by: Carlos Andrés Rocha <rocha@edx.org>
 2013-01-07 10:08:16 -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
chrisndodge
7ced6b5e68 Merge pull request #1222 from MITx/feature/cale/cms-master-merge 
Feature/cale/cms master merge
 2013-01-07 06:54:57 -08:00
Diana Huang
2293a37f7d Move over old Staff Grading tests to new app. 2013-01-07 09:17:09 -05:00
Brian Talbot
6b8944ad6b studio - section expanding/collapsing UI - wip 2013-01-07 09:07:40 -05:00
Brian Wilson
e57656e24f Add TestCenterExam class to course module, and plumb through. 2013-01-06 17:57:13 -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
ichuang
9a0d85667c symmath use https, no server cert verify 2013-01-05 12:29:03 -05:00
ichuang
bf3669395b update symmath snuggletex server 2013-01-05 12:29:00 -05:00