Commit graph

742 commits

Author SHA1 Message Date
Jeffrey Hearn
e6df0ef01f stuff 2014-05-08 21:01:47 -04:00
Jeffrey Hearn
bb28928160 Merge branch 'master' of github.com:torchbox/wagtail into docs 2014-05-08 18:36:57 -04:00
Dave Cranwell
280d960829 fixing save button on page creation 2014-05-08 12:10:06 +01:00
Dave Cranwell
6acb81dc78 Merge branch 'feature/pagemodes' 2014-05-08 11:56:46 +01:00
Dave Cranwell
96b6845e72 updated drop-ups for new preview button. improved icon rendering on windows generally. 2014-05-08 11:52:39 +01:00
Matt Westcott
541c4b37ff use url_info.hostname rather than url_info.netloc when building dummy request headers - netloc includes port number for non-standard ports, which we don't want 2014-05-08 10:55:47 +01:00
Dave Cranwell
532309d9eb Merge remote-tracking branch 'upstream/feature/pagemodes' into feature/pagemodes 2014-05-08 09:39:28 +01:00
Jeffrey Hearn
1aa04c277d moar docs 2014-05-08 00:11:47 -04:00
Jeffrey Hearn
89d774da76 moar docs 2014-05-07 14:39:07 -04:00
Jeffrey Hearn
af881e0789 moar docs 2014-05-07 14:36:56 -04:00
Jeffrey Hearn
b614781e9c moar docs 2014-05-07 14:35:38 -04:00
Jeffrey Hearn
1bd49f85e1 moar docs 2014-05-07 14:31:48 -04:00
Jeffrey Hearn
037a77da8a moar docs 2014-05-07 14:28:20 -04:00
Jeffrey Hearn
21dfbbfee9 moar docs 2014-05-07 14:26:04 -04:00
Karl Hobley
13d546e835 Merge pull request #226 from kaedroho/embeds_author-and-provider-fields
Add author_name and provider_name to Embed
2014-05-02 13:58:54 +01:00
Karl Hobley
ebd063ad15 Merge pull request #227 from kaedroho/issue/7-and-157
Clear 'wagtail_site_root_paths' when a site root page is saved fixes #7 #157
2014-05-02 13:50:34 +01:00
Karl Hobley
012a78b0de Added changelog entry 2014-05-02 13:49:44 +01:00
Karl Hobley
c50532a5fc Added docstrings to issue 7 and 157 testcases 2014-05-02 13:30:09 +01:00
Karl Hobley
d6cce69a39 Clear 'wagtail_site_root_paths' when a site root page is saved fixes #7 fixes #157 2014-05-02 13:10:55 +01:00
Karl Hobley
913f21d09b Test for issue 7 now fails consistantly 2014-05-02 13:02:25 +01:00
Karl Hobley
d24fe52d53 Added test for issue 157 2014-05-02 13:00:14 +01:00
Karl Hobley
226b760dc3 Merge branch 'master' into issue/7-and-157 2014-05-02 12:34:51 +01:00
Karl Hobley
20a69ff1a9 Merge pull request #225 from kaedroho/db-cache
Use database cache for testing
2014-05-02 12:33:45 +01:00
Karl Hobley
503f1cbaf8 Added comment into runtests.py to explain why we're using DatabaseCache 2014-05-02 12:33:20 +01:00
Karl Hobley
17aa3fc89e Cleanup wagtailembeds
Use templates for rendering embeds
Fixed issue with invalid javascript being returned by the chooser
2014-05-02 12:15:27 +01:00
Karl Hobley
7fe6e2177a Added changelog entry 2014-05-02 12:02:57 +01:00
Karl Hobley
a27bc5f237 Display embed author/provider in admin if set 2014-05-02 12:01:40 +01:00
Karl Hobley
db5559b688 Embeds: Save author_name and provider_name if set 2014-05-02 11:54:20 +01:00
Karl Hobley
a771e6adc4 Added author_name and provider_name fields to Embed model 2014-05-02 11:51:41 +01:00
Karl Hobley
360174e230 Use database cache for testing
Currently, the cache is not flushed between tests.

This can cause false positives where a previous test has been messing with cache keys which a future test uses (eg, wagtail_root_paths)

This commit makes django use the database as the cache which is automatically flushed between tests
2014-05-02 11:45:31 +01:00
Karl Hobley
e681e3aeee Fixed an issue with issue 7 unit test 2014-05-02 11:13:18 +01:00
Karl Hobley
2463152d4c Created unit test to reproduce issue 7 2014-05-02 10:44:35 +01:00
Matt Westcott
cfcc67f514 Wrap the output of the richtext filter in a 'rich-text' div - fixes #224 2014-05-02 10:01:55 +01:00
Matt Westcott
ec99bfed84 add changelog entry for richtext change 2014-05-02 10:00:14 +01:00
Matt Westcott
ef9e877fa9 remove mysql from tox tests for now, until we can fix the foreign key constraint error in wagtail.wagtailimages.tests.TestImageEditView 2014-05-01 14:48:51 +01:00
Matt Westcott
ba339a0bfb Add @kryton's fix for MySQL support in _update_descendant_url_paths, from #215 2014-05-01 13:06:20 +01:00
Matt Westcott
419b671fcc Use @transaction.atomic rather than the deprecated (as of Django 1.6) commit_on_success 2014-05-01 12:57:18 +01:00
Matt Westcott
178a235d2d Add unit test for moving pages 2014-05-01 12:56:31 +01:00
Matt Westcott
16ca3ce280 Add MySQL to tox tests 2014-05-01 12:21:17 +01:00
Matt Westcott
afe2fc10a8 add David Smith to contributors 2014-05-01 11:21:45 +01:00
David Smith
1d1accd5f9 Password reset templates extend admin_base to apply styles correctly, and missing % in title block 2014-05-01 11:18:35 +01:00
Dave Cranwell
98d616de90 Merge pull request #201 from davecranwell/master
Added pagination to list of pages using a given content type
2014-04-30 11:36:42 +01:00
Karl Hobley
efeba8d038 Merge pull request #218 from kaedroho/python-classifiers
Added python 2.6 classifier to setup.py
2014-04-30 09:59:03 +01:00
Karl Hobley
da01556c23 Added python 2.6 classifier to setup.py 2014-04-30 09:58:03 +01:00
Matt Westcott
5d328fddc5 Add file_extension property to wagtaildocs.Document 2014-04-29 12:42:16 +01:00
Matt Westcott
3dfc58c783 fix logic for fetching the default page mode - should return the internal name, not the tuple 2014-04-28 17:01:08 +01:00
Matt Westcott
d5bef23d5b Merge branch 'master' into feature/pagemodes
Conflicts:
	wagtail/wagtailcore/models.py
2014-04-28 15:40:04 +01:00
Matt Westcott
79334134b7 Update wagtaildocs, wagtailimages, wagtailsnippets and wagtailusers to register their menu items via the construct_main_menu hook rather than hard-coding them in wagtailadmin_tags 2014-04-28 15:15:34 +01:00
Neal Todd
5c3992686a Supported Django/Python versions note. 2014-04-28 09:50:05 +01:00
Neal Todd
860c3e036f Supported Django/Python versions note. 2014-04-28 09:49:23 +01:00