summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | 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
| * | | fixing stupid bug in templates.content/js/com.cnprog.i18n.jsAdolfo Fitoria2009-08-091-1/+1
* | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-092-2/+2
|\| | |
| * | | fixing a translation (to fit style)Adolfo Fitoria2009-08-092-2/+2
* | | | fixing stupid bug in header.htmlAdolfo Fitoria2009-08-091-4/+4
* | | | 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
* | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-092-42/+65
|\| | |
| * | | adding os.path to the log fileAdolfo Fitoria2009-08-091-1/+1
| * | | moving settings values from settings.py to settings_local.py for betterAdolfo Fitoria2009-08-092-42/+65
* | | | deleting non used fileAdolfo Fitoria2009-08-091-518/+0
* | | | adding categories suport to templates (need more style)Adolfo Fitoria2009-08-0910-193/+731
* | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-081-1/+4
|\| | |
| * | | fixing a bug in question viewAdolfo Fitoria2009-08-081-1/+4
* | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-081-0/+1
|\| | |
| * | | fixing error in settings.py (missing template stuff for admin)Adolfo Fitoria2009-08-081-0/+1
* | | | adding category to questionsAdolfo Fitoria2009-08-086-1/+112
* | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-081-1/+60
|\| | |
| * | | translating templates/content/js/com.cnprog.i18n.js to SpanishAdolfo Fitoria2009-08-081-1/+60
| | |/ | |/|
* | | Merge branch 'evgenyfadeev/master' into experimentalAdolfo Fitoria2009-08-088-3339/+223
|\| |
| * | added spanish mods by Adolfo, fix in email notification and minor template ch...Evgeny Fadeev2009-08-076-3109/+15
| * | adding some translation, fixing translation errors (Spanish)Adolfo Fitoria2009-08-072-77/+60
* | | Fixing error in footerAdolfo Fitoria2009-08-062-4/+4
* | | Merge branch 'evgenyfadeev/master' into experimentalAdolfo Fitoria2009-08-06119-5883/+11327
|\| |
| * | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfade...Adolfo Fitoria2009-08-06119-5885/+11327
| |\ \
| | * | removed unused fileEvgeny Fadeev2009-08-061-2/+0