diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-13 15:34:25 -0300 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-13 15:34:25 -0300 |
| commit | 0799277f7f99705481b89e3fec4bf7f664a178a0 (patch) | |
| tree | 67b5116b69460e3d0d86f9e8510d9fdc5dc692da | |
| parent | 084df5f820f09c8fa9bb3c640047812334040e08 (diff) | |
| parent | 0913a08ef03dcc42c51c27880265e89721640976 (diff) | |
| download | askbot-0799277f7f99705481b89e3fec4bf7f664a178a0.tar.gz askbot-0799277f7f99705481b89e3fec4bf7f664a178a0.tar.bz2 askbot-0799277f7f99705481b89e3fec4bf7f664a178a0.zip | |
Merge branch 'master' of github.com:ASKBOT/askbot-devel into new-template
| -rw-r--r-- | askbot/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/doc/source/changelog.rst | 10 | ||||
| -rw-r--r-- | askbot/utils/markup.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py index ef784c3b..12e4f7d7 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -9,7 +9,7 @@ import smtplib import sys import logging -VERSION = (0, 7, 25) +VERSION = (0, 7, 26) #necessary for interoperability of django and coffin try: diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst index 3e1349e8..72e2db9f 100644 --- a/askbot/doc/source/changelog.rst +++ b/askbot/doc/source/changelog.rst @@ -1,15 +1,15 @@ Changes in Askbot ================= -Development version (not released yet) --------------------------------------- +0.7.26 (Current Version) +------------------------ * Added settings for email subscription defaults (Adolfo) * Resolved `bug #102<http://bugs.askbot.org/issues/102>`_ - duplicate notifications on posts with mentions (Evegeny) * Added color-animated transitions when urls with hash tags are visited (Adolfo) -* Repository tags will be `automatically added <http://askbot.org/en/question/345/can-git-tags-be-created-for-each-of-the-releases>`_ to new releases (Evgeny) +* Repository tags will be `automatically added <http://askbot.org/en/question/345/can-git-tags-be-created-for-each-of-the-releases>`_ to new releases (Evgeny, suggsted by ajmirsky) -0.7.25 (Current Version) ------------------------- +0.7.25 +------ * RSS feed for individual question (Sayan Chowdhury) * Allow pre-population of tags via ask a questions link (Adolfo) * Make answering own question one click harder (Adolfo) diff --git a/askbot/utils/markup.py b/askbot/utils/markup.py index 60bde9a0..3ebea3e4 100644 --- a/askbot/utils/markup.py +++ b/askbot/utils/markup.py @@ -37,7 +37,7 @@ def get_parser(): for item in pairs: LINK_PATTERNS.append( ( - re.compile(item[0]), + re.compile(item[0].strip()), item[1].strip() ) ) |