Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

4736 Commits

Author SHA1 Message Date
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
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
 2013-01-11 14:04:46 -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
Chris Dodge
3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 
Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt
 2013-01-07 12:34:48 -05:00
Diana Huang
e410703e33 Minor bug fixes and improvements 2013-01-04 17:20:03 -05:00
Diana Huang
093560e859 Updates to copy and styling and a few bugfixes 2013-01-04 16:36:28 -05:00
Diana Huang
fa09e25a1a Add interstitial page between calibration and grading. 
Make individual Prompt and Rubric Sections hideable.
 2013-01-04 15:18:39 -05:00
Diana Huang
befe36f626 Improvements to calibration feedback step 2013-01-04 14:11:48 -05:00
Diana Huang
ad63c492be Minor updates to the page to handle showing Calibration feedback. 
Also, allow for the hiding of the Prompt and the Rubric.
 2013-01-04 12:42:38 -05:00
Diana Huang
d2228205e2 Merge branch 'master' into diana/peer-grading-views 2013-01-04 11:19:10 -05:00
Diana Huang
b5f34a9da6 Show special text when calibrating or when grading. 2013-01-04 11:03:24 -05:00
Carlos Andrés Rocha
d0221808db Merge pull request #1228 from MITx/content/rocha/media-kit 
Add new tab/window behavior to media kit
 2013-01-04 07:07:43 -08:00
Brian Talbot
04524ef58f media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text 2013-01-04 10:02:14 -05:00
Carlos Andrés Rocha
c3d7bbe0e0 Merge pull request #1225 from MITx/content/rocha/media-kit 
Minor style changes to home page and media kit page

[Finishes #41872203]
 2013-01-03 15:07:55 -08:00
Carlos Andrés Rocha
25cb6d5a22 Minor style changes to home page and media kit page 
[#41872203]
 2013-01-03 18:06:22 -05:00
David Ormsbee
67dea0c3c3 Merge pull request #1224 from MITx/content/rocha/media-kit 
Add media kit page
 2013-01-03 14:50:57 -08:00
Diana Huang
fe86c25f72 Bug fixes for the JS and the peer grading service 2013-01-03 17:23:30 -05:00
Brian Talbot
a67b54bf82 media kit - added initial styles to media kit page 2013-01-03 17:10:16 -05:00
Diana Huang
28501ca58e Merge branch 'master' into diana/peer-grading-views 2013-01-03 16:23:14 -05:00
Diana Huang
078b2a5b95 Fix up some minor state issues and 
complete basic JS functionality for page
 2013-01-03 16:19:04 -05:00