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

10188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
fcf92a371d fix up testing failures post merge 2013-01-17 09:48:10 -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
Chris Dodge
48cbf38a41 resolve merge conflicts 2013-01-17 09:36:09 -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
cahrens
d07a9203d1 in progress 2013-01-17 09:10:23 -05:00
chrisndodge
358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-17 05:55:22 -08: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
Brian Wilson
4a59125bf9 add pearson import confirmation tool 2013-01-16 17:51:31 -05:00
John Jarvis
e09728a3b2 Removing the unavailable tally 
It doesn't make sense to print out unavailable students
since it will go negative as students unenroll
 2013-01-16 17:48:46 -05:00
John Jarvis
52e387e029 Add the force flag 
This will allow you to force the certificate generation
for when certificate requests are lost and stuck in
'generating', this happens when we have xqueue issues.
 2013-01-16 17:44:19 -05:00
Brian Wilson
fea6feb04f Strip whitespace off of registration demographics before validation 2013-01-16 17:39:33 -05:00
John Jarvis
44141b6a55 pep8 cleanup 2013-01-16 17:39:26 -05:00
John Jarvis
491027a814 Allow generation of certificates if they are in the generating state 2013-01-16 17:34:48 -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
Brian Talbot
db7443ce7c studio html editor - added in visual assets needed for previous UI syncing 2013-01-16 16:56:22 -05:00
Brian Talbot
f34fd5c426 studio html editor - sync'ed up previous style and behavior work to refactored xmodule sass/js 2013-01-16 16:55:11 -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
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
Brian Wilson
e68e612ee1 Return 404 in begin_exam_registration when course or exam are not valid 2013-01-16 16:40:28 -05:00
Diana Huang
9079c66a32 Some interface cleanup stuff for the combined open ended module. 2013-01-16 16:35:58 -05:00
chrisndodge
2f1363843b Merge pull request #1293 from MITx/feature/christina/misc 
Fix bug related to creation of thumbnails for non-image files.
 2013-01-16 12:49:27 -08:00
Brian Wilson
c7f722daec Merge branch 'bugfix/brian/pearson-reg' of github.com:MITx/mitx into bugfix/brian/pearson-reg 2013-01-16 15:43:30 -05:00
Brian Wilson
1de67be788 clear upload_status if user makes changes to TestCenterUser or TestCenterRegistration (so the change is pending, rather than rejected) 2013-01-16 15:43:15 -05:00
cahrens
bc80779f6f Fix bug related to creation of thumbnails for non-image files. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
 2013-01-16 15:40:14 -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
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