Prem Sichanugrist
28d12628f7
Fix missing global_context problem
...
This problem was introduced in 232e758c7a
2012-05-14 15:43:50 -04:00
Calen Pennington
c6a6144ade
Point at a test_data directory for testing
2012-05-14 13:16:14 -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
0856f5517b
Disable askbot during tests
2012-05-14 11:21:17 -04:00
Calen Pennington
371ce6968c
Removing empty django module
2012-05-14 11:14:55 -04:00
Calen Pennington
8e78f73d00
Adding a test environment with some debug stuff turned off
2012-05-14 11:14:55 -04:00
Prem Sichanugrist
21c2007541
Update requirements file to include requests
2012-05-14 12:02:48 -03: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
Isaac Chuang
577d8815a3
Adding sympy check. Needs to be code reviewed before enabling in prod.
2012-05-11 16:55:02 -04:00
Isaac Chuang
c92f6dc903
Added beautifulsoup to requirements; merged more of Ike's settings.py
2012-05-11 14:23:30 -04:00
Piotr Mitros
0028b3345e
jsonify in postJSON from multiple choice did -- indeed -- break things. Removed.
2012-05-11 14:02:09 -04:00
pmitros
924a45fee4
Merge pull request #33 from MITx/MC
...
Multiple Choice support. Outstanding issues:
* Cleanup of the way names are handled
* Figure out why $.ajax needs a stringify
* I'd prefer to keep both input types and response types as classes. This is necessary for richer, AJAXy interactions.
2012-05-11 10:35:37 -07: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
pmitros
52f1a482b8
Merge pull request #29 from MITx/anonymous_user
...
Anonymous user
2012-05-10 16:28:18 -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
Calen Pennington
3fb185fb0c
Merge branch 'master' into anonymous_user
...
Conflicts:
rakefile
2012-05-10 11:47:14 -04:00
Calen Pennington
9c42c90412
Move to a normalized deploy name for .deb files
2012-05-10 11:43:46 -04:00
Calen Pennington
88da17f087
Glob package names before publishing
2012-05-10 11:38:32 -04:00
Calen Pennington
72f1cd1da3
Push all architecture .debs to the packages server
2012-05-10 11:36:54 -04:00
Calen Pennington
4ff31d1bdc
Push all architecture .debs to the packages server
2012-05-10 11:36:43 -04:00
Lyla Fischer
7f92606ec9
responses to code review
2012-05-10 10:38:06 -04:00
Calen Pennington
41aaadf019
Add back in the exclusions for build artifacts
2012-05-10 10:18:05 -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
David Ormsbee
03d3508bd5
Merge pull request #38 from MITx/pmitros/xmod-reuse-refactor
...
Pmitros/xmod reuse refactor
2012-05-09 14:53:16 -07:00
Piotr Mitros
0bff9a80d2
Merge
2012-05-09 17:52:39 -04:00
Piotr Mitros
f511a5e0dd
Changed parameters from **args based on code review
2012-05-09 17:37:54 -04:00
Reda Lemeden
3847dee605
Added official badge styling to staff questions
2012-05-09 15:30:12 -04:00
Calen Pennington
077d4a7d6d
Removing unneeded imports
2012-05-09 14:44:49 -04:00
David Ormsbee
8bd00b34ed
Merge pull request #37 from MITx/faq_addition
...
added questions to faq
2012-05-09 09:46:55 -07:00
Lyla Fischer
8ad1d3e17d
added questions to faq
2012-05-09 12:31:55 -04:00
Kyle Fiedler
38098df985
Merge branch 'kf-amplifier'
2012-05-08 15:01:03 -04:00
Kyle Fiedler
29dd45e517
Fix styles for play button
2012-05-08 14:43:49 -04:00
Kyle Fiedler
e0a313e36b
added more layout to amplifier
2012-05-08 14:13:30 -04:00
Kyle Fiedler
b50478331e
Added image for the slider handle
2012-05-08 14:13:29 -04:00
Calen Pennington
8841479624
Anonymize date stamps in problem solutions
2012-05-08 14:13:29 -04:00
