Matt Westcott
c558f25c52
Merge branch 'kaedroho-dj17_2'
2014-08-27 15:59:25 +01:00
Matt Westcott
f471f0bbf6
avoid using 'self' as a parameter to the non-method form of get_upload_to
2014-08-27 15:56:22 +01:00
Matt Westcott
2640258450
use the more natural 'django.VERSION < (1.7)' for version tests
2014-08-27 15:54:00 +01:00
Matt Westcott
075c9e8da0
add python3 + django 1.7 + sqlite as valid tox config
2014-08-27 15:43:46 +01:00
Matt Westcott
325d445592
Merge branch 'dj17_2' of https://github.com/kaedroho/wagtail into kaedroho-dj17_2
2014-08-27 15:40:17 +01:00
Karl Hobley
e8ea53f8e3
Fixed reference to non existant migration
2014-08-27 15:14:06 +01:00
Karl Hobley
e15134ecb3
Remade migrations for tests app
2014-08-27 15:09:52 +01:00
Matt Westcott
b7a435d2cf
Merge branch 'dj17_2' of https://github.com/kaedroho/wagtail into kaedroho-dj17_2
2014-08-27 14:19:51 +01:00
Karl Hobley
558a8c829f
Minor tweak to Indexed.get_search_fields()
2014-08-27 12:49:43 +01:00
Matt Westcott
1cbb4a13d5
Merge branch 'kaedroho-purge-0.4-deprecated-features'
2014-08-27 12:46:48 +01:00
Matt Westcott
fa482d372d
indexed -> index in EventPage
2014-08-27 12:46:33 +01:00
Karl Hobley
9eabdc374b
Merge remote-tracking branch 'torchbox/master' into purge-0.4-deprecated-features
...
Conflicts:
wagtail/tests/models.py
wagtail/wagtailsearch/indexed.py
wagtail/wagtailsearch/tests/test_indexed_class.py
2014-08-27 11:33:09 +01:00
Matt Westcott
2db38a18c1
changelog entry for #506
2014-08-27 11:28:42 +01:00
Matt Westcott
c2458a01dd
Merge branch 'davecranwell-fix/page-chooser-model-restrictions'
2014-08-27 11:26:56 +01:00
Matt Westcott
68559e5cc1
release note for #506
2014-08-27 11:22:05 +01:00
Karl Hobley
bab28400de
Updated django-taggit to 0.12.1
2014-08-27 11:11:00 +01:00
Karl Hobley
1e0bd57415
Fixed bad migration dependency
2014-08-27 11:00:22 +01:00
Karl Hobley
3a1099e330
Make hooks and image formats importing work with Django 1.7 AppConfigs
...
This also fixes #398
2014-08-27 10:54:58 +01:00
pvetch
f4b247d8a5
Update README.rst
...
Fixed broken link to form builder docs
2014-08-27 10:28:35 +01:00
Karl Hobley
61278ddfcd
Updated migrations
2014-08-27 10:02:52 +01:00
Karl Hobley
56e4dacc5a
Merge remote-tracking branch 'torchbox/master' into dj17_2
...
Conflicts:
.travis.yml
tox.ini
2014-08-27 09:17:07 +01:00
Karl Hobley
bcff495827
Added versionchanged comment for indexed->index rename
2014-08-26 17:22:53 +01:00
Dave Cranwell
53d3afe8df
is_restricted -> page_types_restricted. missing space added
2014-08-26 17:18:42 +01:00
Dave Cranwell
8c1881bee4
Merge branch 'master' into fix/page-chooser-model-restrictions
2014-08-26 17:15:30 +01:00
Dave Cranwell
c3360408bb
added use of help-block. reformatted help blocks not to float, too much of a pain
2014-08-26 17:11:44 +01:00
Dave Cranwell
c300477c77
reinstated missing modernizr test used by edit bird
2014-08-26 16:23:53 +01:00
Karl Hobley
b9c6a0a802
Renamed indexed to index
2014-08-26 16:03:59 +01:00
Dave Cranwell
504732433b
Update for_python_developers.rst
2014-08-26 13:41:02 +01:00
Dave Cranwell
15ba294bcd
index -> indexed, plus other tweaks
2014-08-26 13:40:37 +01:00
Dave Cranwell
053a75ef9d
clarify ElasticSearch dependency
2014-08-26 13:26:56 +01:00
Karl Hobley
09086b13b2
Docs changes for #562
2014-08-26 12:14:39 +01:00
Karl Hobley
f45795ef4c
Changelog and release notes for #562
2014-08-26 12:13:08 +01:00
Karl Hobley
d9dc42dee6
Merge pull request #562 from kaedroho/indexed-rename
...
Renamed wagtailsearch.indexed to wagtailsearch.index
2014-08-26 12:09:08 +01:00
Karl Hobley
9bf3aed72a
Merge pull request #540 from jalourenco/master
...
Add pt_PT localization
2014-08-26 12:05:28 +01:00
Karl Hobley
abaf8b2d61
Merge pull request #471 from kaedroho/multilingual-tutorial
...
Tutorial for creating multilingual sites
2014-08-26 11:58:06 +01:00
Karl Hobley
f4b746e3f5
Merge branch 'master' into multilingual-tutorial
...
Conflicts:
docs/index.rst
2014-08-26 11:57:52 +01:00
Dave Cranwell
f5c57607ed
added progress indicator to styleguide
2014-08-22 11:28:05 +01:00
Dave Cranwell
47f77f3c77
Merge remote-tracking branch 'upstream/master'
2014-08-21 15:57:16 +01:00
Dave Cranwell
6eb5f821ed
added quick django example
2014-08-21 15:56:55 +01:00
Dave Cranwell
c0c9c1a7f7
Merge pull request #563 from davecranwell/master
...
Added more Page model information about previously omitted attributes
2014-08-21 15:30:21 +01:00
Dave Cranwell
628f94519c
added more Page model information about previouslly missing attributes like subpage_types
2014-08-21 15:17:14 +01:00
Karl Hobley
e898bc1d78
Updated references to old indexed class to point to index instead
2014-08-21 15:16:06 +01:00
Karl Hobley
ccf89700d7
Renamed wagtailsearch.indexed to wagtailsearch.index
2014-08-21 14:54:42 +01:00
Karl Hobley
c5fef182e5
Fixed a couple of documentation links in the readme
2014-08-21 12:19:57 +01:00
Karl Hobley
8a19552033
Changelog and release notes for #560
2014-08-21 12:19:39 +01:00
Tim Heap
15419f4d0e
Make RoutablePage a mixin
...
If a developer wanted to have a site-wide base page class, and also have
some pages be `RoutablePage`s, a conflict between the automatically
generated `page_ptr` fields would occur.
```python
from wagtail.wagtailcore.models import Page
from wagtail.contrib.wagtailroutablepage.models import RoutablePage
class SitePageBase(Page):
# common functionality
is_abstract = True
class Meta:
abstract = True
class MyPage(RoutablePage, SitePageBase):
# This model is invalid
pass
```
`RoutablePage` has been changed to be a mixin `RoutablePageMixin`. Page
classes can use this to gain the `RoutablePage` functionality while
still retaining the ability to subclass other models.
A `RoutablePage` class that derives from both `RoutablePageMixin` and
`Page` has been left in for backwards compatibility, so old code will
continue to function without any modifications.
2014-08-21 19:42:17 +10:00
pvetch
26314bdfc7
Update using_images_outside_wagtail.rst
...
Fix to code block syntax
2014-08-19 10:52:49 +01:00
pvetch
470a9e4396
Update routable_page.rst
...
tiny text fix
2014-08-19 10:51:52 +01:00
Karl Hobley
2afb9fe84e
Completely removed all features deprecated in 0.4
2014-08-19 10:31:02 +01:00
Jose Lourenco
bfd83ecefb
(re-)add pt_PT localization to wagtail 0.5.0.
2014-08-18 17:27:58 +01:00
