Commit graph

4502 commits

Author SHA1 Message Date
Matt Westcott
b93a7210fa update remaining URL in wagtailimages tests 2015-07-20 20:06:55 +01:00
Matt Westcott
f8daf7b4ba Merge branch 'url-namespaces' of https://github.com/kaedroho/wagtail into kaedroho-url-namespaces
Conflicts:
	wagtail/wagtailimages/views/images.py
2015-07-20 20:06:13 +01:00
Matt Westcott
0921bdec6d Release note for #1426 2015-07-20 14:49:55 +01:00
Matt Westcott
4f53b0b0ed Merge branch 'kaedroho-image-file-size' 2015-07-20 14:40:55 +01:00
Matt Westcott
91f0e10f46 renumber testapp migration 2015-07-20 14:37:45 +01:00
Matt Westcott
e146bf14be Merge branch 'image-file-size' of https://github.com/kaedroho/wagtail into kaedroho-image-file-size 2015-07-20 14:08:49 +01:00
Karl Hobley
d1897f9c14 Changelog/release note for #1527 2015-07-19 16:19:14 +01:00
Karl Hobley
2007a23366 Added @mixxorz to contributors 2015-07-19 16:18:39 +01:00
Karl Hobley
f7d46ea349 Merge pull request #1527 from mixxorz/wagtail-start-destination-directory
Added optional directory argument to wagtail start.
2015-07-19 16:15:37 +01:00
Mitchel Cabuloy
774ad27a76 Fixed flake8 errors 2015-07-18 11:49:32 +08:00
Mitchel Cabuloy
09dcf8a283 Added optional directory argument to wagtail start. 2015-07-18 11:36:34 +08:00
Matt Westcott
0ea3a73ae5 version 1.0 (for real this time)
Conflicts:
	CHANGELOG.txt
2015-07-16 11:20:36 +01:00
Matt Westcott
f99141afc2 'extremely basic information' -> 'the hostname of your Wagtail site' 2015-07-15 17:12:19 +01:00
Matt Westcott
919517bb9e Add upgrade consideration note for version upgrade notifications 2015-07-15 17:12:11 +01:00
Matt Westcott
f97a26f40b Add release note for #1274 to the docs 2015-07-15 11:36:16 +01:00
Matt Westcott
b6b75ba65d Documentation fix - renditions do not provide 'alt' (#1517) 2015-07-15 11:33:21 +01:00
Karl Hobley
f84af79c7d Merge branch 'wagtailapi-descendant-of' 2015-07-15 10:01:47 +01:00
Karl Hobley
2fad0d9c5c Added @michaelfillier to contributors 2015-07-15 10:01:10 +01:00
Karl Hobley
449fdab7d8 Changelog and release note for API descendant_of filter 2015-07-15 10:00:46 +01:00
Karl Hobley
d3b9779141 Docs for descendant_of API filter 2015-07-15 09:57:53 +01:00
Matt Westcott
00f707a438 Ensure that tabs in non-Latin languages are given non-blank IDs - fixes #1428 2015-07-15 09:38:59 +01:00
Michael Fillier
577d3eeb92 Added descendant_of support 2015-07-14 09:55:31 +01:00
Karl Hobley
ad25aec535 Merge pull request #1480 from kaedroho/model-reference-tweaks
Model reference formatting tweaks
2015-07-14 09:38:50 +01:00
Karl Hobley
60362518c2 Put all wagtailadmin_pages URLs into a namespace 2015-07-10 14:19:13 +01:00
Karl Hobley
3a58c566c6 Put all wagtailforms URLs into a namespace 2015-07-10 14:19:13 +01:00
Karl Hobley
e9373d113a Put all wagtailembeds URLs into a namespace 2015-07-10 14:19:13 +01:00
Karl Hobley
476b5aba60 Put all wagtailredirects URLs into a namespace 2015-07-10 14:19:13 +01:00
Karl Hobley
b383ee4bcc Put all wagtailsnippets URLs into a namespace 2015-07-10 14:19:13 +01:00
Karl Hobley
2931cb2e02 Put all wagtailusers_groups URLs into a namespace 2015-07-10 14:19:13 +01:00
Karl Hobley
392aaff70a Put all wagtailusers_users URLs into a namespace 2015-07-10 14:19:12 +01:00
Karl Hobley
106f00cf74 Put all wagtailsites URLs into a namespace 2015-07-10 14:19:12 +01:00
Karl Hobley
b3ba30eb00 Put all wagtaildocs URLs into a namespace 2015-07-10 14:19:12 +01:00
Karl Hobley
5726d62aba Put all wagtailimages urls into a namespace
This allows the urls to be registered multiple times with different app labels

See: https://docs.djangoproject.com/en/1.8/topics/http/urls/#reversing-namespaced-urls
2015-07-10 14:19:12 +01:00
Karl Hobley
6bf7990e65 Merge pull request #1501 from timorieber/fix/form-builder-doclink
Fixed link to form builder docs
2015-07-10 10:04:40 +01:00
Timo Rieber
aeb8c8fc68 Fixed link to form builder docs 2015-07-09 20:47:46 +02:00
Matt Westcott
fecd294143 Merge branch 'master' of https://github.com/torchbox/wagtail 2015-07-09 19:29:26 +01:00
Matt Westcott
d891be48e0 Merge branch 'davecranwell-fix-1249-adminautoheightextinput' 2015-07-09 19:29:15 +01:00
Matt Westcott
41ea332a74 release note for #1274 2015-07-09 19:29:07 +01:00
Matt Westcott
0e126d6e1e Merge branch 'fix-1249-adminautoheightextinput' of https://github.com/davecranwell/wagtail into davecranwell-fix-1249-adminautoheightextinput 2015-07-09 17:56:20 +01:00
Matt Westcott
c083344785 Merge pull request #1258 from torchbox/feature/sample-configs
Add sample uwsgi and nginx configuration files
2015-07-09 17:34:36 +01:00
Karl Hobley
b08b7628fb Missing newlines 2015-07-09 12:36:34 +01:00
Karl Hobley
8145cc1a2c Merge pull request #1379 from davecranwell/gulp-tidy
Tidying gulp
2015-07-09 12:35:21 +01:00
Karl Hobley
d37590a708 Merge pull request #1411 from takeflight/refactor/remove-six-dependency
Use six from Django
2015-07-08 16:30:30 +01:00
Karl Hobley
adc44cfa1a Changelog/release note for #1444 2015-07-08 16:25:34 +01:00
Karl Hobley
04a73fb205 Merge pull request #1444 from gasman/fix/page-chooser-pagination
Implement pagination on page chooser - fixes #508
2015-07-08 16:22:59 +01:00
Matt Westcott
8ea036fd3a Merge branch 'davecranwell-move-upgrade-notify-js' 2015-07-07 16:55:12 +01:00
Matt Westcott
892b34cb7e Merge branch 'move-upgrade-notify-js' of https://github.com/davecranwell/wagtail into davecranwell-move-upgrade-notify-js 2015-07-07 16:14:02 +01:00
Matt Westcott
3c8bcbd3be de-capitalise 'Body field' 2015-07-07 16:12:43 +01:00
Matt Westcott
fbb153fbe4 Code fixes and clarifications for tutorial - fixes #1473 2015-07-07 16:12:37 +01:00
Dave Cranwell
82171f70fa reduced size of logo 2015-07-07 14:41:41 +01:00