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 |
|
Piotr Mitros
|
768c085334
|
We can now use Amazon S3
|
2012-01-29 20:55:11 -05:00 |
|
Piotr Mitros
|
daec24d565
|
We can now use Amazon S3
|
2012-01-29 20:54:53 -05:00 |
|
fischerl
|
a1a37f700d
|
fixed previous merge
|
2012-01-29 17:19:07 -05:00 |
|
fischerl
|
e975d3f2f9
|
merge
|
2012-01-29 17:17:06 -05:00 |
|
fischerl
|
859afccd27
|
added handi book indexing url and view
|
2012-01-29 17:14:43 -05:00 |
|
Piotr Mitros
|
c99bc566ba
|
Forked django-mako into our project.
|
2012-01-29 13:40:52 -05:00 |
|
Piotr Mitros
|
9d4c91e4b4
|
Merge
|
2012-01-29 13:40:16 -05:00 |
|
Piotr Mitros
|
1e34b21a76
|
Merge marketing.html
|
2012-01-29 12:48:49 -05:00 |
|
Piotr Mitros
|
7ebc3d0077
|
Removed unnecessary script references and folded final URLs into marketing pages
|
2012-01-29 11:48:56 -05:00 |
|
Piotr Mitros
|
2a288bc386
|
Removed unnecessary script references and folded final URLs into marketing pages
|
2012-01-29 11:46:56 -05:00 |
|
Piotr Mitros
|
b86ba908da
|
Forked django middleware and moved it into the project. We'd like better django integration
|
2012-01-29 07:46:41 -05:00 |
|
Piotr Mitros
|
abef62a23a
|
Syncing between machines
|
2012-01-28 21:27:54 -05:00 |
|
Piotr Mitros
|
d85e36cd87
|
Merge
|
2012-01-28 13:30:43 -05:00 |
|
Piotr Mitros
|
81d7be7e45
|
Schematic wiki bug fixed
|
2012-01-28 13:29:49 -05:00 |
|
Piotr Mitros
|
8125180edc
|
Major number of minor cleanups. Fixed from e-mail, import order, ==None, etc.
|
2012-01-28 12:10:56 -05:00 |
|
Piotr Mitros
|
849c5d928c
|
Slightly better docs
|
2012-01-27 23:13:15 -05:00 |
|
Bridger Maxwell
|
1abeec786e
|
Merge
|
2012-01-27 23:03:41 -05:00 |
|
Piotr Mitros
|
cbd8a96431
|
Bug in last commit
|
2012-01-27 22:39:56 -05:00 |
|
Piotr Mitros
|
04a7be0ae7
|
Fixed e-mail in URLs.py, fixed 2 gjs bugs
|
2012-01-27 22:37:34 -05:00 |
|
Piotr Mitros
|
80e2421ee6
|
Password reset hardcoded to right domain. We should fix later
|
2012-01-27 22:35:10 -05:00 |
|
Piotr Mitros
|
1268530f7a
|
Preparing for stage
|
2012-01-27 22:09:47 -05:00 |
|
fischerl
|
6c1a7ce66e
|
default to cover of textbook
|
2012-01-27 19:16:24 -05:00 |
|
David Ormsbee
|
84794a230d
|
make sure exceptions that go all the way up the django stack are logged in our error logs when DEBUG=False
|
2012-01-27 19:07:46 -05:00 |
|
Bridger Maxwell
|
9cd32615e0
|
Added 'view revision' on wiki history
|
2012-01-27 17:24:19 -05:00 |
|
Bridger Maxwell
|
ca44cf07b2
|
Added 'view revision' on wiki history
|
2012-01-27 17:24:07 -05:00 |
|
Bridger Maxwell
|
c3a6ad2f8c
|
Module ids are unique even across module types. Fix bugs where other fields were being used for an id.
--HG--
branch : profiledev
|
2012-01-27 16:12:56 -05:00 |
|
Kyle Fiedler
|
a58d36bff9
|
Fixed conflicts
|
2012-01-27 16:12:11 -05:00 |
|
Kyle Fiedler
|
0510e96a2e
|
merge
|
2012-01-27 16:09:07 -05:00 |
|
Kyle Fiedler
|
2676c55ea7
|
added new index shot, fonts and generated css
|
2012-01-27 16:08:46 -05:00 |
|
Kyle Fiedler
|
ccafe302be
|
refactor some of the index html
|
2012-01-27 16:08:03 -05:00 |
|
Kyle Fiedler
|
0dc1465248
|
Change fonts to link to our server
|
2012-01-27 16:05:17 -05:00 |
|
Ernie Park
|
92e5cff869
|
clean up video files, use native controls and have HTML5 fallback
|
2012-01-27 14:40:16 -05:00 |
|
Kyle Fiedler
|
e0299cd6de
|
Styled textbook navigation
|
2012-01-27 14:04:18 -05:00 |
|