Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG | Bruno Sarlo | 2009-08-08 | 118 | -8647/+10623 | |
| | |\ \ | ||||||
| | * | | | Removed settings_local.py to be able to merge. | Bruno Sarlo | 2009-08-08 | 1 | -0/+1 | |
| | * | | | Tal vez no sea tan mala idea publicar los .mo. :) | Bruno Sarlo | 2009-08-07 | 1 | -2/+0 | |
| | * | | | Mas diseño, idioma, etc. | Bruno Sarlo | 2009-08-07 | 4 | -9/+9 | |
| | * | | | Diseño en general. | Bruno Sarlo | 2009-08-07 | 3 | -23/+24 | |
| | * | | | Logos | Bruno Sarlo | 2009-08-07 | 2 | -0/+118 | |
| | * | | | Ignore .mo, .pyc, etc. | Bruno Sarlo | 2009-08-07 | 1 | -0/+3 | |
| | * | | | Spanish translation. | Bruno Sarlo | 2009-08-07 | 2 | -459/+595 | |
| * | | | | Fixing translations errors(adding .mo) | Adolfo Fitoria | 2009-08-12 | 2 | -1/+1 | |
| |\ \ \ \ | ||||||
* | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-12 | 3 | -2/+2 | |
|\| | | | | | ||||||
| * | | | | | updating some missing translations | Adolfo Fitoria | 2009-08-12 | 3 | -4/+4 | |
* | | | | | | Merge branch 'experimental' of git@github.com:fitoria/CNPROG into experimental | Adolfo Fitoria | 2009-08-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-12 | 49 | -205/+212 | |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
* | | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-12 | 1 | -4/+4 | |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| * | | | | | | updating some missing translations | Adolfo Fitoria | 2009-08-12 | 1 | -4/+4 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-12 | 1 | -1/+1 | |
|\| | | | | | ||||||
| * | | | | | fixing canonical tag | Adolfo Fitoria | 2009-08-12 | 1 | -1/+1 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-12 | 49 | -205/+208 | |
|\| | | | | |/ / / |/| | | | ||||||
| * | | | untested commit. merged Adolfos mods, validated most of html, slugify urls, f... | Evgeny Fadeev | 2009-08-10 | 49 | -204/+199 | |
* | | | | adding simple registration | Adolfo Fitoria | 2009-08-11 | 4 | -10/+10 | |
* | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-09 | 5 | -47/+46 | |
|\| | | | ||||||
| * | | | adding meta keywords to questions and canonical tag | Adolfo Fitoria | 2009-08-09 | 2 | -0/+6 | |
| * | | | modified settings.py and settings_local.py.dist to be more organized | Adolfo Fitoria | 2009-08-09 | 2 | -46/+39 | |
| * | | | fixing stupid bug in templates.content/js/com.cnprog.i18n.js | Adolfo Fitoria | 2009-08-09 | 1 | -1/+1 | |
* | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-09 | 2 | -2/+2 | |
|\| | | | ||||||
| * | | | fixing a translation (to fit style) | Adolfo Fitoria | 2009-08-09 | 2 | -2/+2 | |
* | | | | fixing stupid bug in header.html | Adolfo Fitoria | 2009-08-09 | 1 | -4/+4 | |
* | | | | 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 | |
* | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-09 | 2 | -42/+65 | |
|\| | | | ||||||
| * | | | adding os.path to the log file | Adolfo Fitoria | 2009-08-09 | 1 | -1/+1 | |
| * | | | moving settings values from settings.py to settings_local.py for better | Adolfo Fitoria | 2009-08-09 | 2 | -42/+65 | |
* | | | | deleting non used file | Adolfo Fitoria | 2009-08-09 | 1 | -518/+0 | |
* | | | | adding categories suport to templates (need more style) | Adolfo Fitoria | 2009-08-09 | 10 | -193/+731 | |
* | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-08 | 1 | -1/+4 | |
|\| | | | ||||||
| * | | | fixing a bug in question view | Adolfo Fitoria | 2009-08-08 | 1 | -1/+4 | |
* | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-08 | 1 | -0/+1 | |
|\| | | | ||||||
| * | | | fixing error in settings.py (missing template stuff for admin) | Adolfo Fitoria | 2009-08-08 | 1 | -0/+1 | |
* | | | | adding category to questions | Adolfo Fitoria | 2009-08-08 | 6 | -1/+112 | |
* | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-08 | 1 | -1/+60 | |
|\| | | | ||||||
| * | | | translating templates/content/js/com.cnprog.i18n.js to Spanish | Adolfo Fitoria | 2009-08-08 | 1 | -1/+60 | |
| | |/ | |/| | ||||||
* | | | Merge branch 'evgenyfadeev/master' into experimental | Adolfo Fitoria | 2009-08-08 | 8 | -3339/+223 | |
|\| | | ||||||
| * | | added spanish mods by Adolfo, fix in email notification and minor template ch... | Evgeny Fadeev | 2009-08-07 | 6 | -3109/+15 | |
| * | | adding some translation, fixing translation errors (Spanish) | Adolfo Fitoria | 2009-08-07 | 2 | -77/+60 | |
* | | | Fixing error in footer | Adolfo Fitoria | 2009-08-06 | 2 | -4/+4 | |
* | | | Merge branch 'evgenyfadeev/master' into experimental | Adolfo Fitoria | 2009-08-06 | 119 | -5883/+11327 | |
|\| | | ||||||
| * | | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfade... | Adolfo Fitoria | 2009-08-06 | 119 | -5885/+11327 | |
| |\ \ | ||||||
| | * | | removed unused file | Evgeny Fadeev | 2009-08-06 | 1 | -2/+0 |