summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merged adolfos branch, dos2unixd everythingEvgeny Fadeev2010-02-2231-3117/+3587
|\
| * deleting filesAdolfo Fitoria2010-02-161-132/+0
| |
| * Merge commit 'osqa/master'Adolfo Fitoria2010-02-15215-2305/+4405
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'evgenyfadeev/master'Adolfo Fitoria2010-02-0988-2494/+3913
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0989-2869/+3463
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'evgenyfadeev/master'Adolfo Fitoria2010-02-09141-4408/+11948
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1557-653/+3814
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | better comments, email subscriptions, corrected view counter, some ie7 ↵root2009-11-13120-2734/+6802
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge branch 'chinito/master'Adolfo Fitoria2009-10-173-7/+20
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://github.com/cnprog/CNPROG into chinito/masterAdolfo Fitoria2009-10-173-7/+20
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: templates/user_stats.html
| | | * | | | | update INSTALL_Mike Chen2009-10-152-1/+18
| | | | | | | |
| | | * | | | | 1. update var setting in blocktranssailingcai2009-10-141-1/+1
| | | | | | | |
| * | | | | | | removing categories feature from masterAdolfo Fitoria2009-10-137-119/+1
| | | | | | | |
| * | | | | | | Merge branch 'chinito/master'Adolfo Fitoria2009-10-131-127/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: forum/views.py
| | * | | | | | Merge branch 'master' of git://github.com/cnprog/CNPROG into chinito/masterAdolfo Fitoria2009-10-1317-933/+953
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: forum/models.py forum/views.py settings.py settings_local.py.dist
| * | | | | | | Merge branch 'master' of git://github.com/cnprog/CNPROG into chinito/masterAdolfo Fitoria2009-10-1317-838/+984
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: forum/models.py forum/views.py settings.py settings_local.py.dist
| | * | | | | 1. Optimize get votes in answerssailingcai2009-10-142-6/+15
| | | | | | |
| | * | | | | 1. refactor get_answers_from_questionsailingcai2009-10-132-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. refactor order_by for answers
| | * | | | | 1. trim question titlesailingcai2009-10-121-1/+1
| | | | | | |
| | * | | | | 1. adjust logo css, remove margin-bottomsailingcai2009-10-124-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. add urlquote in get_absolute_url 3. enable QuestionsPageSizeMiddleware middleware 4. remove unused code
| | * | | | | fix tags sort bugMike Chen2009-08-241-5/+5
| | | | | | |
| | * | | | | update user_reputation for Django aggregation changesMike Chen2009-08-232-831/+846
| | | | | | |
| | * | | | | fix django_authopenid register bugMike Chen2009-08-191-1/+1
| | | | | | |
| | * | | | | temporary fix for 1.1 aggregation compatible issueMike Chen2009-08-142-12/+25
| | | | | | |
| | * | | | | update settings.py and settings_local.py.dist suggested by Adolfo FitoriaMike Chen2009-08-122-51/+45
| | | | | | |
| | * | | | | update .gitignore to exclude settings_local.pyunknown2009-08-121-1/+1
| | | | | | |
| | * | | | | remove settings_local.pyunknown2009-08-129-68/+44
| | | | | | |
| | * | | | | changes to unix modeMike Chen2009-08-093-0/+3335
| | | | | | |
| | * | | | | Merge branch 'master' of git@github.com:cnprog/CNPROGMike Chen2009-08-093-3335/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: forum/auth.py forum/models.py forum/views.py
| | * | | | | | change on local fileMike Chen2009-08-091-20/+20
| | | | | | | |
| | * | | | | | merge of Evgenys changes on annoymous postMike Chen2009-08-094-17/+0
| | | | | | | |
| * | | | | | | fixing feed againAdolfo Fitoria2009-09-231-1/+1
| | | | | | | |
| * | | | | | | fixing the feedAdolfo Fitoria2009-09-231-1/+1
| | | | | | | |
| * | | | | | | fixing a stupid errorAdolfo Fitoria2009-09-151-1/+0
| | | | | | | |
| * | | | | | | slugified categories urlAdolfo Fitoria2009-09-153-2/+6
| | | | | | | |
| * | | | | | | adding comments backAdolfo Fitoria2009-09-141-0/+16
| | | | | | | |
| * | | | | | | adding a ugly fix to make comments work in spanishAdolfo Fitoria2009-09-141-0/+2
| | | | | | | |
| * | | | | | | fixing tab problemsAdolfo Fitoria2009-09-142-5/+6
| | | | | | | |
| * | | | | | | translating emailsAdolfo Fitoria2009-09-133-26/+23
| | | | | | | |
| * | | | | | | modified diff_date filter for better outputAdolfo Fitoria2009-09-131-1/+2
| | | | | | | |
| * | | | | | | fixing username already taken errorAdolfo Fitoria2009-09-131-4/+1
| | | | | | | |
| * | | | | | | fixing some stuffAdolfo Fitoria2009-09-132-4/+8
| | | | | | | |
| * | | | | | | removing books from adminAdolfo Fitoria2009-09-061-12/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-09-061-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | fixing an oopsAdolfo Fitoria2009-09-061-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-09-061-1/+1
| |\| | | | | | |
| | * | | | | | | fixing another url bugAdolfo Fitoria2009-09-061-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into experimentalAdolfo Fitoria2009-09-056-18/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: templates/question.html
| | * | | | | | | fixing more url stuffAdolfo Fitoria2009-09-054-5/+5
| | | | | | | | |
| | * | | | | | | fixing related questions and urlAdolfo Fitoria2009-09-052-4/+4
| | | | | | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-09-19 16:56:11 +0000