Commit Graph

10188 Commits

Author SHA1 Message Date
Piotr Mitros
da6c0613f1 Added print.css 2012-01-20 10:17:33 -05:00
fischerl
099be2fed7 merge 2012-01-20 00:33:10 -05:00
fischerl
a40d8f08df textbook index fixed 2012-01-20 00:32:27 -05:00
Kyle Fiedler
9b0136f1ca shorted hieght of header on course page 2012-01-19 22:50:30 -05:00
Kyle Fiedler
0b771777ce generated css 2012-01-19 22:49:57 -05:00
Kyle Fiedler
ef406ae356 new generated css 2012-01-19 22:28:10 -05:00
Kyle Fiedler
cb9a923747 edit max width so its not choppy 2012-01-19 22:27:50 -05:00
Kyle Fiedler
45a9bda33f added fix for firefox 2012-01-19 22:25:27 -05:00
Kyle Fiedler
2e7fd523cb Added more images and new generated css 2012-01-19 22:25:02 -05:00
Kyle Fiedler
d082f474ef Added generated new stylesheets and new images 2012-01-19 21:03:37 -05:00
cjt
25b92d8e5c add static content for labs 2012-01-19 19:58:51 -05:00
cjt
4f54c4b266 new .js files 2012-01-19 19:58:07 -05:00
Kyle Fiedler
b7e9aff117 Added js back in after breaking login 2012-01-19 17:09:50 -05:00
Kyle Fiedler
106b56a4fe added more styles for the marketing pages 2012-01-19 16:59:09 -05:00
Piotr Mitros
4bc58c5611 Option for new Askbot
--HG--
rename : settings.py => settings_old_askbot.py
2012-01-19 16:31:40 -05:00
Kyle Fiedler
7ec5dfaef9 Merge 2012-01-19 15:42:11 -05:00
Kyle Fiedler
eb71eaa1d8 Changed around most of the marketing styles and updated the content 2012-01-19 15:40:06 -05:00
fischerl
c310c37247 half-done textbook updates 2012-01-19 08:50:51 -05:00
Bridger Maxwell
fa39e96903 Merge 2012-01-18 23:27:59 -05:00
Bridger Maxwell
d47d95edf2 Removed simplewiki's custom 404 page so urls work better, and it uses global 404 page. Set bad debug setting to false 2012-01-18 21:43:23 -05:00
David Ormsbee
9619bf20ea moved logging level to INFO, replaced tabs with spaces in settings.py 2012-01-18 15:00:46 -05:00
Piotr Mitros
4e75a04ffa Problem tracking appears to work 2012-01-18 14:17:06 -05:00
Piotr Mitros
b0bbfc1b81 Fixed my own error in above 2012-01-18 13:14:16 -05:00
Piotr Mitros
a25b247849 Fixed bridger's bug in adding to settings.py instead of his local 2012-01-18 13:13:27 -05:00
Bridger Maxwell
cf9364fe1c Merge 2012-01-18 09:41:24 -05:00
Bridger Maxwell
ea15a5629a Changes to simplewiki reverse URL lookup 2012-01-18 09:41:07 -05:00
Piotr Mitros
8c979717cc Merge 2012-01-17 21:36:51 -05:00
Piotr Mitros
74e9fc7ab7 handouts 2012-01-17 21:33:52 -05:00
Piotr Mitros
2d08b32140 Course info 2012-01-17 21:28:55 -05:00
Piotr Mitros
028dac5491 Info tab 2012-01-17 21:28:23 -05:00
Bridger Maxwell
5c11bcd0c9 Merge 2012-01-17 19:03:05 -05:00
Bridger Maxwell
eb532d0d51 The 'not found' wiki page now has a working 'create article' link 2012-01-17 19:02:43 -05:00
Piotr Mitros
9155eedda3 manage.py has execute permissions 2012-01-17 13:39:49 -05:00
Ernie Park
a8e03a2427 merge 2012-01-16 21:43:04 -05:00
Ernie Park
c877e538f5 add html5 youtube iframe tag css to application.css 2012-01-16 21:42:51 -05:00
Piotr Mitros
9682aea995 Stupid typo in settings.py 2012-01-16 21:34:16 -05:00
Piotr Mitros
5859f466ec Run without courseware with --settings 2012-01-16 20:39:50 -05:00
Piotr Mitros
851bf3e692 Fixed revery in settings.py 2012-01-16 18:19:27 -05:00
Ernie Park
972001d3e9 merge 2012-01-16 16:25:05 -05:00
Ernie Park
fb9d4fe2a8 merge changes 2012-01-16 16:24:48 -05:00
Piotr Mitros
1fb47e9cdd settings.py had textbook. Worked on dev machines because .pyc files stuck around; didn't work on staging 2012-01-16 15:58:50 -05:00
Piotr Mitros
7600920f76 CJT's new schematic editor 2012-01-16 13:29:57 -05:00
Piotr Mitros
25389b5a2d Close page event logging works in FF and Chrome 2012-01-16 13:24:52 -05:00
Piotr Mitros
3ddddbe5c3 merge 2012-01-16 12:33:43 -05:00
Piotr Mitros
56c81a07fd Fixed -.33 bug in calculator from gjs 2012-01-16 12:33:29 -05:00
Bridger Maxwell
d909e89104 Added setting to generate random user credentials to test account creation. Might have accidentally stomped other changes to settings.py 2012-01-16 11:48:45 -05:00
Piotr Mitros
d65d268045 Fixed two minor errors. setting -> settings, default PERF_STATS in settings.py
--HG--
rename : setting_no_askbot.py => settings_no_askbot.py
2012-01-16 11:38:41 -05:00
Piotr Mitros
86bc89fd23 We can now manage.py runserver --settings=setting_no_askbot 2012-01-16 11:34:41 -05:00
Bridger Maxwell
bd52b9e419 Changed perfstats middleware to log sql queries 2012-01-15 16:47:22 -05:00
Bridger Maxwell
82cbb9a1d1 Matched stop and start calls in perf middleware. 2012-01-15 16:15:32 -05:00