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

10211 Commits

Author SHA1 Message Date
Diana Huang
b7473f8017 Make mock service return useful data 2013-01-07 15:40:01 -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
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
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
Diana Huang
2293a37f7d Move over old Staff Grading tests to new app. 2013-01-07 09:17:09 -05:00
Brian Wilson
e57656e24f Add TestCenterExam class to course module, and plumb through. 2013-01-06 17:57:13 -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
Brian Wilson
ea8a56da0a add id generation and validation 2013-01-04 18:45:46 -05:00
Diana Huang
e410703e33 Minor bug fixes and improvements 2013-01-04 17:20:03 -05:00
Diana Huang
093560e859 Updates to copy and styling and a few bugfixes 2013-01-04 16:36:28 -05:00
Calen Pennington
789ac3fc87 Use the XBlock library as the base for XModule, so that we can incrementally rely on more and more of the XBlock api 2013-01-04 16:19:58 -05:00
Diana Huang
fa09e25a1a Add interstitial page between calibration and grading. 
Make individual Prompt and Rubric Sections hideable.
 2013-01-04 15:18:39 -05:00
Diana Huang
befe36f626 Improvements to calibration feedback step 2013-01-04 14:11:48 -05:00
Diana Huang
ad63c492be Minor updates to the page to handle showing Calibration feedback. 
Also, allow for the hiding of the Prompt and the Rubric.
 2013-01-04 12:42:38 -05:00
Diana Huang
d2228205e2 Merge branch 'master' into diana/peer-grading-views 2013-01-04 11:19:10 -05:00
Diana Huang
b5f34a9da6 Show special text when calibrating or when grading. 2013-01-04 11:03:24 -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
Brian Wilson
e32dfcf0a0 get display of validation errors to work. 2013-01-04 01:39:40 -05:00
Brian Wilson
c5cc15a92a return json, and add validation errors. Start displaying field with error. 2013-01-03 18:51:26 -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
Diana Huang
fe86c25f72 Bug fixes for the JS and the peer grading service 2013-01-03 17:23:30 -05: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
Diana Huang
28501ca58e Merge branch 'master' into diana/peer-grading-views 2013-01-03 16:23:14 -05:00
Diana Huang
078b2a5b95 Fix up some minor state issues and 
complete basic JS functionality for page
 2013-01-03 16:19:04 -05:00
Brian Talbot
e10e87e6ec media kit - revised link styling on homepage 2013-01-03 14:21:07 -05:00
Diana Huang
becffd4dbb Updated html and javascript for new pages as well 
as a fix for the peer grading service
 2013-01-03 14:08:56 -05:00
Diana Huang
c0001597a3 Update some of the templates so that they don't break 2013-01-03 13:47:29 -05:00
Diana Huang
1c1034c63b Pass location as a parameter, not as a part of the url 2013-01-03 13:47:03 -05:00
Carlos Andrés Rocha
bd0a2f6630 Add content and assets for media kit 
[# 41872203]
 2013-01-03 13:28:45 -05:00
Diana Huang
962d83d71b Display a message when there are no problems to grade 2013-01-03 13:00:02 -05:00
Diana Huang
bd47b0c79a New urls and corresponding views in the grading service 2013-01-03 12:59:34 -05:00
Chris Dodge
0743adb1cd update grade download csv content 2013-01-03 12:58:59 -05:00
Calen Pennington
8874d9d7f8 Add a draft implementation of the Poll module for Justice 2013-01-03 12:21:13 -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
Chris Dodge
e70db062b2 Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge 
Conflicts:
	requirements.txt
 2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Brian Wilson
c76f37050a introduce form to template 2013-01-03 03:22:37 -05:00
valera-rozuvan
233a35e01e Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
7a8d83a17f Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
c5cd67a6a5 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00
valera-rozuvan
f2cce07bd7 Work on RequireJS Jasmine test. 2013-01-03 10:14:06 +02:00