cahrens
65d45d6dee
Minor cleanup.
2013-01-16 09:57:21 -05:00
cahrens
07d6bee5a7
storing work
2013-01-16 09:53:28 -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
d844730f71
Fix some sizing issues in the CSS.
2013-01-16 09:17:00 -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
cc31c79517
fixes for first round of code review
2013-01-15 18:15: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
Vik Paruchuri
8ff77329b1
Fix rubric rendering in combined open ended peer grading
2013-01-15 16:22:27 -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
cahrens
9818664bb1
storing work
2013-01-15 16:04:34 -05: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
Diana Huang
78c194aaf4
Merge pull request #1284 from MITx/feature/vik/add-staff-grading-notifications
...
Feature/vik/add staff grading notifications
2013-01-15 12:45:56 -08: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
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
Brian Talbot
ed6134ea11
abstracted out common editor styles shared by problem and html editors
2013-01-15 14:14:31 -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
Carlos Andrés Rocha
8a1f30bfa0
Merge pull request #1281 from MITx/fix/apenney/numpy
...
Temporary workaround to our bizarre jenkins/numpy issue.
2013-01-15 08:46:06 -08:00
cahrens
0461407857
Proposed changes to fix asset caching bug.
2013-01-15 11:45:08 -05:00
Victor Shnayder
02d5cfd14d
add comment about time format conversion
2013-01-15 11:44:27 -05:00
Victor Shnayder
2f7210ed0c
address Ike's comments
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
Ashley Penney
093839e13d
flesh out comment.
2013-01-15 11:39:59 -05:00
David Ormsbee
d4259c63db
Merge pull request #1260 from MITx/cale/circular-import-fix
...
Remove circular dependencies that connect student.models and django_comm...
2013-01-15 08:37:21 -08: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
66ffef131d
Merge branch 'master' into cale/circular-import-fix
...
Conflicts:
common/djangoapps/student/models.py
2013-01-15 11:35:19 -05:00
Don Mitchell
244584ce6c
DnD for subsections and units (no auto open)
2013-01-15 11:33:11 -05:00
David Ormsbee
a2d5d0bc89
Merge pull request #1279 from MITx/jaakana
...
added problem weight description
2013-01-15 08:25:14 -08: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
