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 |
|
Diana Huang
|
2b4e9f45b9
|
Updates to the CSS and html formatting for statuses
and self-assessment
|
2013-01-17 11:34:44 -05:00 |
|
David Ormsbee
|
9f33e3c755
|
Merge pull request #1294 from MITx/content/rocha/faq-update
Update content: FAQ, help page and front page video
|
2013-01-17 08:15:12 -08:00 |
|
David Ormsbee
|
15249b03d6
|
Merge pull request #1296 from MITx/hotfix/alex/gst
Hotfix/alex/gst
|
2013-01-17 08:14:39 -08:00 |
|
Carlos Andrés Rocha
|
9fdb4d0923
|
Replace front page video
[#154]
|
2013-01-17 10:47:50 -05:00 |
|
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 |
|
Diana Huang
|
589e848fd4
|
Pass along the correct display name to the controller
|
2013-01-17 09:44:13 -05:00 |
|
Alexander Kryklia
|
176be15998
|
removed unnecssary debug information
|
2013-01-17 14:25:28 +02:00 |
|
Alexander Kryklia
|
f22af62f2c
|
removed jstat, added javascript_loader
|
2013-01-17 14:22:13 +02:00 |
|
Alexander Kryklia
|
1d36e7baf9
|
now we invoke gst consturctor as callback to javascript_loader, so dependencies are loaded first
|
2013-01-17 14:21:52 +02: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 |
|
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 |
|
Jay Zoldak
|
ad68177e4d
|
Merge pull request #1292 from MITx/bugfix/apenney/jenkins
Another minor tweak to limit these tests to the cms.
|
2013-01-16 12:10:51 -08:00 |
|
Ashley Penney
|
0193cc5976
|
Remove this altogether.
|
2013-01-16 15:08:55 -05:00 |
|
Ashley Penney
|
9dd9727bb8
|
Another minor tweak to limit these tests to the cms.
|
2013-01-16 14:52:54 -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 |
|
Jay Zoldak
|
baa0e9be01
|
Merge pull request #1291 from MITx/bugfix/apenney/jenkins
Lets explicitly make the virtualenvs for now.
|
2013-01-16 11:13:37 -08:00 |
|
Ashley Penney
|
e38b44157a
|
Lets explicitly make the virtualenvs for now.
|
2013-01-16 14:09:48 -05:00 |
|
Diana Huang
|
aec40ead57
|
Use tables to display problems instead of a simple list
|
2013-01-16 12:40:39 -05:00 |
|
Ashley Penney
|
aa5ede3f92
|
Merge pull request #1289 from MITx/bugfix/dave/dont_explode_askbot_migration
Add a try/catch so that Askbot removal doesn't die if there's no Askbot ...
|
2013-01-16 09:18:12 -08:00 |
|
David Ormsbee
|
5d66490065
|
Add a try/catch so that Askbot removal doesn't die if there's no Askbot to remove from auth_user
|
2013-01-16 12:15:23 -05:00 |
|
brianhw
|
29c5d00b68
|
Merge pull request #1246 from MITx/feature/brian/pearson-reg
Feature/brian/pearson reg
|
2013-01-16 08:27:19 -08:00 |
|
Brian Wilson
|
bfb5f5e5bd
|
Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg
|
2013-01-16 11:24:46 -05:00 |
|
Brian Wilson
|
cc1b50ee4a
|
use new-style class for TestCenterExam
|
2013-01-16 11:24:20 -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 |
|
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 |
|