This website requires JavaScript.
f30596c499
Merge branch 'master' into specific-error-handling
2012-05-17 11:39:21 -04:00
cc6e0c55c4
Cleaning up the envs/* files so that they will work with gunicorn_django
2012-05-17 11:18:32 -04:00
a61cbab3d1
Make tests work by default, without having to create any extra directories
2012-05-17 11:02:54 -04:00
37abb7aad1
Search the path for both django-admin.py and django-admin when running tests
2012-05-17 10:50:41 -04:00
2efc013316
Ignore long lines in pep8
2012-05-17 10:12:10 -04:00
4a9a28c76b
Clean up indentation in ssl_auth
2012-05-17 10:12:00 -04:00
56e8ecdf42
Have git create a folder that's required for the tests
2012-05-17 10:11:40 -04:00
d387843ccc
Fixing up check_course to pull in modules correctly
2012-05-17 09:18:36 -04:00
2bb7a77d01
changes the border and box-shadow of headings in courseware content so bottom border is not hidden
2012-05-16 16:25:36 -04:00
1652ec38de
changes text color of highlited section in courseware index from red to black
2012-05-17 09:05:15 -04:00
2d7e36b409
improves communication of current selection in the courseware index sidebar
2012-05-16 17:02:58 -04:00
2b4437c951
handles the case of no title or sub title in the courseware index links
2012-05-16 15:34:43 -04:00
12eb7cf6f3
wip more defined week headings
2012-05-16 15:07:23 -04:00
825cf0e03e
wip better communication of current page in course ware
2012-05-15 17:56:47 -04:00
ad44882835
Ike's changes to enable multicourse, new response types, etc.
2012-05-16 21:18:47 -04:00
e45eb9fbe1
minor fixes for IE bugs
2012-05-16 17:16:40 -04:00
5053ba4b99
Merge pull request #50 from MITx/el-border-radius-course-content-fix
2012-05-16 13:12:41 -07:00
5148746d0a
Fixes border radius overflow issue on course content wrapper
2012-05-16 12:33:45 -04:00
69321b4497
Display the appropriate type of error message depending on the type of the incoming request
2012-05-16 13:45:00 -04:00
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
1e8ab2240e
Added msising marketing files
2012-05-16 11:05:14 -04:00
ea87d82cc6
Merge pull request #47 from MITx/kf-scss-cleanup
2012-05-16 08:04:44 -07:00
c6c53be2c1
Migrate changes to settings.py to envs/*.py settings files
2012-05-16 11:01:23 -04:00
b17d83a459
Cleaned up unused functions now in bourbon and unused variables
2012-05-16 10:45:31 -04:00
60bd63a594
Removed print.scss, moved index to marketing, started to alphabatize
2012-05-15 16:55:46 -04:00
ff366ad6b2
Merge pull request #44 from MITx/gf-sequence-nav
2012-05-15 13:40:27 -07:00
d0a7326738
refactors some of the sequence nav styles
2012-05-15 16:34:21 -04:00
709faa4718
makes the sequence nav more semantic and replaces js hover with css
2012-05-15 15:51:37 -04:00
1b8ea44403
Exclude reports from debian package
2012-05-15 15:22:46 -04:00
3c9b2e3deb
Add pylint and pep8 to test deps
2012-05-15 14:53:23 -04:00
4a3929a28f
Move test reports into a separate directory
2012-05-15 14:50:01 -04:00
e3dc7d0a49
Don't step on Ruby's built in VERSION constant
2012-05-15 14:49:51 -04:00
337f1aff54
Add pylint command
2012-05-15 14:33:05 -04:00
08620eaf34
Fixing tests and removing unused/broken code
2012-05-15 14:02:33 -04:00
a712fe020f
Don't try and install stuff from requirements.txt
2012-05-15 13:18:59 -04:00
f7e947b5f5
Install all requirements before running tests
2012-05-15 10:58:43 -04:00
02bb23f46a
Minor formatting cleanup
2012-05-15 10:55:27 -04:00
2d75118592
Added nav for sidebar links
2012-05-14 16:41:39 -04:00
89afc98f76
Made links in sidebar all in p>
2012-05-14 16:39:29 -04:00
8567fb1655
Make rake test install the test requirements
2012-05-14 16:35:38 -04:00
a7995df63c
Use the django-nose test runner, for the coverage features
2012-05-14 16:34:26 -04:00
f0c07b28d1
Merge pull request #42 from MITx/ps-fix-global-context
2012-05-14 13:25:10 -07:00
28d12628f7
Fix missing global_context problem
2012-05-14 15:42:39 -04:00
c6a6144ade
Point at a test_data directory for testing
2012-05-14 13:16:14 -04:00
8f79c94d0a
Fix one more place where simplewiki was importing the wrong settings
2012-05-14 11:51:07 -04:00
ee258f7acf
Fix place where simplewiki was importing the wrong settings
2012-05-14 11:46:30 -04:00
0856f5517b
Disable askbot during tests
2012-05-14 11:21:17 -04:00
371ce6968c
Removing empty django module
2012-05-14 11:14:49 -04:00
8e78f73d00
Adding a test environment with some debug stuff turned off
2012-05-14 11:12:55 -04:00
21c2007541
Update requirements file to include requests
2012-05-14 12:02:48 -03:00
8989605cba
Moving in Ike's new files, touches of multicourse
2012-05-13 20:33:29 -04:00
15cae333d4
Ike's new input types
2012-05-13 19:58:39 -04:00
232e758c7a
Integrating some of Ike's courseware changes
2012-05-13 19:36:01 -04:00
756dc97897
Moved grading code from init to grades.py to fix existing scripts
2012-05-12 17:16:36 -04:00
095043ca8b
Custom response gives poor errors when there is no checker code
2012-05-12 15:16:29 -04:00
85079da3a7
Minor bug fix/conflict between grades and i4xsystem
2012-05-12 15:03:20 -04:00
747105e328
More minor cleanups
2012-05-11 17:05:14 -04:00
668062a19b
Minor cleanups to capa_module (comments, formatting, etc.)
2012-05-11 17:02:06 -04:00
577d8815a3
Adding sympy check. Needs to be code reviewed before enabling in prod.
2012-05-11 16:55:02 -04:00
c92f6dc903
Added beautifulsoup to requirements; merged more of Ike's settings.py
2012-05-11 14:23:30 -04:00
0028b3345e
jsonify in postJSON from multiple choice did -- indeed -- break things. Removed.
2012-05-11 14:02:09 -04:00
924a45fee4
Merge pull request #33 from MITx/MC
2012-05-11 10:35:37 -07:00
72dee8ba14
merge with master
2012-05-11 13:17:52 -04:00
a0201f37a0
names not required
2012-05-11 12:25:32 -04:00
98f19470f0
Fixed bad merge between Cale and Piotr/I4xSystem missing reference
2012-05-11 07:45:02 -04:00
1494cbbd85
Merged root URL prefix from Ike. Errors should be attributed to pmitros.
2012-05-10 23:16:34 -04:00
cd78267056
Update djangoapps/courseware/module_render.py
2012-05-10 23:24:11 -03:00
de4e22a344
Merge pull request #39 from MITx/ps-fix-reset-answer
2012-05-10 16:32:05 -07:00
52f1a482b8
Merge pull request #29 from MITx/anonymous_user
2012-05-10 16:28:18 -07:00
d879db5e10
Do not double-append the XML path in caps module
2012-05-10 19:05:55 -04:00
a4dae57751
merge with master
2012-05-10 12:25:33 -04:00
3fb185fb0c
Merge branch 'master' into anonymous_user
2012-05-10 11:47:14 -04:00
9c42c90412
Move to a normalized deploy name for .deb files
2012-05-10 11:43:46 -04:00
88da17f087
Glob package names before publishing
2012-05-10 11:38:32 -04:00
72f1cd1da3
Push all architecture .debs to the packages server
2012-05-10 11:36:43 -04:00
4ff31d1bdc
Push all architecture .debs to the packages server
2012-05-10 11:36:43 -04:00
7f92606ec9
responses to code review
2012-05-10 10:38:06 -04:00
41aaadf019
Add back in the exclusions for build artifacts
2012-05-10 10:18:05 -04:00
5011f60d45
Merge branch 'master' into anonymous_user
2012-05-10 09:17:26 -04:00
c1b255fdf3
Merge pull request #18 from MITx/grade-refactor
2012-05-09 15:00:25 -07:00
03d3508bd5
Merge pull request #38 from MITx/pmitros/xmod-reuse-refactor
2012-05-09 14:53:16 -07:00
0bff9a80d2
Merge
2012-05-09 17:52:39 -04:00
f511a5e0dd
Changed parameters from **args based on code review
2012-05-09 17:36:56 -04:00
3847dee605
Added official badge styling to staff questions
2012-05-09 15:30:12 -04:00
077d4a7d6d
Removing unneeded imports
2012-05-09 14:44:37 -04:00
8bd00b34ed
Merge pull request #37 from MITx/faq_addition
2012-05-09 09:46:55 -07:00
8ad1d3e17d
added questions to faq
2012-05-09 12:31:55 -04:00
38098df985
Merge branch 'kf-amplifier'
2012-05-08 15:01:03 -04:00
29dd45e517
Fix styles for play button
2012-05-08 14:43:49 -04:00
e0a313e36b
added more layout to amplifier
2012-05-08 14:12:59 -04:00
b50478331e
Added image for the slider handle
2012-05-08 10:04:45 -04:00
8841479624
Anonymize date stamps in problem solutions
2012-05-08 10:19:01 -04:00
ecf0126fce
Make the accordian expand 'Week 1' by default
2012-05-07 18:28:52 -04:00
dfee512ba8
Fix the wrong package name in requirements file
2012-05-07 18:14:03 -04:00
07629ef45d
Rewrite Courseware navigation
2012-04-26 17:39:57 -04:00
80aeaed5fe
Rewrite JavaScript on main page
2012-04-27 17:38:58 -04:00
43a6534e75
Add Jasmine to do a JavaScript unit test
2012-04-27 17:38:45 -04:00
d22566a310
Added pyfilesystem to requirements.txt; needed for further hacking; want in common root
2012-05-07 16:55:39 -04:00
171d40270f
Fixed some of the minor css bugs
2012-05-07 16:11:26 -04:00
4084aaef18
Make showanswer and rerandomize propogate downwards in course.xml
2012-04-30 14:30:32 -04:00
Calen Pennington