| Commit message (Expand) | Author | Age | Files | Lines |
* | merged adolfos branch, dos2unixd everything | Evgeny Fadeev | 2010-02-22 | 14 | -1355/+1350 |
|\ |
|
| * | Merge commit 'osqa/master' | Adolfo Fitoria | 2010-02-15 | 197 | -540/+24172 |
| |\ |
|
| * \ | Merge branch 'evgenyfadeev/master' | Adolfo Fitoria | 2010-02-09 | 16 | -747/+1102 |
| |\ \ |
|
| | * \ | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfade... | Adolfo Fitoria | 2010-02-09 | 16 | -593/+948 |
| | |\ \ |
|
| * | | | | Merge branch 'evgenyfadeev/master' | Adolfo Fitoria | 2010-02-09 | 15 | -628/+2062 |
| |\| | | |
|
| | * | | | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfade... | Adolfo Fitoria | 2009-12-15 | 11 | -219/+698 |
| | |\ \ \ |
|
| | * | | | | better comments, email subscriptions, corrected view counter, some ie7 issues... | root | 2009-11-13 | 13 | -244/+1299 |
| * | | | | | removing categories feature from master | Adolfo Fitoria | 2009-10-13 | 5 | -61/+1 |
| * | | | | | Merge branch 'master' of git://github.com/cnprog/CNPROG into chinito/master | Adolfo Fitoria | 2009-10-13 | 3 | -867/+882 |
| |\ \ \ \ \ |
|
| | * | | | | | 1. Optimize get votes in answers | sailingcai | 2009-10-14 | 2 | -6/+15 |
| | * | | | | | 1. refactor get_answers_from_question | sailingcai | 2009-10-13 | 2 | -11/+12 |
| | * | | | | | 1. trim question title | sailingcai | 2009-10-12 | 1 | -1/+1 |
| | * | | | | | 1. adjust logo css, remove margin-bottom | sailingcai | 2009-10-12 | 2 | -5/+4 |
| | * | | | | | fix tags sort bug | Mike Chen | 2009-08-24 | 1 | -5/+5 |
| | * | | | | | update user_reputation for Django aggregation changes | Mike Chen | 2009-08-23 | 1 | -829/+844 |
| | * | | | | | temporary fix for 1.1 aggregation compatible issue | Mike Chen | 2009-08-14 | 1 | -9/+21 |
| | * | | | | | changes to unix mode | Mike Chen | 2009-08-09 | 3 | -0/+3335 |
| | * | | | | | Merge branch 'master' of git@github.com:cnprog/CNPROG | Mike Chen | 2009-08-09 | 3 | -3335/+0 |
| | |\ \ \ \ \ |
|
| * | | | | | | | fixing feed again | Adolfo Fitoria | 2009-09-23 | 1 | -1/+1 |
| * | | | | | | | fixing the feed | Adolfo Fitoria | 2009-09-23 | 1 | -1/+1 |
| * | | | | | | | fixing a stupid error | Adolfo Fitoria | 2009-09-15 | 1 | -1/+0 |
| * | | | | | | | slugified categories url | Adolfo Fitoria | 2009-09-15 | 2 | -1/+5 |
| * | | | | | | | fixing tab problems | Adolfo Fitoria | 2009-09-14 | 1 | -3/+3 |
| * | | | | | | | modified diff_date filter for better output | Adolfo Fitoria | 2009-09-13 | 1 | -1/+2 |
| * | | | | | | | fixing some stuff | Adolfo Fitoria | 2009-09-13 | 1 | -3/+4 |
| * | | | | | | | removing books from admin | Adolfo Fitoria | 2009-09-06 | 1 | -12/+0 |
| * | | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-09-05 | 2 | -3/+3 |
| |\ \ \ \ \ \ \ |
|
| | * | | | | | | | fixing more url stuff | Adolfo Fitoria | 2009-09-05 | 1 | -1/+1 |
| | * | | | | | | | fixing related questions and url | Adolfo Fitoria | 2009-09-05 | 1 | -2/+2 |
| | | |_|/ / / /
| | |/| | | | | |
|
| * | | | | | | | fixing a bug in forum.views | Adolfo Fitoria | 2009-08-21 | 1 | -2/+5 |
| * | | | | | | | Fixing bugs, adding evgeny's changes | Adolfo Fitoria | 2009-08-21 | 2 | -7/+3 |
| |\| | | | | | |
|
| | * | | | | | | added Adolfos mods, django_authopeid bug, unified traditional and OpenID login | Evgeny Fadeev | 2009-08-19 | 2 | -7/+3 |
| * | | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-16 | 1 | -2/+6 |
| |\| | | | | | |
|
| | * | | | | | | fixing error on import in forum/views to work with django version < 1.1 | Adolfo Fitoria | 2009-08-16 | 1 | -2/+6 |
| * | | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-16 | 2 | -28/+43 |
| |\| | | | | | |
|
| | * | | | | | | added temp Awards aggregation fix, and fixed url in views.py | Evgeny Fadeev | 2009-08-13 | 1 | -11/+25 |
| | * | | | | | | merged Bruno url translations, removed his local mods, added settings.BOOKS_O... | Evgeny Fadeev | 2009-08-12 | 2 | -6/+6 |
| | * | | | | | | Added unicode encoding for tags. | Bruno Sarlo | 2009-08-11 | 1 | -1/+1 |
| | * | | | | | | Fixed voting problem. Should still work on i18n for JS voting and some urls. | Bruno Sarlo | 2009-08-11 | 1 | -1/+1 |
| | * | | | | | | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG | Bruno Sarlo | 2009-08-11 | 5 | -18/+42 |
| | |\ \ \ \ \ \ |
|
| | * | | | | | | | Included i18n for links site-wide. Hope there is no bit left. | Bruno Sarlo | 2009-08-09 | 1 | -12/+13 |
| | | |/ / / / /
| | |/| | | | | |
|
| * | | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-12 | 3 | -13/+22 |
| |\ \ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | | |
|
| | * | | | | | | untested commit. merged Adolfos mods, validated most of html, slugify urls, f... | Evgeny Fadeev | 2009-08-10 | 3 | -13/+22 |
| * | | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-09 | 1 | -0/+3 |
| |\| | | | | | |
|
| | * | | | | | | adding meta keywords to questions and canonical tag | Adolfo Fitoria | 2009-08-09 | 1 | -0/+3 |
| * | | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-09 | 2 | -816/+822 |
| |\| | | | | | |
|
| | * | | | | | | fixing more python 2.4 compat issues (hope it will be the last ones) | Adolfo Fitoria | 2009-08-09 | 2 | -2/+8 |
| * | | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-09 | 1 | -2/+5 |
| |\| | | | | | |
|
| | * | | | | | | fixing python2.4 compat in views | Adolfo Fitoria | 2009-08-09 | 1 | -2/+5 |
| * | | | | | | | adding categories suport to templates (need more style) | Adolfo Fitoria | 2009-08-09 | 3 | -5/+12 |