Wykres commitów

5860 Commity (632b0c1821a90c867e8beb30c4f3e448799a01cb)

Autor SHA1 Wiadomość Data
Dave Cranwell dc7b9a90a1 linting upstream changes inherited from rebased onto master 2015-11-23 22:11:01 +00:00
Dave Cranwell 5d43512c38 fixing rebase confusion 2015-11-23 21:39:56 +00:00
Dave Cranwell 7e40b131e8 finished linting 2015-11-23 21:39:56 +00:00
Dave Cranwell 9b14b4bbb3 tweaked scss linting rules making them admittedly less stringent, but striking a better balance with realism 2015-11-23 21:39:55 +00:00
Dave Cranwell e7993c4354 fixed SingleLinePerSelector 2015-11-23 21:39:55 +00:00
Dave Cranwell 04f760bd08 space indenting 2015-11-23 21:39:55 +00:00
Dave Cranwell fc980bd103 updated npm packages. ongoing linting of scss files 2015-11-23 21:39:54 +00:00
Dave Cranwell 0cec363a4d SpaceAfterPropertyColon and SpaceBeforeBrace fixed in other apps 2015-11-23 21:39:54 +00:00
Dave Cranwell 17f96fe3b0 SpaceAfterPropertyColon and SpaceBeforeBrace fixed 2015-11-23 21:39:54 +00:00
Karl Hobley 059fc15b9d Added note about Elasticsearch 2.x 2015-11-20 12:50:31 +00:00
Tom Dyson f41658cd05 Fix typo in external link chooser
"URL" is an acroynm
2015-11-20 12:39:30 +00:00
Matt Westcott be3c557f15 Add Rich Brennan to contributors 2015-11-20 12:37:22 +00:00
Matt Westcott 4cd6a7130a Merge pull request #1944 from richbrennan/master
Move content_panels inside BlogPage definition.
2015-11-19 17:32:10 +00:00
Rich Brennan 2ad3985d67 Move content_panels inside BlogPage definition. 2015-11-19 17:16:02 +00:00
Karl Hobley 3f18768a36 Always run Elasticsearch tests that don't depend on a running instance
We now only skip tests that actually require a running Elasticsearch instance.

This also greatly cleans up the elasticsearch test suite.
2015-11-19 16:23:47 +00:00
Karl Hobley 3b2e54bc7c Make elasticsearch-py a dev requirement
The Elasticsearch tests now depend on an environment variable being set so we can safely install elasticsearch-py without Wagtail automatically assuming Elasticsearch is installed and running the tests.

This makes developer setup slightly easier, but also opens up the possibility for running some of the ES tests that don't depend on a running ES instance.
2015-11-19 16:23:47 +00:00
Karl Hobley 83d3aaeb2f Added --elasticsearch flag to travis/tox configuration 2015-11-19 16:23:24 +00:00
Matt Westcott 5dc0b37874 Move pure tree-related methods of PageQuerySet into a separate TreeQuerySet class
This allows them to be re-used on other treebeard.mp_tree-based models.
2015-11-19 15:38:30 +00:00
Matt Westcott 06f793a355 Allow subclasses of CreateView/EditView to omit template_name 2015-11-19 15:33:09 +00:00
Karl Hobley 8edfcc168f Changelog/release note for #1865 2015-11-19 15:30:23 +00:00
Matt Westcott c73a3caa31 Use rendition.alt in `{% image img as rendition %}` example.
This restores the documentation to the pre-#1517 state, and is evidently more natural to write since the original documentation did so by mistake :-)
2015-11-19 15:29:40 +00:00
Matt Westcott 4043dee92d Add 'alt' property to image renditions - fixes #1517 2015-11-19 15:29:40 +00:00
Matt Westcott e08e35d470 Release note for #1447 2015-11-18 17:04:39 +00:00
Dave Cranwell 0d402c02a7 added roboto slab and reinstated use of serif fonts via new variable 2015-11-18 16:56:13 +00:00
Dave Cranwell 31eb1c5ab3 update Open Sans to add the full set of extended glyphs, adding cyrillic ext, vietnamese, greek extended, greek and latin extended. Also updated @font-face method 2015-11-18 16:49:29 +00:00
Dave Cranwell debf2bb13b removing use of bitter, which has no support for cyrillic 2015-11-18 16:49:28 +00:00
Matt Westcott f0915e9fda Merge pull request #1932 from gasman/ninepints-auth-settings
Allow password resets to be disabled independently
2015-11-18 13:21:28 +00:00
Matt Westcott 4f59b215d8 Release note for #468 2015-11-18 13:04:50 +00:00
Matt Westcott a205dc5b52 Test that password change/reset options are selectively displayed 2015-11-18 12:23:07 +00:00
Matt Westcott d24081e432 Set WAGTAIL_PASSWORD_RESET_ENABLED to default to the value of WAGTAIL_PASSWORD_MANAGEMENT_ENABLED 2015-11-18 12:07:49 +00:00
John Draper d78c076809 Add unit tests for password management settings 2015-11-18 12:07:48 +00:00
John Draper a11764d943 Always register password mgmt views, update views to conditionally 404 2015-11-18 12:07:36 +00:00
John Draper 673ea92ee2 Document password management settings 2015-11-18 12:03:52 +00:00
John Draper 78ad3272b3 Allow password resets to be disabled independently 2015-11-18 12:02:06 +00:00
Karl Hobley a36744ddea Release note for #1925 2015-11-17 11:36:57 +00:00
Karl Hobley 64db11b35e Merge pull request #1925 from mixxorz/frontendcache-invalidator-python2
Add Python < 3.3 support for frontendcache invalidator
2015-11-17 11:01:49 +00:00
Karl Hobley ac0c6b0aaf Merge pull request #1928 from alexgleason/docs-model-naming
Updated reasoning for Page suffix, fixes #1927
2015-11-17 10:51:04 +00:00
Alex Gleason 6a0b576376 Updated reasoning for Page suffix, fixes #1927
Fixed typo
2015-11-16 20:06:36 +00:00
Karl Hobley 5c6903fe00 Merge pull request #1923 from gasman/fix/browserify-3.46.1
Bump browserify to 3.46.1
2015-11-15 12:12:05 +00:00
Mitchel Cabuloy 49bc630e4d Add Python < 3.3 support for frontendcache invalidator
The previous implementation was using a Python > 3.3 specific
implementation of urllib.request.Request which can accept a `method`
keyword argument in its constructor to specify what HTTP method to use
when executing the request. This is not available in earlier versions of
the class.

This commit fixes that incompatibility by instead subclassing Request
and overriding its `get_method` method.
2015-11-14 22:15:43 +08:00
Matt Westcott f6e6f9a909 Bump browserify to 3.46.1
3.36.0 depends (indirectly, via derequire 0.8.0) on esprima-six, which has disappeared from npm causing installation to fail. https://github.com/substack/node-browserify/pull/710
2015-11-14 02:36:25 +00:00
Karl Hobley 6e4cd12e24 Unpin Willow setup.py requirement 2015-11-13 12:39:31 +00:00
Matt Westcott 6c8adaf0f7 Prepare for 1.2 release
Conflicts:
	CHANGELOG.txt
	wagtail/wagtailcore/__init__.py
2015-11-12 16:55:14 +00:00
Matt Westcott 10c280589b Merge branch 'kaedroho-python-35' 2015-11-12 16:44:29 +00:00
Matt Westcott 204aa53ff4 Add Python 3.5 support to release notes 2015-11-12 16:43:49 +00:00
Matt Westcott 23ed5392de Merge branch 'python-35' of https://github.com/kaedroho/wagtail into kaedroho-python-35 2015-11-12 16:33:29 +00:00
Neal Todd ae50256ec3 Merge pull request #1920 from timgraham/add-django-trove
Add Django version trove classifiers.
2015-11-12 09:25:54 +00:00
Tim Graham 2294520032 Add Django version trove classifiers. 2015-11-11 17:37:30 -05:00
Matt Westcott 19f370c20a Add pointers to the new integrating-with-Django docs 2015-11-10 21:45:21 +00:00
Matt Westcott 96e9a67b75 Add 'integrating into Django' docs 2015-11-10 21:30:10 +00:00