summaryrefslogtreecommitdiffstats
path: root/templates
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'osqa/master'Adolfo Fitoria2010-02-15182-21415/+0
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: forum/skins/default/media/js/wmd/wmd.js forum/skins/default/templates/base.html forum/skins/default/templates/base_content.html forum/views.py locale/en/LC_MESSAGES/django.mo locale/en/LC_MESSAGES/django.po settings_local.py.dist
| * started working towards skinning forum app - first step - move templates to appEvgeny Fadeev2010-02-09182-20594/+0
| |
| * fixed a little bug that i have planted into fbconnect before, removed unused ↵Evgeny Fadeev2010-02-085-4/+21
| | | | | | | | files fixed email signup form validation
* | Merge branch 'evgenyfadeev/master'Adolfo Fitoria2010-02-0928-776/+1506
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: django_authopenid/util.py forum/feed.py forum/views.py settings.py settings_local.py.dist templates/about.html templates/content/style/style.css templates/question.html templates/questions.html
| * | Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into ↵Adolfo Fitoria2010-02-0928-1363/+1214
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | evgenyfadeev/master Conflicts: forum/management/commands/send_email_alerts.py locale/en/LC_MESSAGES/django.mo settings.py templates/about.html templates/authopenid/complete.html templates/authopenid/external_legacy_login_info.html templates/content/js/com.cnprog.post.js templates/content/js/com.cnprog.utils.js templates/content/style/style.css templates/question.html templates/questions.html
| | * remove experimental and unused files, small cleanupsEvgeny Fadeev2010-02-027-334/+0
| | |
| | * Default OSQA logo imageRick Ross2010-01-311-0/+0
| | |
| | * recaptcha for conventional registration\n\Evgeny Fadeev2010-01-2429-127/+511
| | | | | | | | | | | | | | | | | | | | | | | | simpler email subscription form at registration\n\ fixed urls in rss feed\n\ added experimental remote password login api (cleartext password for remote site entered locally)\n\ included example for Mediawiki Authentication plugin\n\ very simple message to everyone management command
| | * fixed small error in html and style of signin viewEvgeny Fadeev2010-01-243-11/+17
| | |
| | * dos2unix everything, added dos2unix.sh scriptEvgeny Fadeev2010-01-241-690/+690
| | |
| | * Handled the returning user case, and the proper redirects in the case of an ↵hrcerqueira2010-01-223-97/+105
| | | | | | | | | | | | anonymous question or answer.
| | * Handle the case were user logs in with facebook for the first time.hrcerqueira2010-01-223-2/+8
| | |
| | * Added the basic html and javascript of fb connect, and a setting in ↵hrcerqueira2010-01-213-268/+274
| | | | | | | | | | | | settings_local.py.dist for the fb api key.
| | * Users no long are allowed to change their username, and the email address is ↵hrcerqueira2010-01-201-95/+95
| | | | | | | | | | | | now a required field.
| | * Made sorting tabs work in question searchhrcerqueira2010-01-201-235/+235
| | |
| | * Fixed the redirect when anonymous users try to vote.hrcerqueira2010-01-202-1197/+1200
| | |
| | * added a short name setting for the app and modified the default about page ↵Rick Ross2010-01-161-18/+12
| | | | | | | | | | | | to use it
* | | 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 07:22:08 +0000