6923 Commits

Author	SHA1	Message	Date
Brian Wilson	e57656e24f	Add TestCenterExam class to course module, and plumb through.	2013-01-06 17:57:13 -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
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
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
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
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
Calen Pennington	8874d9d7f8	Add a draft implementation of the Poll module for Justice	2013-01-03 12:21:13 -05: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
Brian Wilson	4abd9cd3d4	get closer to working again	2013-01-02 18:56:25 -05:00
Diana Huang	c89ff2ac0e	Basic peer grading view using mocks and some cleanup in ... the peer grading service	2013-01-02 17:44:58 -05:00
Calen Pennington	0bed19648e	Remove filename and giturl references	2013-01-02 15:08:27 -05:00
Diana Huang	8737009679	Merge branch 'master' into diana/peer-grading-views	2013-01-02 15:04:18 -05:00
Diana Huang	37f261f906	Move peer grading so that there are the individual problem pages ... and the problem list page	2013-01-02 15:01:59 -05:00
Jay Zoldak	56d17d8a8a	Improve some comments and names in the acceptance test framework	2013-01-02 10:44:21 -05:00
Jay Zoldak	af4f1668d7	Stub out the video and capture the html files of the high level tabs for diff comparison ... Conflicts: lms/templates/video.html	2013-01-02 10:44:20 -05:00
David Ormsbee	8bf393fbba	Merge pull request #1182 from MITx/bridger/feature/ungraded_course ... Visual changes for ungraded courses	2013-01-02 07:19:34 -08:00
Diana Huang	deffa188ff	Fix some minor problems and add new key for peer grading.	2013-01-02 09:43:21 -05:00
Diana Huang	652a8eb440	New peer grading view on the lms side	2012-12-28 15:48:06 -05:00
Calen Pennington	7977491ddf	WIP: LMS Courseware appears to be working	2012-12-28 14:51:50 -05:00
Calen Pennington	01411ae66e	WIP: Trying to get tests working	2012-12-28 14:48:47 -05:00
Calen Pennington	c5e3380b71	WIP: Save student state via StudentModule. Inheritance doesn't work	2012-12-28 14:45:46 -05:00
Calen Pennington	cbfc7b201a	WIP more changes to model definitions. Next Up: actually wiring model data into the rdbms	2012-12-28 14:44:31 -05:00
Carlos Andrés Rocha	1ac41787a7	Fix broken display of courses in university profile	2012-12-21 16:38:17 -05:00
David Ormsbee	241b4eb0fe	Merge pull request #1196 from MITx/feature/rocha/change-courses-layout ... New Layout for course listings with new course graphical overlay	2012-12-21 12:18:05 -08:00
Brian Talbot	45ed4a410c	resolving merge conflict around test_center_register.html template	2012-12-21 13:22:31 -05:00
Brian Talbot	3bd8f408b5	test center registration - added final styling and label focus JS	2012-12-21 13:16:39 -05:00
Brian Talbot	3987120496	test center registration - further UI design and styling on form and dashboard tweaks	2012-12-21 13:04:22 -05:00
Carlos Andrés Rocha	4959dc6005	Add Instructional Designer Job Post	2012-12-21 11:44:45 -05:00