Commit Graph

7051 Commits

Author SHA1 Message Date
David Ormsbee
fd20496a60 Merge pull request #1280 from MITx/feature/jth/attempts_reset
Added 2 new instructor tools
2013-01-16 13:48:26 -08:00
John Hess
f7f563db9b Use reverse() to lookup student progress page, use index to lookup module_state_key 2013-01-16 16:44:25 -05:00
Diana Huang
9079c66a32 Some interface cleanup stuff for the combined open ended module. 2013-01-16 16:35:58 -05:00
Diana Huang
88427ea02f Update criteria for peer grading progress bars. 2013-01-16 15:15:55 -05:00
jmvt
a9d3736cfb Replace all calls to analytics service to use the get methods (pulls from mongodb). Added error handling. 2013-01-16 15:09:54 -05:00
Brian Talbot
b16fa04371 pearson registration - resolved box-sizing display issue that caused form fields to not show text/be editable in Firefox/Mozilla 2013-01-16 15:08:23 -05:00
Diana Huang
db366d4ebb Update CSS to make rubric even narrower. 2013-01-16 14:36:08 -05:00
Diana Huang
e5bb0c8e59 Fix how we calculate max value. 2013-01-16 14:31:50 -05:00
Diana Huang
60531e30fa Add progress bars to the staff grading and peer grading views. 2013-01-16 14:22:39 -05:00
Diana Huang
aec40ead57 Use tables to display problems instead of a simple list 2013-01-16 12:40:39 -05:00
Brian Wilson
bfb5f5e5bd Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg 2013-01-16 11:24:46 -05:00
Victor Shnayder
9519087d84 Merge pull request #1271 from MITx/feature/victor/beta-testers
Feature/victor/beta testers
2013-01-16 06:50:57 -08:00
Diana Huang
8b3fb33fe3 Update tests to handle rubric scores 2013-01-16 09:47:54 -05:00
Diana Huang
9b2faa4987 Merge branch 'master' into feature/diana/rubric-input 2013-01-16 09:02:51 -05:00
Victor Shnayder
b188c8e722 fix bug in string splitting. 2013-01-15 18:19:54 -05:00
Brian Wilson
3b28e328c4 disable export of testcenter_exam from course module (and add test). 2013-01-15 17:54:10 -05:00
David Ormsbee
39655bff68 Merge pull request #1283 from MITx/content/rocha/faq-update
Update to the FAQ page
2013-01-15 13:16:35 -08:00
Brian Wilson
cd2a704aec Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg 2013-01-15 16:04:05 -05:00
Brian Wilson
ef0f973ca4 display client_candidate_id when registration accepted; strip whitespace from accommodation_request; cosmetic cleanup on pearson management commands. 2013-01-15 16:00:10 -05:00
Brian Wilson
fb251cacbe Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-reg 2013-01-15 15:42:29 -05:00
Brian Wilson
32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations 2013-01-15 15:42:09 -05:00
Vik Paruchuri
8aa033f601 Add peer and staff grading required display, notifications 2013-01-15 15:40:23 -05:00
Deena Wang
3ff3189260 Finished tests for access.py (as far as able) 2013-01-15 15:39:05 -05:00
Vik Paruchuri
ef2b069409 Add staff grading notifications 2013-01-15 15:34:09 -05:00
Brian Talbot
540232f54d revised minor syntax/line indents on faq scss and js 2013-01-15 15:30:53 -05:00
Brian Talbot
a4e53d7a7f pearson registration - restyled and tweaked markup for registration closed message and styled disabled labels appropriately 2013-01-15 14:52:39 -05:00
Diana Huang
77fe6ed452 Merge branch 'master' into feature/diana/rubric-input 2013-01-15 14:48:40 -05:00
Diana Huang
4422bd996d Merge branch 'master' into feature/diana/rubric-input 2013-01-15 14:44:57 -05:00
Victor Shnayder
9c7f2cf604 WIP -- do not merge 2013-01-15 14:44:09 -05:00
VikParuchuri
e2f8ce9de6 Merge pull request #1276 from MITx/feature/vik/add-peer-grading-notifications
Feature/vik/add peer grading notifications
2013-01-15 11:40:59 -08:00
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