summaryrefslogtreecommitdiffstats
path: root/forum
Commit message (Expand)AuthorAgeFilesLines
* merged adolfos branch, dos2unixd everythingEvgeny Fadeev2010-02-2214-1355/+1350
|\
| * Merge commit 'osqa/master'Adolfo Fitoria2010-02-15197-540/+24172
| |\
| * \ Merge branch 'evgenyfadeev/master'Adolfo Fitoria2010-02-0916-747/+1102
| |\ \
| | * \ Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfade...Adolfo Fitoria2010-02-0916-593/+948
| | |\ \
| * | | | Merge branch 'evgenyfadeev/master'Adolfo Fitoria2010-02-0915-628/+2062
| |\| | |
| | * | | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfade...Adolfo Fitoria2009-12-1511-219/+698
| | |\ \ \
| | * | | | better comments, email subscriptions, corrected view counter, some ie7 issues...root2009-11-1313-244/+1299
| * | | | | removing categories feature from masterAdolfo Fitoria2009-10-135-61/+1
| * | | | | Merge branch 'master' of git://github.com/cnprog/CNPROG into chinito/masterAdolfo Fitoria2009-10-133-867/+882
| |\ \ \ \ \
| | * | | | | 1. Optimize get votes in answerssailingcai2009-10-142-6/+15
| | * | | | | 1. refactor get_answers_from_questionsailingcai2009-10-132-11/+12
| | * | | | | 1. trim question titlesailingcai2009-10-121-1/+1
| | * | | | | 1. adjust logo css, remove margin-bottomsailingcai2009-10-122-5/+4
| | * | | | | fix tags sort bugMike Chen2009-08-241-5/+5
| | * | | | | update user_reputation for Django aggregation changesMike Chen2009-08-231-829/+844
| | * | | | | temporary fix for 1.1 aggregation compatible issueMike Chen2009-08-141-9/+21
| | * | | | | changes to unix modeMike Chen2009-08-093-0/+3335
| | * | | | | Merge branch 'master' of git@github.com:cnprog/CNPROGMike Chen2009-08-093-3335/+0
| | |\ \ \ \ \
| * | | | | | | fixing feed againAdolfo Fitoria2009-09-231-1/+1
| * | | | | | | fixing the feedAdolfo Fitoria2009-09-231-1/+1
| * | | | | | | fixing a stupid errorAdolfo Fitoria2009-09-151-1/+0
| * | | | | | | slugified categories urlAdolfo Fitoria2009-09-152-1/+5
| * | | | | | | fixing tab problemsAdolfo Fitoria2009-09-141-3/+3
| * | | | | | | modified diff_date filter for better outputAdolfo Fitoria2009-09-131-1/+2
| * | | | | | | fixing some stuffAdolfo Fitoria2009-09-131-3/+4
| * | | | | | | removing books from adminAdolfo Fitoria2009-09-061-12/+0
| * | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-09-052-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | fixing more url stuffAdolfo Fitoria2009-09-051-1/+1
| | * | | | | | | fixing related questions and urlAdolfo Fitoria2009-09-051-2/+2
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | fixing a bug in forum.viewsAdolfo Fitoria2009-08-211-2/+5
| * | | | | | | Fixing bugs, adding evgeny's changesAdolfo Fitoria2009-08-212-7/+3
| |\| | | | | |
| | * | | | | | added Adolfos mods, django_authopeid bug, unified traditional and OpenID loginEvgeny Fadeev2009-08-192-7/+3
| * | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-161-2/+6
| |\| | | | | |
| | * | | | | | fixing error on import in forum/views to work with django version < 1.1Adolfo Fitoria2009-08-161-2/+6
| * | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-162-28/+43
| |\| | | | | |
| | * | | | | | added temp Awards aggregation fix, and fixed url in views.pyEvgeny Fadeev2009-08-131-11/+25
| | * | | | | | merged Bruno url translations, removed his local mods, added settings.BOOKS_O...Evgeny Fadeev2009-08-122-6/+6
| | * | | | | | Added unicode encoding for tags.Bruno Sarlo2009-08-111-1/+1
| | * | | | | | Fixed voting problem. Should still work on i18n for JS voting and some urls.Bruno Sarlo2009-08-111-1/+1
| | * | | | | | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROGBruno Sarlo2009-08-115-18/+42
| | |\ \ \ \ \ \
| | * | | | | | | Included i18n for links site-wide. Hope there is no bit left.Bruno Sarlo2009-08-091-12/+13
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-123-13/+22
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | untested commit. merged Adolfos mods, validated most of html, slugify urls, f...Evgeny Fadeev2009-08-103-13/+22
| * | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-091-0/+3
| |\| | | | | |
| | * | | | | | adding meta keywords to questions and canonical tagAdolfo Fitoria2009-08-091-0/+3
| * | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-092-816/+822
| |\| | | | | |
| | * | | | | | fixing more python 2.4 compat issues (hope it will be the last ones)Adolfo Fitoria2009-08-092-2/+8
| * | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-091-2/+5
| |\| | | | | |
| | * | | | | | fixing python2.4 compat in viewsAdolfo Fitoria2009-08-091-2/+5
| * | | | | | | adding categories suport to templates (need more style)Adolfo Fitoria2009-08-093-5/+12