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

8319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
1708dc4080 Use html rather than xml parsing for course updates 2013-01-08 15:13:37 -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
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
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
Chris Dodge
c7d81cc425 be sure to return an instance of the class 2013-01-07 16:28:30 -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
Jay Zoldak
0e9cf17b82 Merge pull request #1232 from MITx/feature/christina/misc 
Feature/christina/misc
 2013-01-07 08:43:48 -08:00
cahrens
b108435a32 Make xmodule Jasmine tests fail build. 2013-01-07 10:51:32 -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
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
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
Carlos Andrés Rocha
d0221808db Merge pull request #1228 from MITx/content/rocha/media-kit 
Add new tab/window behavior to media kit
 2013-01-04 07:07:43 -08:00
Brian Talbot
04524ef58f media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text 2013-01-04 10:02:14 -05:00
Carlos Andrés Rocha
95e7f2f1eb Merge pull request #1226 from MITx/content/rocha/media-kit 
Fix error in one of the media kit assets URLs
 2013-01-03 15:30:08 -08:00
Carlos Andrés Rocha
59f4962cfa Fix error in one of the media kit assets URLs 2013-01-03 18:29:34 -05:00
Carlos Andrés Rocha
c3d7bbe0e0 Merge pull request #1225 from MITx/content/rocha/media-kit 
Minor style changes to home page and media kit page

[Finishes #41872203]
 2013-01-03 15:07:55 -08:00
Carlos Andrés Rocha
25cb6d5a22 Minor style changes to home page and media kit page 
[#41872203]
 2013-01-03 18:06:22 -05:00
David Ormsbee
67dea0c3c3 Merge pull request #1224 from MITx/content/rocha/media-kit 
Add media kit page
 2013-01-03 14:50:57 -08:00
Carlos Andrés Rocha
2e6ac2f72c Fix link to root page on the main page footer 2013-01-03 17:21:54 -05:00
Brian Talbot
a67b54bf82 media kit - added initial styles to media kit page 2013-01-03 17:10:16 -05:00
Brian Talbot
e10e87e6ec media kit - revised link styling on homepage 2013-01-03 14:21:07 -05:00
Carlos Andrés Rocha
bd0a2f6630 Add content and assets for media kit 
[# 41872203]
 2013-01-03 13:28:45 -05:00
David Ormsbee
559bf8874a Merge pull request #1132 from MITx/vik/modify_open_ended 
Vik/modify open ended
 2013-01-03 10:00:31 -08:00
Chris Dodge
0743adb1cd update grade download csv content 2013-01-03 12:58:59 -05:00
Calen Pennington
ecd2304cc9 Merge pull request #1223 from MITx/fix/zoldak/lms-acceptance-testing 
Add splinter to test-requirements.txt
 2013-01-03 09:51:21 -08:00
Jay Zoldak
fd902165c0 Add splinter to test-requirements.txt 2013-01-03 12:34:54 -05:00
Vik Paruchuri
90d902d105 Fix file version 2013-01-03 12:11:27 -05:00
Vik Paruchuri
1af35582fd Merge branch 'master' into vik/modify_open_ended 2013-01-03 12:08:51 -05:00
David Ormsbee
2daddff2ef Merge pull request #1217 from MITx/feature/zoldak/lms-acceptance-testing 
Merge the lettuce acceptance test framework to master
 2013-01-03 09:06:47 -08:00
Vik Paruchuri
b01666f6d6 Fix error messages 2013-01-03 11:52:35 -05:00
Vik Paruchuri
5567477c67 Pass through initial display and answer 2013-01-03 11:52:35 -05:00
Vik Paruchuri
0c3eb67d5c More descriptive error message 2013-01-03 11:52:35 -05:00
Vik Paruchuri
cce6b70103 Fixes to log entire state on errors, format feedback better 2013-01-03 11:52:05 -05:00
Vik Paruchuri
68f0f7e0a8 Handle unicode feedback 2013-01-03 11:50:57 -05:00
Vik Paruchuri
a4eb76017b Display max score as well as score 2013-01-03 11:50:57 -05:00
Vik Paruchuri
9559c7b426 Patch "correct" answer display 2013-01-03 11:50:57 -05:00
Vik Paruchuri
37af39ef8d Change names 2013-01-03 11:50:57 -05:00
Vik Paruchuri
5caa42fbe3 Reset some files 2013-01-03 11:50:57 -05:00
Vik Paruchuri
11c330bf52 Fix rebase issues 2013-01-03 11:50:22 -05:00
Vik Paruchuri
2c469cad75 Wire in submit message 2013-01-03 11:49:01 -05:00
Vik Paruchuri
1ac75b9420 Add in message passing pipeline 2013-01-03 11:47:41 -05:00
David Ormsbee
86247139a9 Merge pull request #1129 from MITx/valera/require-js 
Inclusion of namespaced Require JS
 2013-01-03 08:44:30 -08:00
Diana Huang
09ed3d12a2 Hook up the backend into the new feedback response for scores 2013-01-03 11:40:41 -05:00
Diana Huang
c87d0f11d6 Show error when no score selected 2013-01-03 11:40:41 -05:00
Diana Huang
de7d6f184a Parse out the score given into an int. 2013-01-03 11:40:41 -05:00