Commit Graph

10188 Commits

Author SHA1 Message Date
aa
91f9c31e1f update 2012-01-31 15:21:53 -05:00
Kyle Fiedler
2d3ebff218 IE6 & 7 fixeS 2012-01-31 14:45:44 -05:00
fischerl
201d494510 added more subs 2012-01-31 11:13:03 -05:00
cjt
b5c05c5c2e get images in the right place 2012-01-31 10:56:38 -05:00
Kyle Fiedler
3d552243d5 Styled wiki delete button 2012-01-31 10:23:17 -05:00
Kyle Fiedler
c53483ce6d Merge 2012-01-31 09:48:43 -05:00
Kyle Fiedler
94016f8ba8 Minor edits to the index pages 2012-01-31 09:48:27 -05:00
Piotr Mitros
dd66eecfba Merge 2012-01-30 20:23:38 -05:00
Piotr Mitros
e8311db7a6 Better text for password change in profile page 2012-01-30 20:23:24 -05:00
Piotr Mitros
ef1bc23971 JSON password reset 2012-01-30 20:19:11 -05:00
Piotr Mitros
cf1b0a8655 Seq module makes nicer class types for Kyle's video styling 2012-01-30 17:44:02 -05:00
Reda Lemeden
f851063b04 Merge with Head 2012-01-30 17:34:01 -05:00
Reda Lemeden
82c1c70c0d Added style to the top section of the question view (voting+social still missing) 2012-01-30 17:31:41 -05:00
Kyle Fiedler
5e89fba41d Added min-height to subtitles to decrease the size change 2012-01-30 17:08:51 -05:00
Piotr Mitros
452333c743 Merge 2012-01-30 16:53:42 -05:00
Piotr Mitros
0645756bc7 favicon.ico 2012-01-30 16:53:12 -05:00
Kyle Fiedler
e6cea32d82 Changed around the text on the marketing pages 2012-01-30 16:50:47 -05:00
Piotr Mitros
811995a27e Changes needed for Askbot S3 2012-01-30 16:43:17 -05:00
Piotr Mitros
c23425b7cd Merge 2012-01-30 15:53:57 -05:00
Piotr Mitros
974f744289 Amazon S3 SSL 2012-01-30 15:53:16 -05:00
Kyle Fiedler
515dd66b67 merge 2012-01-30 15:52:22 -05:00
Kyle Fiedler
98f2c69193 Added images for video player and compiled css 2012-01-30 15:52:03 -05:00
Kyle Fiedler
3407fc9ec6 merge 2012-01-30 15:51:23 -05:00
Kyle Fiedler
bd570bee46 Added styles for the video player 2012-01-30 15:51:08 -05:00
fischerl
754fce5740 merge 2012-01-30 14:19:28 -05:00
fischerl
ebdd67edc1 added lecture 2 subs 2012-01-30 14:16:42 -05:00
Bridger Maxwell
6f2f08fb1c Merged in bug fixes from default
--HG--
branch : profiledev
2012-01-30 13:30:55 -05:00
Bridger Maxwell
9ba59fe3a4 Working on adding up graded scores for sections.
--HG--
branch : profiledev
2012-01-30 13:30:39 -05:00
David Ormsbee
6fa632c0c5 merged with deleted settings 2012-01-30 13:27:50 -05:00
David Ormsbee
b4a91ff486 Suppress op level exception logging middleware if TEMPLATE_DEBUG=True 2012-01-30 13:27:18 -05:00
Piotr Mitros
134165fed4 Near-final TOS, Honor Code, Copyright 2012-01-30 12:49:18 -05:00
Piotr Mitros
f7eef6b217 Removed old settings 2012-01-30 12:48:47 -05:00
David Ormsbee
9a0af7f47d remove outdated logging comment 2012-01-30 12:41:59 -05:00
David Ormsbee
3622f81c69 update logging to add pid to filename, so we don't have to worry about multiple processes trying to share the same log file 2012-01-30 12:40:35 -05:00
Bridger Maxwell
c6d2ea6afb Merge with default branch
--HG--
branch : profiledev
2012-01-30 12:39:51 -05:00
Kyle Fiedler
78a2b2239e Compliled sass 2012-01-30 12:09:59 -05:00
Kyle Fiedler
712b97115d Fixed topbar bug in discussion 2012-01-30 12:09:23 -05:00
Kyle Fiedler
86e3f473cd Added new error pages and changed textbook image 2012-01-30 11:59:12 -05:00
Kyle Fiedler
3fa9b89833 Merge 2012-01-30 11:52:18 -05:00
Kyle Fiedler
33060c358a Added new treeview image 2012-01-30 11:51:55 -05:00
Kyle Fiedler
af183fc023 Added 404 and server down pages 2012-01-30 11:31:48 -05:00
cjt
c81bf892bf images for Lab 1 2012-01-30 09:56:47 -05:00
cjt
365e9a49c3 move lab images into data/images 2012-01-30 09:50:53 -05:00
David Ormsbee
3a6a43c055 Update logging handlers to use WatchedFileHandler (TimedRotatingFileHandler has problems with multiple processes) 2012-01-29 22:45:34 -05:00
Piotr Mitros
9ad26e0646 Bug in tracking framework when no cookie 2012-01-29 22:17:04 -05:00
Piotr Mitros
2222e5b781 Attemping another fix for staging... 2012-01-29 21:59:27 -05:00
Piotr Mitros
c7059bb005 import bug fixed (runserver vs. runfcgi issue) 2012-01-29 21:55:35 -05:00
Piotr Mitros
8e14bbae97 Marketing page closer to Kyle/Reda 2012-01-29 21:55:00 -05:00
Piotr Mitros
a17dbb3c24 Fixed bugs from lfischer merge 2012-01-29 21:47:55 -05:00
Piotr Mitros
29c7f529b5 merge 2012-01-29 20:55:50 -05:00