Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ashley Penney
0193cc5976 Remove this altogether. 2013-01-16 15:08:55 -05:00
Brian Talbot
b16fa04371 pearson registration - resolved box-sizing display issue that caused form fields to not show text/be editable in Firefox/Mozilla 2013-01-16 15:08:23 -05:00
Brian Talbot
e8ba078d4e studio HTML editor - codemirror/tinymce toggle work - wip 2013-01-16 14:54:28 -05:00
Ashley Penney
9dd9727bb8 Another minor tweak to limit these tests to the cms. 2013-01-16 14:52:54 -05:00
Don Mitchell
808c99335e Merge pull request #1290 from MITx/feature/christina/misc 
A couple of bug fixes.
 2013-01-16 11:42:37 -08: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
Brian Wilson
1d6b1be888 fix missing indirection in log message 2013-01-16 14:30:30 -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
cahrens
d4f79c0498 Fix bug related to img link for non-img files. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet
 2013-01-16 13:51:17 -05:00
cahrens
cc5a5e2996 Fix multiple choice checkbox. 
#117
 2013-01-16 12:52:05 -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
chrisndodge
ebca3af789 Merge pull request #1286 from MITx/feature/christina/misc 
Feature/christina/misc
 2013-01-16 09:17:13 -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
cahrens
de2674e3df Minor cleanup. 2013-01-16 11:38:18 -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
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
Deena Wang
3ff3189260 Finished tests for access.py (as far as able) 2013-01-15 15:39:05 -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