summaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into experimentalAdolfo Fitoria2009-09-054-15/+5
|\ | | | | | | | | Conflicts: templates/question.html
| * fixing more url stuffAdolfo Fitoria2009-09-053-4/+4
| |
| * fixing related questions and urlAdolfo Fitoria2009-09-051-2/+2
| |
* | hiding commentAdolfo Fitoria2009-09-051-10/+1
| |
* | Merge branch 'master' into experimentalAdolfo Fitoria2009-09-051-2/+2
|\|
| * fixing a url bug in users_questions templateAdolfo Fitoria2009-08-291-2/+2
| |
* | Fixing bugs, adding evgeny's changesAdolfo Fitoria2009-08-218-39/+84
|\| | | | | | | | | | | | | Conflicts: django_authopenid/urls.py templates/authopenid/sendpw.html templates/authopenid/signin.html
| * added Adolfos mods, django_authopeid bug, unified traditional and OpenID loginEvgeny Fadeev2009-08-1910-41/+87
| |
* | adding the editor with anonymous postingAdolfo Fitoria2009-08-181-1/+1
| |
* | fixing error with signupAdolfo Fitoria2009-08-171-7/+1
| |
* | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-171-2/+2
|\| | | | | | | | | | | Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po
| * fixing question template bug for closed questionsAdolfo Fitoria2009-08-171-2/+2
| |
* | fixing a stupid error by /meAdolfo Fitoria2009-08-161-17/+0
| |
* | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-1623-160/+134
|\| | | | | | | | | | | | | | | | | | | Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po templates/footer.html templates/header.html templates/index.html urls.py
| * Added Adolfo's canonical url link fixEvgeny Fadeev2009-08-121-1/+1
| |
| * merged Bruno url translations, removed his local mods, added ↵Evgeny Fadeev2009-08-1212-229/+65
| | | | | | | | settings.BOOKS_ON, validated more templates
| * Fixed voting problem. Should still work on i18n for JS voting and some urls.Bruno Sarlo2009-08-112-1/+3
| | | | | | | | Non-ascii chars in tags bring syntax error for new meta-tags parsing.
| * 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-111-7/+1
| |
| * Merge branch 'master' of git://github.com/evgenyfadeev/CNPROGBruno Sarlo2009-08-1143-160/+211
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: forum/views.py locale/es/LC_MESSAGES/django.mo settings_local.py templates/answer_edit_tips.html templates/book.html templates/header.html templates/index.html templates/question_edit_tips.html templates/user_stats.html templates/user_tabs.html templates/users_questions.html
| * | Translation.Bruno Sarlo2009-08-101-1/+1
| | | | | | | | | | | | * translate url update profile
| * | Translation.Bruno Sarlo2009-08-101-1/+1
| | |
| * | 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-0920-55/+55
| | |
| * | Added About for Preguntalo.com.uyBruno Sarlo2009-08-091-4/+7
| | |
| * | Added revers urls for links to work with i18n.Bruno Sarlo2009-08-091-11/+11
| | |
| * | Changes for preguntalo project's header.Bruno Sarlo2009-08-081-3/+4
| | | | | | | | | | | | | | | * give priorty to "ask question" * small airy space to header
| * | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROGBruno Sarlo2009-08-0882-2451/+2893
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Merge of Spanish translation, still missing some texts. * Custom colors for preguntalo project Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po templates/content/style/style.css
| * | | Mas diseño, idioma, etc.Bruno Sarlo2009-08-073-8/+8
| | | |
| * | | Diseño en general.Bruno Sarlo2009-08-073-23/+24
| | | |
| * | | LogosBruno Sarlo2009-08-072-0/+118
| | | |
* | | | 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-1244-166/+162
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: locale/es/LC_MESSAGES/django.po templates/authopenid/sendpw.html templates/authopenid/signin.html templates/header.html templates/index.html templates/question_edit.html
| * | | untested commit. merged Adolfos mods, validated most of html, slugify urls, ↵Evgeny Fadeev2009-08-1044-166/+154
| | | | | | | | | | | | | | | | fixed IE issues in openid signin
* | | | adding simple registrationAdolfo Fitoria2009-08-112-5/+5
| | | |
* | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-08-092-1/+4
|\| | |
| * | | adding meta keywords to questions and canonical tagAdolfo Fitoria2009-08-091-0/+3
| | | |
| * | | fixing stupid bug in templates.content/js/com.cnprog.i18n.jsAdolfo Fitoria2009-08-091-1/+1
| | | |
* | | | fixing stupid bug in header.htmlAdolfo Fitoria2009-08-091-4/+4
| | | |
* | | | deleting non used fileAdolfo Fitoria2009-08-091-518/+0
| | | |
* | | | adding categories suport to templates (need more style)Adolfo Fitoria2009-08-095-0/+532
| | | |
* | | | adding category to questionsAdolfo Fitoria2009-08-081-0/+56
| | | |
* | | | 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-081-4/+1
|\| | | | | | | | | | | | | | | | | | | | Conflicts: forum/models.py forum/views.py locale/es/LC_MESSAGES/django.po
| * | added spanish mods by Adolfo, fix in email notification and minor template ↵Evgeny Fadeev2009-08-071-4/+1
| | | | | | | | | | | | change, removed site-specific staff from english .po file
* | | Fixing error in footerAdolfo Fitoria2009-08-061-2/+2
| | |
* | | Merge branch 'evgenyfadeev/master' into experimentalAdolfo Fitoria2009-08-0681-2446/+2891
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: forum/models.py templates/footer.html templates/header.html templates/index.html urls.py