Commit Graph

228 Commits

Author SHA1 Message Date
Piotr Mitros
c7059bb005 import bug fixed (runserver vs. runfcgi issue) 2012-01-29 21:55:35 -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
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
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
8125180edc Major number of minor cleanups. Fixed from e-mail, import order, ==None, etc. 2012-01-28 12:10:56 -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
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
ca44cf07b2 Added 'view revision' on wiki history 2012-01-27 17:24:07 -05:00
David Ormsbee
efdaa04742 convert more prints to logging 2012-01-27 10:57:36 -05:00
David Ormsbee
ab00c78886 merging hgignore changes 2012-01-26 19:08:17 -05:00
David Ormsbee
e5ca9618ea remove /login from tracking logs so we don't capture passwords 2012-01-26 19:05:52 -05:00
Bridger Maxwell
3eceb8a920 Merge 2012-01-26 19:04:02 -05:00
Bridger Maxwell
978752ad98 The default is now the new askbot. Switch over. 2012-01-26 19:02:38 -05:00
David Ormsbee
79c1cf19a0 typo in login error 2012-01-26 16:35:04 -05:00
David Ormsbee
cb77b9d316 merge logging changes 2012-01-26 15:05:43 -05:00
David Ormsbee
cf210ea171 switch tracking to use logger 2012-01-26 15:03:19 -05:00
Piotr Mitros
fd8b1e50c2 Staging new Askbot, some work on completion framework 2012-01-26 14:26:44 -05:00
David Ormsbee
fd79da9a7a added some sample logging to login process 2012-01-26 13:50:21 -05:00
David Ormsbee
a7e746d332 Merge 2012-01-26 12:36:11 -05:00
Bridger Maxwell
1bea71a459 Added ignore for DS_Store files. 2012-01-26 12:13:51 -05:00
David Ormsbee
63cb53c919 Move logging config, add tracking info to console, remove logging tests. 2012-01-25 16:30:32 -05:00
Piotr Mitros
f6ad9d51b4 Merge 2012-01-25 14:00:01 -05:00
Piotr Mitros
fb2f4b6c1a Incomplete file added to sync between computers 2012-01-25 13:59:45 -05:00
Bridger Maxwell
077603bb9e Merge with wiki branch (make sure to update templates too). 2012-01-25 11:44:12 -05:00
Bridger Maxwell
08e7d06931 Fixed bug for first article creation.
--HG--
branch : bridgerwiki
2012-01-25 11:43:13 -05:00
Bridger Maxwell
614f156640 Added UI for locking article. Did more testing/bug fixes on deletion. Seems stable.
--HG--
branch : bridgerwiki
2012-01-24 20:56:12 -05:00
Piotr Mitros
5a5e65a918 Related bug fixed 2012-01-24 20:18:20 -05:00
Piotr Mitros
d0c8722da4 Revert reversed. Database insert vs. update bug fixed 2012-01-24 20:16:06 -05:00
Bridger Maxwell
056924ad6f Got most of deleting working.
--HG--
branch : bridgerwiki
2012-01-24 20:05:14 -05:00
Bridger Maxwell
b3797a41f3 Got most of admin deleting and user deleting implemented. Need to work on interface for encountering deleted articles.
--HG--
branch : bridgerwiki
2012-01-24 15:58:22 -05:00
Piotr Mitros
98efb8c005 Tab type missing in list of modules 2012-01-24 15:42:52 -05:00
Piotr Mitros
8b4efadfd8 Profile page path issue 2012-01-24 14:54:52 -05:00
Piotr Mitros
7971a02832 Previous change introduced a bug where Django's ORM would insert instead of update. Momentary revert. 2012-01-24 13:58:02 -05:00
Piotr Mitros
94a5c75088 Stage still needs old Askbot. Broken schema migrations. 2012-01-24 11:55:51 -05:00
Piotr Mitros
acafd3f66c Nasty bug fixes in when we can render. Need to apply to vertical too 2012-01-23 23:38:02 -05:00
Piotr Mitros
f3eb22e0e9 working on import issues 2012-01-23 23:24:30 -05:00
Piotr Mitros
150fbc80bb Fully qualified path in import. Attempting to debug staging problem 2012-01-23 22:57:56 -05:00
Piotr Mitros
17a0c1e186 New hgignore. Ignore this commit 2012-01-23 22:45:53 -05:00
Piotr Mitros
7ebdd04d57 Stupid infrastructure for benchmarking 2012-01-23 22:37:35 -05:00