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
Prem Sichanugrist
ecf0126fce
Make the accordian expand 'Week 1' by default
...
This fixes the regression from javascript rewrite.
2012-05-08 14:13:29 -04:00
Prem Sichanugrist
dfee512ba8
Fix the wrong package name in requirements file
...
`PyFilesystem` has the package name of `fs`
2012-05-08 14:13:29 -04:00
Prem Sichanugrist
07629ef45d
Rewrite Courseware navigation
2012-05-08 14:13:29 -04:00
Prem Sichanugrist
80aeaed5fe
Rewrite JavaScript on main page
...
Both feedback form and calculator interaction now in its own class.
2012-05-08 14:13:29 -04:00
Prem Sichanugrist
43a6534e75
Add Jasmine to do a JavaScript unit test
2012-05-08 14:13:29 -04:00
Piotr Mitros
d22566a310
Added pyfilesystem to requirements.txt; needed for further hacking; want in common root
2012-05-08 14:13:29 -04:00
Kyle Fiedler
171d40270f
Fixed some of the minor css bugs
2012-05-08 14:13:29 -04:00
Calen Pennington
4084aaef18
Make showanswer and rerandomize propogate downwards in course.xml
2012-05-08 14:13:28 -04:00
Kyle Fiedler
edec1b5558
added styles for tutorial headers and removing extra padding on bottom sequence nav
2012-05-08 14:13:28 -04:00
Piotr Mitros
f9adfdbb50
Videos now support annotations w/o verticals
2012-05-08 14:13:28 -04:00
Piotr Mitros
4e915d5268
Masquerading works
2012-05-08 14:13:28 -04:00
Calen Pennington
9d6878226f
Remove the csrf domain from the default settings because we don't need it (we don't have requests going between multiple servers in the same domain). This will make it so that we can test servers from any url, rather than just a single url
2012-05-08 14:13:28 -04:00
Calen Pennington
9ac2c559a9
Make local file uploads work in dev environment
2012-05-08 14:13:28 -04:00
