summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixing error with signupAdolfo Fitoria2009-08-174-111/+97
* Merge branch 'master' into experimentalAdolfo Fitoria2009-08-173-18/+16
|\
| * fixing question template bug for closed questionsAdolfo Fitoria2009-08-173-117/+94
* | 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
* | fixing a stupid error by /meAdolfo Fitoria2009-08-161-17/+0
* | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-1636-1043/+1161
|\|
| * Merge branch 'evgenyfadeev/master'Adolfo Fitoria2009-08-1636-983/+1065
| |\
| | * added temp Awards aggregation fix, and fixed url in views.pyEvgeny Fadeev2009-08-131-11/+25
| | * Added Adolfo's canonical url link fixEvgeny Fadeev2009-08-122-3/+1
| | * merged Bruno url translations, removed his local mods, added settings.BOOKS_O...Evgeny Fadeev2009-08-1221-618/+580
| | * 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-114-7/+8
| | * Fix for analytics to work, testing.Bruno Sarlo2009-08-111-1/+1
| | * TypoBruno Sarlo2009-08-111-1/+1
| | * FAQ translation for Preguntalo.com.uyBruno Sarlo2009-08-112-256/+360
| | * Typo.Bruno Sarlo2009-08-111-1/+1
| | * Fixed MyOpenID bug. It was not in the list of providers.Bruno Sarlo2009-08-111-0/+1
| | * Merge branch 'master' of git://github.com/evgenyfadeev/CNPROGBruno Sarlo2009-08-1151-237/+314
| | |\
| | * | Translation.Bruno Sarlo2009-08-101-1/+1
| | * | Translation.Bruno Sarlo2009-08-102-2/+2
| | * | Applied preguntalo.com.uy colors.Bruno Sarlo2009-08-091-3/+3
| | * | Included i18n for links site-wide. Hope there is no bit left.Bruno Sarlo2009-08-0924-144/+278
| | * | Added About for Preguntalo.com.uyBruno Sarlo2009-08-091-4/+7
| | * | Added revers urls for links to work with i18n.Bruno Sarlo2009-08-093-15/+15
| | * | Made local settings work again.Bruno Sarlo2009-08-091-9/+0
| | * | Changes for preguntalo project's header.Bruno Sarlo2009-08-081-3/+4
| | * | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROGBruno Sarlo2009-08-08118-8647/+10623
| | |\ \
| | * | | Removed settings_local.py to be able to merge.Bruno Sarlo2009-08-081-0/+1
| | * | | Tal vez no sea tan mala idea publicar los .mo. :)Bruno Sarlo2009-08-071-2/+0
| | * | | Mas diseño, idioma, etc.Bruno Sarlo2009-08-074-9/+9
| | * | | Diseño en general.Bruno Sarlo2009-08-073-23/+24
| | * | | LogosBruno Sarlo2009-08-072-0/+118
| | * | | Ignore .mo, .pyc, etc.Bruno Sarlo2009-08-071-0/+3
| | * | | Spanish translation.Bruno Sarlo2009-08-072-459/+595
| * | | | Fixing translations errors(adding .mo)Adolfo Fitoria2009-08-122-1/+1
| |\ \ \ \
* | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-123-2/+2
|\| | | | |
| * | | | | updating some missing translationsAdolfo Fitoria2009-08-123-4/+4
* | | | | | Merge branch 'experimental' of git@github.com:fitoria/CNPROG into experimentalAdolfo Fitoria2009-08-121-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into experimentalAdolfo Fitoria2009-08-1249-205/+212
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-121-4/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | updating some missing translationsAdolfo Fitoria2009-08-121-4/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-121-1/+1
|\| | | | |
| * | | | | fixing canonical tagAdolfo Fitoria2009-08-121-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-1249-205/+208
|\| | | | | |/ / / |/| | |
| * | | untested commit. merged Adolfos mods, validated most of html, slugify urls, f...Evgeny Fadeev2009-08-1049-204/+199
* | | | adding simple registrationAdolfo Fitoria2009-08-114-10/+10
* | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-095-47/+46
|\| | |
| * | | adding meta keywords to questions and canonical tagAdolfo Fitoria2009-08-092-0/+6
| * | | modified settings.py and settings_local.py.dist to be more organizedAdolfo Fitoria2009-08-092-46/+39