Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,830 Commits 1 Branch 0 Tags
69321b4497bda00b03e84483706d0e7e4860ea46
Commit Graph

134 Commits

Author SHA1 Message Date
Calen Pennington
69321b4497 Display the appropriate type of error message depending on the type of the incoming request 2012-05-16 13:45:00 -04:00
Calen Pennington
698d0a167e Display specific error messages when parts of the courseware break, rather than returning a 500 indicating that the whole site is down 2012-05-16 11:46:09 -04:00
Calen Pennington
08620eaf34 Fixing tests and removing unused/broken code 2012-05-15 14:02:33 -04:00
Calen Pennington
02bb23f46a Minor formatting cleanup 2012-05-15 10:55:57 -04:00
Prem Sichanugrist
28d12628f7 Fix missing global_context problem 
This problem was introduced in 232e758c7a
and caused the check answer button to not functioning.
 2012-05-14 15:43:50 -04:00
Calen Pennington
8f79c94d0a Fix one more place where simplewiki was importing the wrong settings 2012-05-14 11:51:07 -04:00
Calen Pennington
ee258f7acf Fix place where simplewiki was importing the wrong settings 2012-05-14 11:46:30 -04:00
Calen Pennington
371ce6968c Removing empty django module 2012-05-14 11:14:55 -04:00
Isaac Chuang
8989605cba Moving in Ike's new files, touches of multicourse 2012-05-13 20:33:29 -04:00
Isaac Chuang
15cae333d4 Ike's new input types 2012-05-13 19:58:39 -04:00
Isaac Chuang
232e758c7a Integrating some of Ike's courseware changes 2012-05-13 19:36:01 -04:00
Piotr Mitros
756dc97897 Moved grading code from init to grades.py to fix existing scripts 2012-05-12 17:16:36 -04:00
Piotr Mitros
095043ca8b Custom response gives poor errors when there is no checker code 2012-05-12 15:16:29 -04:00
Piotr Mitros
85079da3a7 Minor bug fix/conflict between grades and i4xsystem 2012-05-12 15:03:20 -04:00
Isaac Chuang
747105e328 More minor cleanups 2012-05-11 17:05:14 -04:00
Isaac Chuang
668062a19b Minor cleanups to capa_module (comments, formatting, etc.) 2012-05-11 17:02:06 -04:00
Lyla Fischer
72dee8ba14 merge with master 2012-05-11 13:17:52 -04:00
Lyla Fischer
a0201f37a0 names not required 2012-05-11 12:31:59 -04:00
Piotr Mitros
98f19470f0 Fixed bad merge between Cale and Piotr/I4xSystem missing reference 2012-05-11 07:45:02 -04:00
ichuang
1494cbbd85 Merged root URL prefix from Ike. Errors should be attributed to pmitros. 2012-05-10 23:17:34 -04:00
ichuang
cd78267056 Update djangoapps/courseware/module_render.py 2012-05-10 23:24:11 -03:00
pmitros
de4e22a344 Merge pull request #39 from MITx/ps-fix-reset-answer 
Do not double-append the XML path in caps module
 2012-05-10 16:32:05 -07:00
Prem Sichanugrist
d879db5e10 Do not double-append the XML path in caps module 
This fixes the bug in answers reset feature
 2012-05-10 19:08:51 -04:00
Lyla Fischer
a4dae57751 merge with master 2012-05-10 12:25:33 -04:00
Lyla Fischer
7f92606ec9 responses to code review 2012-05-10 10:38:06 -04:00
Calen Pennington
5011f60d45 Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/capa_module.py
 2012-05-10 09:17:26 -04:00
pmitros
c1b255fdf3 Merge pull request #18 from MITx/grade-refactor 
Grade refactor
 2012-05-09 15:00:25 -07:00
Piotr Mitros
f511a5e0dd Changed parameters from **args based on code review 2012-05-09 17:37:54 -04:00
Calen Pennington
6b10c0760b Merge branch 'master' into anonymous_user 
Conflicts:
	djangoapps/student/views.py
 2012-05-08 13:54:57 -04:00
Lyla Fischer
4c0cc81d82 added tests 2012-05-07 23:05:31 -04:00
Lyla Fischer
ca89ce73ab fixed mysterious problem rendering issue 2012-05-07 22:19:03 -04:00
Lyla Fischer
eb95ea9e2f Merge branch 'master' into MC 2012-05-07 22:17:37 -04:00
Piotr Mitros
f187a9e312 Capa no longer requires local filestore 2012-05-07 21:24:40 -04:00
Lyla Fischer
13a095fc1e checkboxes 2012-05-07 21:04:10 -04:00
Piotr Mitros
aab9b15cd4 Refactor for reusability: x_modules take common parameters as an object. capa_problem to take a file object and not filename. 2012-05-07 20:59:08 -04:00
Piotr Mitros
e1ac5e9f30 Moved extra settings into state. Added fs module for aux content 2012-05-07 20:13:30 -04:00
Prem Sichanugrist
a39c2c194d Rewrite Courseware navigation 2012-05-07 18:01:21 -04:00
Calen Pennington
1bd608e598 Make showanswer and rerandomize propogate downwards in course.xml 2012-05-07 15:36:13 -04:00
Calen Pennington
83ea75b7d8 Rename simplewiki settings file 2012-05-07 15:01:43 -04:00
Calen Pennington
49f402e3e7 Remove debug print statements 2012-05-07 14:56:27 -04:00
Calen Pennington
47c832647c Call user_groups even for anonymous users 2012-05-07 14:56:17 -04:00
Piotr Mitros
ddcf68362a Videos now support annotations w/o verticals 2012-05-07 10:42:48 -04:00
pmitros
3cddaa4619 Merge pull request #19 from MITx/pmitros/histogram 
Draws histogram for scores
 2012-05-07 06:59:04 -07:00
Calen Pennington
2a073a236a Re-raise an integrity error during user creation if it's not caused by something we know to check for 2012-05-04 14:41:56 -04:00
Calen Pennington
90b7737b0d Catch user integrity errors, and then try and figure out what caused them (which removes a race condition) 2012-05-03 15:16:05 -04:00
Lyla Fischer
1f7a3f83b9 fixed naming convention on response types 2012-05-01 04:15:55 -04:00
Calen Pennington
0871d95f98 Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository 2012-04-30 15:18:47 -04:00
Calen Pennington
58731a1c3a Add a showanswer='always' option 2012-04-30 14:38:01 -04:00
Calen Pennington
faf0782d60 If rerandomize won't show different values, don't show the reset button 2012-04-30 14:37:39 -04:00
Calen Pennington
8ecb979339 Cleaning up imports 2012-04-30 14:36:16 -04:00