| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | |
| | |
| | |
| | | |
separate file, fixed question counter messages in the english lang file
|
| | |
| | |
| | |
| | | |
(not tested yet)
|
| | |\ |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
2. add urlquote in get_absolute_url
3. enable QuestionsPageSizeMiddleware middleware
4. remove unused code
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
questions/answers, fixed diff_date a little
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
their screen name any time
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
user_reputation view, email sender cron job, some edits in INSTALL file
|
| | | |
| | | |
| | | |
| | | | |
first time visitor
|
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
settings.BOOKS_ON, validated more templates
|
| | | |
| | | |
| | | |
| | | | |
Non-ascii chars in tags bring syntax error for new meta-tags parsing.
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | | |
fixed IE issues in openid signin
|
| | | | | |
|
| | | | | |
|
| | | |/ |
|
| | | |
| | | |
| | | |
| | | | |
* translate url update profile
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
* give priorty to "ask question"
* small airy space to header
|
| | |\|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 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
|
| | | |
| | | |
| | | |
| | | | |
change, removed site-specific staff from english .po file
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
some more, see development.log
|
| | | | |
|
| | | | |
|
| | | |\ |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
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
|