10228 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Vik Paruchuri	14676d1c32	Untrack dev.py, add in redirect code for peer grading	2013-02-04 14:05:02 -05:00
Diana Huang	85abc43515	Add in the ability to handle due dates and grace periods	2013-02-04 14:02:42 -05:00
Vik Paruchuri	3380745692	About to trim some lines	2013-02-04 13:54:27 -05:00
Christina Roberts	517f756ffa	Merge pull request #1413 from MITx/feature/christina/misc2 ... See if this helps with the tab-changing race condition.	2013-02-04 10:34:37 -08:00
cahrens	39479d9e18	See if this helps with the tab-changing race condition.	2013-02-04 13:28:34 -05:00
Vik Paruchuri	c6c89e4216	Make peer grading xmodule work with notifications	2013-02-04 13:16:05 -05:00
Diana Huang	97a32f8ced	Remove extra styling.	2013-02-04 12:45:40 -05:00
Vik Paruchuri	7263cbfcca	Fixes to make peer grading show up in notifications	2013-02-04 12:41:14 -05:00
Your Name	bdfc9d9784	Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes	2013-02-04 12:30:48 -05:00
Christina Roberts	be5dd6d25a	Merge pull request #1411 from MITx/feature/dhm/dnd ... Attempt to patch the dnd hesitation fixes onto master	2013-02-04 09:29:07 -08:00
Victor Shnayder	486e747b18	Merge pull request #1407 from MITx/feature/ichuang/conditional-xmodule-v2 ... Provides "stop" feature via a new "conditional" XModule	2013-02-04 09:20:07 -08:00
Vik Paruchuri	f742b7d865	Start to integrate peer grading xmodule back into notifications	2013-02-04 12:07:03 -05:00
jarv	723f47f4cc	Merge pull request #1412 from MITx/feature/jarv/service-variant-default ... Defaulting service_variant to a blank string	2013-02-04 09:06:24 -08:00
Don Mitchell	902cdefefa	Added comments for unused 2nd arg on generateCheckHoverState	2013-02-04 12:05:49 -05:00
John Jarvis	7c39e38539	Defaulting service_variant to a blank string	2013-02-04 12:05:45 -05:00
Diana Huang	f9cca8befd	Starting a framework for handling the closure of an open ended problem. ... Currently incomplete.	2013-02-04 11:51:05 -05:00
Don Mitchell	50eced5b32	Attempt to patch the dnd hesitation fixes onto master	2013-02-04 11:34:59 -05:00
Vik Paruchuri	8bd7b60aca	Add in key to mock peer grading service	2013-02-04 10:50:07 -05:00
Diana Huang	4b59e7d551	Fix max score check for the updated rubric UI stuff.	2013-02-04 10:34:00 -05:00
Vik Paruchuri	c991c0489c	Fix open ended test with flagging	2013-02-04 10:26:25 -05:00
Brian Talbot	c9dc762a2b	studio - soft landing UI: how it works basic layout styling	2013-02-04 09:54:14 -05:00
Brian Talbot	ecbe297936	studio - soft landing UI: how it works pathing, html and basic layout styling	2013-02-04 09:39:36 -05:00
Christina Roberts	a6e0fb91ef	Merge pull request #1406 from MITx/bug/bug152 ... Move dnd code from base.js to a js file only loaded by overview.html	2013-02-04 06:19:17 -08:00
Diana Huang	f49b5ec771	Merge branch 'master' into diana/rubric-ui-improvements ... Conflicts: common/lib/xmodule/xmodule/combined_open_ended_rubric.py common/lib/xmodule/xmodule/self_assessment_module.py lms/djangoapps/open_ended_grading/grading_service.py lms/static/sass/course.scss	2013-02-04 09:11:28 -05:00
Diana Huang	d4481fa918	Merge branch 'diana/rubric-ui-improvements' of github.com:MITx/mitx into diana/rubric-ui-improvements	2013-02-04 09:07:19 -05:00
Kevin Chugh	69225f6435	cohort ID showing, have to translate to display text	2013-02-04 08:33:33 -05:00
Brian Talbot	79e3482265	studio - soft landing UI: initial how it works plumbing	2013-02-04 08:25:58 -05:00
Brian Talbot	e207881b50	studio - soft landing UI: button tweaks	2013-02-04 08:21:32 -05:00
Brian Wilson	1685f302ab	add TimerModule to courseware	2013-02-04 02:22:24 -05:00
Brian Talbot	4946eace2a	studio - soft landing UI: sign in and basic styling/layout tweaks	2013-02-04 00:43:24 -05:00
Brian Talbot	5a1795db85	studio - soft landing UI: basic signin/sign up styling and sign up markup/templating	2013-02-04 00:19:26 -05:00
ichuang	ddc8bf2b42	add instructor dashboard feature to download profile & problem state	2013-02-04 04:47:27 +00:00
Brian Talbot	1144b0eeed	studio - soft landing UI: initial header and templating work	2013-02-03 22:22:11 -05:00
ichuang	e59b0b87b1	add docs for conditional module; clean up a bit more	2013-02-03 21:07:23 -05:00
ichuang	4446ddb292	cleaned up conditional module a bit; add test for conditional module	2013-02-03 20:59:05 -05:00
Brian Talbot	604bfcc04a	studio - course nav - fixing width of course name for now	2013-02-03 20:20:35 -05:00
ichuang	95ef12169a	extend conditional module to add require_attempted	2013-02-03 18:53:51 -05:00
ichuang	1d29e1f2f4	comment out some debug in conditional_module; leave undeleted for future tests	2013-02-03 18:53:51 -05:00
ichuang	363ca7031e	add coffeescript/js for conditional module, does XModule.loadModules	2013-02-03 18:53:51 -05:00
ichuang	19051e40d2	use ajax for doing conditional_module	2013-02-03 18:53:51 -05:00
ichuang	8db96abb18	conditional_module.html	2013-02-03 18:53:51 -05:00
ichuang	95b8134731	initial implementation of conditional_module; doesn't load dynamically yet	2013-02-03 18:53:51 -05:00
Kevin Chugh	fcbd4bd1cd	produce and consume group_id from dropdowns	2013-02-02 05:46:11 -05:00
Brian Talbot	22444f6dfe	studio - revised course nav: fixed placeholder login link text	2013-02-01 20:50:29 -05:00
Brian Talbot	83ad950887	studio - revised course nav: plumbed in current html and scss progress into header	2013-02-01 20:48:59 -05:00
Brian Talbot	d0d0296310	studio - revising course-based navigation - initial scss setup	2013-02-01 19:57:17 -05:00
VikParuchuri	01fab2ec68	Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes ... Feature/vik/combined xmodule changes	2013-02-01 15:46:33 -08:00
Vik Paruchuri	d9517877a4	Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging	2013-02-01 18:32:48 -05:00
Vik Paruchuri	9310dcbe0d	Remove reload test	2013-02-01 18:31:50 -05:00
Brian Wilson	9d98b7055d	add course navigation back into timed exam. Add initial timer styling.	2013-02-01 17:52:14 -05:00