Matt Westcott
fe728f9c88
Merge branch 'kaedroho-issue-729'
2014-10-29 16:48:29 +00:00
Matt Westcott
4009defa6d
Merge branch 'issue-729' of https://github.com/kaedroho/wagtail into kaedroho-issue-729
2014-10-29 16:41:17 +00:00
Karl Hobley
83f80f2e04
Make default methods raise NotImplementedError
2014-10-29 16:41:08 +00:00
Karl Hobley
7967f0e07e
Added DBSearchQuery class
...
This makes sure that the user is not filtering on any fields that are
not in search_fields. It also prevents the user from using any features
of QuerySet that are not in the search API
2014-10-29 16:41:08 +00:00
Karl Hobley
4f5b9ffaf1
Created BaseSearchQuery class
...
Moved some logic from ElasticSearchQuery into it
2014-10-29 16:41:07 +00:00
Karl Hobley
ab896e318a
DB search now returns a SearchResults object
...
Previously, it returned a QuerySet which gave the database backend much
more API than the Elasticsearch backend has. Which could potentially
cause issues if the developer is using the DB backend locally and the
Elasticsearch backend on their production server.
Fixes #460
2014-10-29 16:39:30 +00:00
Karl Hobley
ca17d062c3
Created BaseSearchResults class
...
Moved some logic from ElasticSearchResults into it
2014-10-29 16:39:30 +00:00
Matt Westcott
f82fd0c222
release note for #716
2014-10-29 16:38:55 +00:00
Matt Westcott
436116dc3d
Merge pull request #716 from kaedroho/search/prevent-abstract-models-from-being-indexed
...
Search: Prevent abstract models from being indexed
2014-10-29 16:35:10 +00:00
Matt Westcott
e605ac1120
remove comment that refers to logic now done in get_image_edit_form
2014-10-29 16:28:12 +00:00
Matt Westcott
a2e643679b
release note for #676
2014-10-29 16:26:22 +00:00
Karl Hobley
6bb03a6777
Treat MPO formatted images like JPEG. Fixes #729
2014-10-29 16:25:32 +00:00
Matt Westcott
b3ec1a0df2
Merge pull request #676 from kaedroho/issue-617
...
Added image filesize validation and some refactoring
2014-10-29 16:22:56 +00:00
Karl Hobley
ae4381c9c4
No longer possible to index an abstract model
...
Also a bit of cleanup to centralise all "can this model be indexed?"
logic
2014-10-29 16:13:47 +00:00
Karl Hobley
e0862a9c24
Exclude focal point from multiple image uploader
2014-10-29 15:54:40 +00:00
Karl Hobley
89e2db1f27
Fixed crash when no file selected
2014-10-29 15:44:39 +00:00
Karl Hobley
5f3d7e2820
Cleaned up allowed extensions regex
2014-10-29 15:22:44 +00:00
Karl Hobley
1af7d9f8dc
Fixed JavaScript error when max_filesize is None
2014-10-29 11:06:27 +00:00
Karl Hobley
8441eac8dd
Fixed reference to ALLOWED_EXTENSIONS_TEXT
2014-10-29 11:04:33 +00:00
Matt Westcott
7bfb1bb544
Merge branch 'kaedroho-search/search-fields-overriding'
2014-10-28 21:15:30 +00:00
Matt Westcott
ad89e8f54d
release note for #715
2014-10-28 21:15:18 +00:00
Matt Westcott
b140fd88d9
Prevent search signal handlers from breaking fixture loading on Django 1.7
2014-10-28 20:43:22 +00:00
Matt Westcott
63834a3c57
add clarifying comment about how test_overriding relates to model inheritance
2014-10-28 17:33:42 +00:00
Matt Westcott
b151a0b9b0
Merge branch 'search/search-fields-overriding' of https://github.com/kaedroho/wagtail into kaedroho-search/search-fields-overriding
2014-10-28 17:29:24 +00:00
Matt Westcott
59fb5c9222
fix spelling
2014-10-28 16:38:23 +00:00
Matt Westcott
4c392b9b00
Merge branch 'kaedroho-search/index-correct-object'
2014-10-28 16:37:16 +00:00
Matt Westcott
bdd31f1141
Merge branch 'search/index-correct-object' of https://github.com/kaedroho/wagtail into kaedroho-search/index-correct-object
2014-10-28 16:35:30 +00:00
Karl Hobley
ddbe634eda
Release note for #705
2014-10-28 16:28:57 +00:00
Karl Hobley
674f55170e
Changelog for #705
2014-10-28 16:28:12 +00:00
Karl Hobley
af0fdc35e7
Changelog for #705
2014-10-28 16:26:43 +00:00
Karl Hobley
9b01f9e2d7
Merge pull request #705 from jsma/custom-user-model-fixes
...
Fixed login form to reference USERNAME_FIELD
2014-10-28 16:25:58 +00:00
Karl Hobley
86cc69baaf
Added get_indexed_instance method
...
When a signal handler is run on a model that is the parent in a multi
table inheritance relationship, we do not have access to all of the
fields we need to properly reindex the object.
This commit adds a method that the developer can use to specify how to
get the specific type of a particular instance which we can use to
reindex it.
2014-10-28 16:10:49 +00:00
Matt Westcott
51e650c739
Merge branch 'kaedroho-use-specific-page-class-in-admin'
2014-10-28 16:09:06 +00:00
Matt Westcott
1e1656440a
Merge branch 'use-specific-page-class-in-admin' of https://github.com/kaedroho/wagtail into kaedroho-use-specific-page-class-in-admin
2014-10-28 16:08:48 +00:00
Matt Westcott
2559f75255
Merge branch 'kaedroho-search/deduplication-2'
2014-10-28 16:08:19 +00:00
Matt Westcott
47e32a3cd1
Release note for #714
2014-10-28 16:07:59 +00:00
Matt Westcott
80c0822066
Merge branch 'search/deduplication' of https://github.com/kaedroho/wagtail into kaedroho-search/deduplication-2
2014-10-28 15:49:42 +00:00
Karl Hobley
3c3c3b6557
Improved performance of signal handlers
2014-10-28 15:39:57 +00:00
Matt Westcott
ceb7139b71
Merge branch 'master' of github.com:torchbox/wagtail
2014-10-28 14:54:03 +00:00
Matt Westcott
84c9810e25
add Django 1.7 migration for #718
2014-10-28 14:53:57 +00:00
John-Scott Atlakson
4300b62762
Added back 'your'
2014-10-28 09:42:27 -04:00
Matt Westcott
e2b4866ab7
Merge pull request #747 from kaedroho/issue-746
...
Add keep_live flag to Page.copy
2014-10-28 13:06:22 +00:00
Matt Westcott
5cb428608b
pin libsass to version 0.5.1 in tox.ini, since the current Travis VM can't install 0.6 - see #760
2014-10-28 10:51:57 +00:00
Karl Hobley
d8f33d0729
Added keep_live flag to Page.copy
2014-10-28 09:54:40 +00:00
Matt Westcott
5405c2b4f8
Merge branch 'kaedroho-clear-site-root-paths-on-delete'
2014-10-27 17:44:39 +00:00
Matt Westcott
c440087c3e
release note for #719
2014-10-27 17:44:28 +00:00
Matt Westcott
5e06a4485a
fix inaccurate comments and duplicate definition of test_cache_clears_when_site_deleted
2014-10-27 17:43:23 +00:00
Matt Westcott
10aec3a943
Merge branch 'clear-site-root-paths-on-delete' of https://github.com/kaedroho/wagtail into kaedroho-clear-site-root-paths-on-delete
2014-10-27 17:37:28 +00:00
Matt Westcott
71babb726c
Merge branch 'kaedroho-foreign-key-system-check'
2014-10-27 17:15:18 +00:00
Matt Westcott
f408dddfbe
Release note for #718
2014-10-27 17:15:06 +00:00