Skip to content

Instantly share code, notes, and snippets.

@byroncorrales
Created May 8, 2012 16:31
Show Gist options
  • Save byroncorrales/2637013 to your computer and use it in GitHub Desktop.
Save byroncorrales/2637013 to your computer and use it in GitHub Desktop.
git pull fitoria byron
From https://github.com/fitoria/askbot-devel
* branch byron -> FETCH_HEAD
Updating a7a8df8..81daba0
Fast-forward
askbot/__init__.py | 2 +-
askbot/auth.py | 42 +-
askbot/bin/checklocales.py | 11 +
askbot/bin/rebuildlocales.py | 16 +
askbot/conf/forum_data_rules.py | 6 +-
askbot/conf/site_modes.py | 4 +-
askbot/const/message_keys.py | 10 +-
askbot/cron/askbot_cron_job | 2 +-
askbot/doc/source/changelog.rst | 4 +
askbot/locale/ca/LC_MESSAGES/django.po | 3075 +++++++++-------
askbot/locale/ca/LC_MESSAGES/djangojs.po | 289 +-
askbot/locale/de/LC_MESSAGES/django.po | 3956 +++++++++++---------
askbot/locale/de/LC_MESSAGES/djangojs.po | 254 +-
askbot/locale/el/LC_MESSAGES/django.po | 2518 +++++++------
askbot/locale/el/LC_MESSAGES/djangojs.po | 229 +-
askbot/locale/en/LC_MESSAGES/django.po | 765 +++--
askbot/locale/en/LC_MESSAGES/djangojs.po | 255 +-
askbot/locale/es/LC_MESSAGES/django.po | 3940 +++++++++++++-------
askbot/locale/es/LC_MESSAGES/djangojs.po | 314 +-
askbot/locale/fi/LC_MESSAGES/django.po | 3936 +++++++++++++-------
askbot/locale/fi/LC_MESSAGES/djangojs.po | 315 +-
askbot/locale/fr/LC_MESSAGES/django.po | 3385 ++++++++++-------
askbot/locale/fr/LC_MESSAGES/djangojs.po | 291 +-
askbot/locale/hi/LC_MESSAGES/django.po | 870 +++--
askbot/locale/hi/LC_MESSAGES/djangojs.po | 8 +-
askbot/locale/hu/LC_MESSAGES/django.po | 3163 +++++++++-------
askbot/locale/hu/LC_MESSAGES/djangojs.po | 229 +-
askbot/locale/it/LC_MESSAGES/django.po | 3509 ++++++++++-------
askbot/locale/it/LC_MESSAGES/djangojs.po | 267 +-
askbot/locale/ja/LC_MESSAGES/django.po | 1027 +++---
askbot/locale/ja/LC_MESSAGES/djangojs.po | 314 +-
askbot/locale/ko/LC_MESSAGES/django.po | 3206 +++++++++-------
askbot/locale/ko/LC_MESSAGES/djangojs.po | 232 +-
askbot/locale/pt/LC_MESSAGES/django.po | 2673 +++++++------
askbot/locale/pt/LC_MESSAGES/djangojs.po | 229 +-
askbot/locale/pt_BR/LC_MESSAGES/django.po | 3287 ++++++++++-------
askbot/locale/pt_BR/LC_MESSAGES/djangojs.po | 329 +-
askbot/locale/ro/LC_MESSAGES/django.po | 3244 ++++++++++-------
askbot/locale/ro/LC_MESSAGES/djangojs.po | 239 +-
askbot/locale/ru/LC_MESSAGES/django.po | 1401 ++++----
askbot/locale/ru/LC_MESSAGES/djangojs.po | 8 +-
askbot/locale/sr/LC_MESSAGES/django.po | 3872 +++++++++++--------
askbot/locale/sr/LC_MESSAGES/djangojs.po | 235 +-
askbot/locale/tr/LC_MESSAGES/django.po | 3393 ++++++++++-------
askbot/locale/tr/LC_MESSAGES/djangojs.po | 303 +-
askbot/locale/vi/LC_MESSAGES/django.po | 3203 +++++++++-------
askbot/locale/vi/LC_MESSAGES/djangojs.po | 232 +-
askbot/locale/zh_CN/LC_MESSAGES/django.po | 3312 ++++++++++-------
askbot/locale/zh_CN/LC_MESSAGES/djangojs.po | 300 +-
askbot/locale/zh_TW/LC_MESSAGES/django.po | 3148 +++++++++-------
askbot/locale/zh_TW/LC_MESSAGES/djangojs.po | 261 +-
askbot/management/commands/send_email_alerts.py | 2 +-
askbot/middleware/spaceless.py | 1 +
...multiple__del_field_badgedata_description__d.py | 7 +-
askbot/models/__init__.py | 6 +-
askbot/models/question.py | 20 +-
askbot/search/state_manager.py | 5 +
askbot/setup_templates/settings.py | 4 +-
askbot/setup_templates/settings.py.mustache | 4 +-
askbot/skins/common/media/jquery-openid/openid.css | 3 +-
askbot/skins/common/media/js/jquery-1.7.2.min.js | 4 +
askbot/skins/common/media/js/post.js | 46 +-
.../templates/authopenid/authopenid_macros.html | 77 +-
.../skins/common/templates/authopenid/signin.html | 17 +-
.../common/templates/widgets/related_tags.html | 8 +-
askbot/skins/default/media/style/style.css | 3461 +++++++++++++++++-
askbot/skins/default/templates/badges.html | 6 +-
askbot/skins/default/templates/macros.html | 8 +-
.../default/templates/meta/bottom_scripts.html | 2 +-
.../question/subscribe_by_email_prompt.html | 1 -
askbot/skins/default/templates/revisions.html | 4 +-
askbot/skins/default/templates/tags.html | 2 +-
askbot/startup_procedures.py | 27 +-
askbot/views/commands.py | 10 +-
askbot/views/meta.py | 9 +-
askbot/views/readers.py | 3 +-
76 files changed, 41371 insertions(+), 28479 deletions(-)
create mode 100644 askbot/bin/checklocales.py
create mode 100644 askbot/bin/rebuildlocales.py
create mode 100644 askbot/skins/common/media/js/jquery-1.7.2.min.js
[10:28:50] bcorrales:askbot-devel git:(master) $ git push
Counting objects: 470, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (85/85), done.
Writing objects: 100% (347/347), 572.15 KiB, done.
Total 347 (delta 246), reused 341 (delta 241)
To git@github.com:byroncorrales/askbot-devel.git
a7a8df8..81daba0 master -> master
[10:29:16] bcorrales:askbot-devel git:(master) $ git status
# On branch master
nothing to commit (working directory clean)
[10:30:06] bcorrales:askbot-devel git:(master) $
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment