Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,887 Commits 1 Branch 0 Tags
7171e6b7cc04000e6136d4e51cdc43beb82cabca
Commit Graph

1304 Commits

Author SHA1 Message Date
Diana Huang
7171e6b7cc Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-17 14:02:00 -05:00
Diana Huang
18a3d5e734 Merge branch 'master' into feature/diana/rubric-input 2013-01-17 14:00:43 -05:00
Diana Huang
3646ff53d8 Display updates and fixes. 2013-01-17 14:00:02 -05:00
Carlos Andrés Rocha
00f83d03a0 Restore /faq page, and moved new content to /help 2013-01-17 10:47:50 -05:00
Diana Huang
280a2f290e Merge branch 'master' into diana/open-ended-ui-updates 2013-01-17 10:09:16 -05:00
Diana Huang
df8d088492 Display updates to the xmodule. 2013-01-17 09:44:47 -05:00
Diana Huang
88427ea02f Update criteria for peer grading progress bars. 2013-01-16 15:15:55 -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
Diana Huang
9b2faa4987 Merge branch 'master' into feature/diana/rubric-input 2013-01-16 09:02:51 -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
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
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
ad526e624a Use the correct variable. 2013-01-15 14:10:45 -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
Diana Huang
48be0b15a1 Clean up on staff grading code path and 
the beginnings of peer grading.
 2013-01-15 11:21:10 -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
Carlos Andrés Rocha
2f99d38e90 Update FAQ page: new content and styling 2013-01-14 14:17:39 -05:00
Diana Huang
1680336da6 Fix some minor bugs in the staff grading interface 2013-01-14 10:22:22 -05:00
Diana Huang
a0c0005e95 Updates to the javascript and the grading controller 
to handle rubric input
 2013-01-14 08:58:33 -05:00
Diana Huang
f3e8d01e08 Pull out old rubric and score selection logic 
and set up the new rubric
 2013-01-11 17:29:39 -05:00
Brian Talbot
5d40d22136 revised rejected state error message content, markup, and styling on registration's right hand side status area 2013-01-11 09:52:46 -05:00
Brian Talbot
759bb137b4 pearson registration - adjusted style for rejected message state on dashboard 2013-01-10 17:08:01 -05:00
Diana Huang
d0e00af60e Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements 2013-01-10 16:45:40 -05:00
Diana Huang
81bb2dc979 Better and clearer comments along with some fixes 
for code review issues
 2013-01-10 16:45:19 -05:00
Brian Talbot
a388263298 pearson registration - giving registration call to actions on dashboard a bit more room 2013-01-09 16:06:10 -05:00
Diana Huang
13c692c29b Show back button when we see an error. 2013-01-09 14:59:59 -05:00
Diana Huang
54d91e7875 Merge branch 'diana/peer-grading-views' into diana/peer-grading-improvements 2013-01-09 14:44:08 -05:00
Diana Huang
c4d1b2e643 Use correct user id and make the reload button a back button 2013-01-09 14:41:23 -05:00
Diana Huang
950d398387 Updates to the CSS 2013-01-09 10:19:42 -05:00
Brian Talbot
329982a665 pearson registration - fixed layout issue with submission errors 2013-01-08 11:48:07 -05:00
Brian Talbot
bbe0120d5c pearson registration - changed accepted classes, content, and styling to use the term process instead 2013-01-08 11:41:01 -05:00
Brian Talbot
352f284624 pearson registration - revised UI states for reg form, simplified markup for form fields, synched button styles/text b/t registration form and dashboard 2013-01-08 11:37:26 -05:00
Diana Huang
19401f29d9 Minor javascript updates 2013-01-08 10:22:07 -05:00
Brian Talbot
b41f68c801 pearson registration - changing registration status states to progress-based states UI - wip 2013-01-07 17:14:11 -05:00
Diana Huang
02247172a2 Fix some interstitial page CSS 2013-01-07 15:55:14 -05:00
Brian Talbot
2ec11e5b92 pearson registration - refined error output and accommodation field display toggling 2013-01-07 15:15:50 -05:00
Diana Huang
e410703e33 Minor bug fixes and improvements 2013-01-04 17:20:03 -05:00