Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,188 Commits 1 Branch 0 Tags
826b070bfa047f94de6d14d43eaa9b598000d9ff
Commit Graph

1676 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
1be58c62e3 Update /faq page: change certificate of completion to mastery 2013-01-17 10:47:50 -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
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Brian Talbot
a756776836 pearson registration - revised rejection message text on dashboard, synced up email edx link text, revised contact styles/markup to remove giant red button dashboard for rejections 2013-01-16 17:26:29 -05:00
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
Diana Huang
9079c66a32 Some interface cleanup stuff for the combined open ended module. 2013-01-16 16:35:58 -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
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
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
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
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
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
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
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
cc56e47633 Fix active page issue 2013-01-14 15:12:54 -05:00