summaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'evgenyfadeev/master'Adolfo Fitoria2010-02-0975-1151/+3005
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore INSTALL TODO cnprog.wsgi django_authopenid/urls.py django_authopenid/views.py drop-all-tables.sh forum/auth.py forum/managers.py forum/models.py forum/templatetags/extra_tags.py forum/views.py locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po settings.py settings_local.py.dist sql_scripts/update_2009_01_25_001.sql sql_scripts/update_2009_02_26_001.sql sql_scripts/update_2009_04_10_001.sql templates/authopenid/confirm_email.txt templates/authopenid/sendpw_email.txt templates/content/js/compress.bat templates/content/js/flot-build.bat templates/content/style/style.css templates/footer.html templates/question.html templates/user_reputation.html templates/user_stats.html templates/user_votes.html templates/users_questions.html urls.py
| * Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into ↵Adolfo Fitoria2009-12-1525-43/+599
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | evgenyfadeev/master Conflicts: INSTALL LICENSE TODO cnprog.wsgi context.py development.log forum/feed.py forum/forms.py forum/management/commands/send_email_alerts.py forum/managers.py forum/models.py forum/templatetags/extra_filters.py forum/templatetags/extra_tags.py forum/urls.py forum/views.py locale/en/LC_MESSAGES/django.mo locale/en/LC_MESSAGES/django.po middleware/__init__.py middleware/anon_user.py settings.py settings_local.py.dist templates/about.html templates/authopenid/complete.html templates/authopenid/external_legacy_login_info.html templates/base.html templates/base_content.html templates/content/js/com.cnprog.admin.js templates/content/js/com.cnprog.i18n.js templates/content/js/com.cnprog.post.js templates/content/js/com.cnprog.utils.js templates/content/js/wmd/wmd.js templates/content/style/style.css templates/question.html templates/questions.html templates/unanswered.html templates/user_email_subscriptions.html templates/user_reputation.html templates/user_stats.html templates/user_votes.html
| | * added sitemap at /sitemap.xml and fixed per tag subscription (hopefully)Evgeny Fadeev2009-12-092-146/+12
| | |
| | * better selector of ignored questions, split javascript tag_selector into ↵Evgeny Fadeev2009-12-094-169/+173
| | | | | | | | | | | | separate file, fixed question counter messages in the english lang file
| | * added interesting and ignored tag selectors (works) and per-tag subscription ↵Evgeny Fadeev2009-12-0814-56/+314
| | | | | | | | | | | | (not tested yet)
| | * merged with CNPROG branchEvgeny Fadeev2009-11-283-8/+7
| | |\
| | | * 1. update var setting in blocktranssailingcai2009-10-141-1/+1
| | | |
| | | * 1. adjust logo css, remove margin-bottomsailingcai2009-10-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | 2. add urlquote in get_absolute_url 3. enable QuestionsPageSizeMiddleware middleware 4. remove unused code
| | | * remove settings_local.pyunknown2009-08-122-7/+7
| | | |
| | * | fixed some local merge errorsEvgeny Fadeev2009-11-282-9/+0
| | | |
| | * | configuration of javascript base url is no longer neededEvgeny Fadeev2009-11-286-22/+34
| | | |
| | * | fixed user tag selection and count, link points to user authored ↵Evgeny Fadeev2009-11-251-4/+5
| | | | | | | | | | | | | | | | questions/answers, fixed diff_date a little
| | * | fixed error in template and removed ADMINS and DEBUG settings from settings.pyroot2009-11-251-6/+3
| | | |
| | * | tiny fix in javascript language fileEvgeny Fadeev2009-11-231-1/+1
| | | |
| | * | improved email subscription job, some small fixes, users now can change ↵Evgeny Fadeev2009-11-234-4/+8
| | | | | | | | | | | | | | | | their screen name any time
| | * | small css fixEvgeny Fadeev2009-11-221-0/+3
| | | |
| | * | fixed broken links in few places, added Arvyd's modification of ↵Evgeny Fadeev2009-11-225-21/+20
| | | | | | | | | | | | | | | | user_reputation view, email sender cron job, some edits in INSTALL file
| | * | full text search with Sphinx, added session-based greeting message for the ↵Evgeny Fadeev2009-11-174-10/+45
| | | | | | | | | | | | | | | | first time visitor
| | * | better comments, email subscriptions, corrected view counter, some ie7 ↵root2009-11-1370-1029/+2407
| | | | | | | | | | | | | | | | issues, wiki optional with settings.WIKI_ON, site can be mounted on arbitrary url prefix, english language improvements, added feedback form, versioned css and js files to force browser cache reload when settings.RESOURCE_REVISION is incremented , other fixes
| | * | added Adolfos mods, django_authopeid bug, unified traditional and OpenID loginEvgeny Fadeev2009-08-1910-41/+87
| | | |
| | * | fixing question template bug for closed questionsAdolfo Fitoria2009-08-171-2/+2
| | | |
| | * | 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
| | | * | untested commit. merged Adolfos mods, validated most of html, slugify urls, ↵Evgeny Fadeev2009-08-1044-166/+154
| | | | | | | | | | | | | | | | | | | | fixed IE issues in openid signin
| | | * | 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
| | | | |
| | | * | translating templates/content/js/com.cnprog.i18n.js to SpanishAdolfo Fitoria2009-08-081-1/+60
| | | |/
| | * | 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
| | | * 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
| | | * added some more filesEvgeny Fadeev2009-08-0519-0/+140
| | | |
| | | * added anonymous posting, per-question subscription and fixes by Pothers and ↵Evgeny Fadeev2009-08-0552-399/+678
| | | | | | | | | | | | | | | | some more, see development.log
| | | * included changes by Adolfo and Chaitanya and found temporary fix for languagesEvgeny Fadeev2009-08-0414-2064/+2066
| | | |
| | | * removed junk filesEvgeny Fadeev2009-08-037-418/+0
| | | |
| | | * Merged Mikes changes again and phoenix24 fix of python2.5 problemEvgeny Fadeev2009-08-034-6/+3
| | | |\
| | | * | added APP_TITLE, APP_KEYWORDS and APP_DESCRIPTIONEvgeny Fadeev2009-07-272-5/+4
| | | | |
| | | * | merged in latest Mikes changesEvgeny Fadeev2009-07-268-14/+128
| | | | |
| | | * | little templatetags translation modificationsBruno Sarlo2009-07-202-10/+6
| | | | |
| * | | | better comments, email subscriptions, corrected view counter, some ie7 ↵root2009-11-1370-1029/+2407
| | | | | | | | | | | | | | | | | | | | issues, wiki optional with settings.WIKI_ON, site can be mounted on arbitrary url prefix, english language improvements, added feedback form, versioned css and js files to force browser cache reload when settings.RESOURCE_REVISION is incremented , other fixes