Commit graph

2918 commits

Author SHA1 Message Date
Karl Hobley
969aa4bc77 Merge pull request #306 from gasman/feature/issue128
Add 'original' as a resize rule supported by the image tag - fixes #128
2014-06-10 13:52:26 +01:00
Matt Westcott
843b490cef add changelog entry for 'original' resize rule 2014-06-10 13:19:06 +01:00
Matt Westcott
0092151d29 Update image tag documentation to cover the 'original' resize rule 2014-06-10 13:17:45 +01:00
Matt Westcott
b1d8268b28 Add 'original' as an image filter to return the image un-resized - fixes #128 2014-06-10 12:50:42 +01:00
Ben Margolis
a3b4bcb558 only send signal outside if not POSTing new page 2014-06-10 04:15:35 -07:00
Tom Talbot
77c75efcf2 Fix embedly error tests 2014-06-10 11:22:17 +01:00
Tom Talbot
da361bbd01 Skip embedly tests if embedly not installed. Split up tests. 2014-06-10 11:13:48 +01:00
Ben Margolis
d04d7507bc Merge branch 'master' of https://github.com/torchbox/wagtail into feature/init_new_page__signal 2014-06-09 16:25:04 -07:00
Ben Margolis
e6008ccaee fix kwarg spacing 2014-06-09 11:24:19 -07:00
Tom Talbot
504bc1c4f6 Merge branch 'master' into more-unit-tests
Conflicts:
	wagtail/wagtailembeds/embeds.py
2014-06-09 17:15:32 +01:00
Jeffrey Hearn
85793d3dbb Settings doc changes based on feedback 2014-06-09 11:47:12 -04:00
Robert Clark
4d6db52f99 made published siblings a single query 2014-06-09 10:04:33 -04:00
Dave Cranwell
cf9dd86f26 Merge pull request #302 from jeffrey-hearn/docs-embed-overflow-css
Docs: responsive embeds and images CSS suggestion
2014-06-09 09:46:48 +01:00
Jeffrey Hearn
9b17154cdf Added wagtail and django settings doc
more settings stuffs

settings stuff

settings stuff

so many things

omg is it really two AM

More docs
2014-06-08 16:59:46 -04:00
Karl Hobley
1e3dd2695d Merge pull request #303 from jeffrey-hearn/embedly-cleanup
Bug: Embedly key argument never used
2014-06-08 18:10:33 +01:00
Jeffrey Hearn
e3fb485a87 Cleanup of embedly settings load 2014-06-08 01:30:35 -04:00
Jeffrey Hearn
090b0ef3da Responsive embeds and images CSS suggestion 2014-06-08 01:06:11 -04:00
Robert Clark
de678ac8ba add next and previous published siblings to Page model 2014-06-06 14:40:05 -04:00
Robert Clark
9b5d4f26f7 Merge branch 'master' of https://github.com/torchbox/wagtail 2014-06-06 13:38:09 -04:00
Ben Margolis
004b90d9cf send init_new_page signal when creating a new page in the admin 2014-06-06 10:03:32 -07:00
Karl Hobley
28df142549 Merge pull request #288 from jeffrey-hearn/docs-rev-2
Edit API docs expanded with hooks, modelcluster, and InlinePanel usage
2014-06-06 17:30:08 +01:00
Karl Hobley
e5e989c004 Merge pull request #296 from rockingskier/ordered-snippets
Order snippet models alphabetically
2014-06-06 17:14:38 +01:00
Ben
06677ac444 Typo 2014-06-06 16:54:36 +01:00
Ben
eb05073e59 Add comments to test models for clarity 2014-06-06 16:54:06 +01:00
Karl Hobley
5936c020d8 Added I18N to new datetime picker 2014-06-06 16:28:51 +01:00
Jeffrey Hearn
cf3d6a4e66 Addition of attrs property to image template tag 2014-06-06 10:58:14 -04:00
Dave Cranwell
81e37bbf7c pep8 space 2014-06-06 15:30:24 +01:00
Dave Cranwell
b5b4e5dee1 removed pre-contrib import 2014-06-06 15:22:24 +01:00
Dave Cranwell
594785d564 removed datepickers, due to be updated in a nearer PR 2014-06-06 14:50:23 +01:00
Dave Cranwell
38e4e6d361 added example of iconfield 2014-06-06 14:44:44 +01:00
Dave Cranwell
7415f07d2a updated docs 2014-06-06 14:38:36 +01:00
Dave Cranwell
871f4fe37f updated docs 2014-06-06 14:37:05 +01:00
Dave Cranwell
4b39b71389 moved styleguide to a contrib module 2014-06-06 14:21:47 +01:00
Karl Hobley
45a10979c6 Fixed issue with 'django.contrib.auth.views.login' not being reversed properly 2014-06-06 12:59:07 +01:00
Karl Hobley
b35f6d9409 Added test to check that wagtailadmin behaves correctly when LOGIN_URL is not set 2014-06-06 12:52:00 +01:00
Karl Hobley
1e5fdb0a63 Merge branch 'tests-changes' into issue-25 2014-06-06 12:41:34 +01:00
Karl Hobley
6ac51fde59 Merge branch 'master' into tests-changes 2014-06-06 12:24:39 +01:00
Karl Hobley
1683287ee7 Change wagtailforms SelectDateForm to use DateTimeFields
This is because DateFields are not timezone aware which causes warnings to be raised by django.

The widgets are still set to "DateInput" so the look and behaviour should not change
2014-06-06 12:22:53 +01:00
Karl Hobley
9d8e16a73a Merge pull request #293 from kaedroho/wagtailcore-tests-splitup
Split up wagtailcore tests
Reviewed by @gasman
2014-06-06 11:05:05 +01:00
Dave Cranwell
b177c9fab4 styled datepicker nicer 2014-06-05 17:05:21 +01:00
Ben Delevingne
1a19819a19 Comment changes so they are real in English 2014-06-05 15:46:37 +01:00
Dave Cranwell
81e5da010a Merge branch 'master' into pr/286 2014-06-05 15:43:26 +01:00
Dave Cranwell
0adab4f58d updates to tabs and forms 2014-06-05 15:42:26 +01:00
Dave Cranwell
302d50cc41 merged master 2014-06-05 15:33:21 +01:00
Dave Cranwell
9c3dbbaec4 Merge remote-tracking branch 'upstream/master' 2014-06-05 15:26:07 +01:00
Dave Cranwell
ad6a8682af removing margins from body, which don't play well with jquery position() or offset() 2014-06-05 15:25:23 +01:00
Ben Delevingne
ea82f12935 Order snippet models during snippet registration 2014-06-05 15:25:17 +01:00
Ben Delevingne
c200ad50c4 Test ordering of snippet 2014-06-05 15:24:29 +01:00
Ben Delevingne
1f9fe4bfc1 Added two test snippet models definitions 2014-06-05 15:21:56 +01:00
Ben Delevingne
ebf1360c0f Fix indendation of Advert test model 2014-06-05 15:19:17 +01:00