Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-09-05 | 4 | -15/+5 |
|\ | | | | | | | | | Conflicts: templates/question.html | ||||
| * | fixing more url stuff | Adolfo Fitoria | 2009-09-05 | 3 | -4/+4 |
| | | |||||
| * | fixing related questions and url | Adolfo Fitoria | 2009-09-05 | 1 | -2/+2 |
| | | |||||
* | | hiding comment | Adolfo Fitoria | 2009-09-05 | 1 | -10/+1 |
| | | |||||
* | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-09-05 | 1 | -2/+2 |
|\| | |||||
| * | fixing a url bug in users_questions template | Adolfo Fitoria | 2009-08-29 | 1 | -2/+2 |
| | | |||||
* | | Fixing bugs, adding evgeny's changes | Adolfo Fitoria | 2009-08-21 | 8 | -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 login | Evgeny Fadeev | 2009-08-19 | 10 | -41/+87 |
| | | |||||
* | | adding the editor with anonymous posting | Adolfo Fitoria | 2009-08-18 | 1 | -1/+1 |
| | | |||||
* | | fixing error with signup | Adolfo Fitoria | 2009-08-17 | 1 | -7/+1 |
| | | |||||
* | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-17 | 1 | -2/+2 |
|\| | | | | | | | | | | | Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po | ||||
| * | fixing question template bug for closed questions | Adolfo Fitoria | 2009-08-17 | 1 | -2/+2 |
| | | |||||
* | | fixing a stupid error by /me | Adolfo Fitoria | 2009-08-16 | 1 | -17/+0 |
| | | |||||
* | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-16 | 23 | -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 fix | Evgeny Fadeev | 2009-08-12 | 1 | -1/+1 |
| | | |||||
| * | merged Bruno url translations, removed his local mods, added ↵ | Evgeny Fadeev | 2009-08-12 | 12 | -229/+65 |
| | | | | | | | | settings.BOOKS_ON, validated more templates | ||||
| * | Fixed voting problem. Should still work on i18n for JS voting and some urls. | Bruno Sarlo | 2009-08-11 | 2 | -1/+3 |
| | | | | | | | | Non-ascii chars in tags bring syntax error for new meta-tags parsing. | ||||
| * | Fix for analytics to work, testing. | Bruno Sarlo | 2009-08-11 | 1 | -1/+1 |
| | | |||||
| * | Typo | Bruno Sarlo | 2009-08-11 | 1 | -1/+1 |
| | | |||||
| * | FAQ translation for Preguntalo.com.uy | Bruno Sarlo | 2009-08-11 | 1 | -7/+1 |
| | | |||||
| * | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG | Bruno Sarlo | 2009-08-11 | 43 | -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 Sarlo | 2009-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | | * translate url update profile | ||||
| * | | Translation. | Bruno Sarlo | 2009-08-10 | 1 | -1/+1 |
| | | | |||||
| * | | Applied preguntalo.com.uy colors. | Bruno Sarlo | 2009-08-09 | 1 | -3/+3 |
| | | | |||||
| * | | Included i18n for links site-wide. Hope there is no bit left. | Bruno Sarlo | 2009-08-09 | 20 | -55/+55 |
| | | | |||||
| * | | Added About for Preguntalo.com.uy | Bruno Sarlo | 2009-08-09 | 1 | -4/+7 |
| | | | |||||
| * | | Added revers urls for links to work with i18n. | Bruno Sarlo | 2009-08-09 | 1 | -11/+11 |
| | | | |||||
| * | | Changes for preguntalo project's header. | Bruno Sarlo | 2009-08-08 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | * give priorty to "ask question" * small airy space to header | ||||
| * | | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG | Bruno Sarlo | 2009-08-08 | 82 | -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 Sarlo | 2009-08-07 | 3 | -8/+8 |
| | | | | |||||
| * | | | Diseño en general. | Bruno Sarlo | 2009-08-07 | 3 | -23/+24 |
| | | | | |||||
| * | | | Logos | Bruno Sarlo | 2009-08-07 | 2 | -0/+118 |
| | | | | |||||
* | | | | 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 | 44 | -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 Fadeev | 2009-08-10 | 44 | -166/+154 |
| | | | | | | | | | | | | | | | | fixed IE issues in openid signin | ||||
* | | | | adding simple registration | Adolfo Fitoria | 2009-08-11 | 2 | -5/+5 |
| | | | | |||||
* | | | | Merge branch 'master' into experimental | Adolfo Fitoria | 2009-08-09 | 2 | -1/+4 |
|\| | | | |||||
| * | | | adding meta keywords to questions and canonical tag | Adolfo Fitoria | 2009-08-09 | 1 | -0/+3 |
| | | | | |||||
| * | | | fixing stupid bug in templates.content/js/com.cnprog.i18n.js | Adolfo Fitoria | 2009-08-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | fixing stupid bug in header.html | Adolfo Fitoria | 2009-08-09 | 1 | -4/+4 |
| | | | | |||||
* | | | | 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 | 5 | -0/+532 |
| | | | | |||||
* | | | | adding category to questions | Adolfo Fitoria | 2009-08-08 | 1 | -0/+56 |
| | | | | |||||
* | | | | 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 | 1 | -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 Fadeev | 2009-08-07 | 1 | -4/+1 |
| | | | | | | | | | | | | change, removed site-specific staff from english .po file | ||||
* | | | Fixing error in footer | Adolfo Fitoria | 2009-08-06 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'evgenyfadeev/master' into experimental | Adolfo Fitoria | 2009-08-06 | 81 | -2446/+2891 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: forum/models.py templates/footer.html templates/header.html templates/index.html urls.py |