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

8989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
45bb511e15 remove obsolete test (per Vik) 2013-01-17 12:06:21 -05:00
Chris Dodge
fcf92a371d fix up testing failures post merge 2013-01-17 09:48:10 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
John Hess
9a81c56254 Tracking progess page lookups on instructor dashboard 2013-01-15 13:51:24 -05:00
John Hess
9ef1a4ded5 Tracking problem resets, clearer msgs 2013-01-15 13:51:24 -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
Brian Wilson
c8f52deb3d wire up registration closed functionality 2013-01-15 11:55:36 -05:00
Carlos Andrés Rocha
8a1f30bfa0 Merge pull request #1281 from MITx/fix/apenney/numpy 
Temporary workaround to our bizarre jenkins/numpy issue.
 2013-01-15 08:46:06 -08:00
cahrens
0461407857 Proposed changes to fix asset caching bug. 2013-01-15 11:45:08 -05:00