diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-23 18:11:25 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-23 18:11:25 +0200 |
| commit | c5a639a8c59c6aa0d9edf1895cdced3cbdebc7a2 (patch) | |
| tree | 546aa6fc0b163c95795c6c60d24eb46e7d598fee | |
| parent | 480fa4f7e9a0ca6fed3b1f444807734d854de2b0 (diff) | |
| parent | a94545d51238b6160c81b88da406c84a7d87e564 (diff) | |
| download | Ishtar-c5a639a8c59c6aa0d9edf1895cdced3cbdebc7a2.tar.bz2 Ishtar-c5a639a8c59c6aa0d9edf1895cdced3cbdebc7a2.zip | |
Merge branch 'master' into v0.9
| -rw-r--r-- | CHANGES.md | 7 | ||||
| -rw-r--r-- | ishtar_common/urls.py | 2 | ||||
| -rw-r--r-- | version.py | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md index 87a5f0dba..58e3d6f36 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,13 @@ Ishtar changelog ================ +0.98.9 (2016-10-23) +------------------- + +### Bug fixes ### + +- Fix bad regexp for "get-by-importer" + 0.98.8 (2016-10-22) ------------------- diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index edd1ebe75..811ce1451 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -135,7 +135,7 @@ urlpatterns += patterns( url(r'pin/(?P<item_type>[a-z-]+)/(?P<pk>\d+)/$', 'update_current_item', name='pin'), url(r'unpin/(?P<item_type>[a-z-]+)/$', 'unpin', name='unpin'), - url(r'get-by-importer/(?P<slug>[a-z-]+)/(?P<type>[a-z-]+)?$', + url(r'get-by-importer/(?P<slug>[\w-]+)/(?P<type>[a-z-]+)?$', 'get_by_importer', name='get-by-importer'), url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$', 'new_person', name='new-person'), diff --git a/version.py b/version.py index 979d480aa..56f79188c 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 98, 8) +VERSION = (0, 98, 9) def get_version(): |