Commit Graph

22621 Commits

Author SHA1 Message Date
Vik Paruchuri
301293f8b0 Remove debug statement, fix active page issue on problem page 2013-01-15 14:33:38 -05:00
Vik Paruchuri
7b1262f667 Fix up authentication, other things 2013-01-15 14:31:02 -05:00
Diana Huang
ad526e624a Use the correct variable. 2013-01-15 14:10:45 -05:00
John Hess
9a81c56254 Tracking progess page lookups on instructor dashboard 2013-01-15 13:51:24 -05:00
John Hess
9ef1a4ded5 Tracking problem resets, clearer msgs 2013-01-15 13:51:24 -05:00
John Hess
d025ca248f Added instructor tools for resetting attempts on a single student's problem to 0 and for getting student's progress page 2013-01-15 13:51:24 -05:00
Diana Huang
3d2ae66cf5 Refactor out rubric rendering and pass along
the right information for peer grading
2013-01-15 13:46:18 -05:00
Brian Wilson
c8f52deb3d wire up registration closed functionality 2013-01-15 11:55:36 -05:00
Victor Shnayder
02d5cfd14d add comment about time format conversion 2013-01-15 11:44:27 -05:00
Victor Shnayder
570df1c9e6 Fix bugs, refactor, support lists of users 2013-01-15 11:44:27 -05:00
Victor Shnayder
3f654af7cd Refactor common code, fix view a bit
remaining:
 * support putting multiple names / emails in the big box we now have
2013-01-15 11:44:27 -05:00
Victor Shnayder
1a5fc065ad Add beta test group management view to instructor dashboard
* still needs to support uploading a list
* also want to clean up and refactor the code a bit
2013-01-15 11:44:26 -05:00
Victor Shnayder
58a9fdeddc add note about settings needed for manual testing 2013-01-15 11:36:25 -05:00
Victor Shnayder
3e5a2f9bde Add beta test group support
* add a days_early_for_beta inherited policy option
* students in the beta_testers_{COURSE} group get to see content that many days early
* Clean up some docstrings related to time formats
* Add basic test
2013-01-15 11:36:25 -05:00
David Ormsbee
36b024ab95 Merge pull request #1203 from MITx/feature/alex/gst-mitx
Feature/alex/gst mitx
2013-01-15 08:24:09 -08:00
David Ormsbee
ad261706c8 Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3
Upgrade to instructor dashboard: enrollment, offline grades, remote gradebook
2013-01-15 08:22:19 -08:00
Diana Huang
48be0b15a1 Clean up on staff grading code path and
the beginnings of peer grading.
2013-01-15 11:21:10 -05:00
Brian Talbot
e070a926c5 pearson registration - resolving merge conflict 2013-01-15 07:46:49 -05:00
Valera Rozuvan
f2fd649a16 Removed unnecessary XML section. Documenting. 2013-01-15 12:55:13 +02:00
Valera Rozuvan
080e96fdc4 Work in progress on GST. 2013-01-15 12:55:11 +02:00
valera-rozuvan
0913e9ef69 Work on GST. 2013-01-15 12:51:55 +02:00
valera-rozuvan
643ac69a57 Separating JS from the html for GST. 2013-01-15 12:51:55 +02:00
Alexander Kryklia
da4a676513 working xmodule - GsT 2013-01-15 12:51:55 +02:00
Alexander Kryklia
69d0156c36 slider, plot and input contrlos are transferred from xml to html substituted to proper div elements 2013-01-15 12:51:54 +02:00
Alexander Kryklia
169d4b123c updates 2013-01-15 12:51:54 +02:00
Alexander Kryklia
54c222a015 template for gst 2013-01-15 12:51:54 +02:00
Brian Wilson
9e157b91f0 change urls from xxx_test_registration to xxx_exam_registration. 2013-01-15 00:59:34 -05:00
Vik Paruchuri
be3d8cbb86 Fix small issue with graded callback 2013-01-14 18:00:53 -05:00
Vik Paruchuri
78a94a4e20 Fix naming bug 2013-01-14 17:50:20 -05:00
Vik Paruchuri
6f9c0a7d72 Minor fix for when grade is ready to submit 2013-01-14 17:47:44 -05:00
Vik Paruchuri
e748d59d78 Bug fixes 2013-01-14 17:42:21 -05:00
Vik Paruchuri
e5c6414d39 Adding score selection back into staff grading view 2013-01-14 17:35:41 -05:00
Brian Talbot
4e83f748b7 pearson registration - revised contact calls to action and order in status section, edited flash message copy/styling, added in strawman state for disabled form/closed registration state of form, added in strawman state for demographics rejected flash message, revised accomodations text labe and isntructions 2013-01-14 17:31:05 -05:00
Vik Paruchuri
50f951d9df Bug fixes 2013-01-14 17:14:55 -05:00
Vik Paruchuri
6427a7dac5 Rubric html change 2013-01-14 16:03:53 -05:00
Vik Paruchuri
f5600c2b8a Make things more robust, ensure that a rubric is specified properly before combined open ended module will render 2013-01-14 15:42:38 -05:00
Vik Paruchuri
4353c4ab05 Clean up some logic 2013-01-14 15:16:06 -05:00
Vik Paruchuri
cc56e47633 Fix active page issue 2013-01-14 15:12:54 -05:00
Diana Huang
79c8efcb68 Update the rubric renderer 2013-01-14 15:02:24 -05:00
Vik Paruchuri
4ffa00b400 Add in notifications, peer grading tab, tab image 2013-01-14 15:00:13 -05:00
Diana Huang
bb867ba3b4 Use the new CombinedOpenEndedRubric class for everything
related to rubric rendering. Remove the old input type.
2013-01-14 14:46:44 -05:00
Carlos Andrés Rocha
2f99d38e90 Update FAQ page: new content and styling 2013-01-14 14:17:39 -05:00
Diana Huang
ae65bb0332 Merge branch 'master' into feature/diana/rubric-input
Conflicts:
	common/lib/capa/capa/inputtypes.py
2013-01-14 13:40:45 -05:00
VikParuchuri
a64111a6e7 Merge pull request #1242 from MITx/feature/vik/integrate-sa-and-oe
Feature/vik/integrate sa and oe
2013-01-14 10:06:43 -08:00
Calen Pennington
fc2d5c43f1 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
	lms/envs/aws.py
2013-01-14 12:51:19 -05:00
Vik Paruchuri
1316728aaa Minor naming fix 2013-01-14 12:32:31 -05:00
Vik Paruchuri
0e11deffcf Fix staff and peer grading settings to not fail catastrophically 2013-01-14 12:31:50 -05:00
Vik Paruchuri
a64806656a Integrate rubric into self assessment 2013-01-14 12:20:27 -05:00
Vik Paruchuri
16f06ae7b7 Fix some minor html 2013-01-14 11:57:09 -05:00
Vik Paruchuri
3e0cf9d234 Make rubric render more nicely 2013-01-14 11:53:23 -05:00