Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-10 16:24:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1215 commits 30 branches 112 tags 89 MiB
Commit graph

1215 commits

This branch
This branch
All branches
Author SHA1 Message Date
Karl Hobley
2801c913dc Docs update for #342 merge 2014-06-23 14:22:50 +01:00
Matt Westcott
766f14e709 Merge pull request #342 from kaedroho/searchchanges/ditch-elasticutils 
Search Changes 1 - Ditch ElasticUtils
 2014-06-23 14:11:24 +01:00
Karl Hobley
acd27306a8 Merge pull request #328 from gasman/feature/subpage_types_niceties 
Additional UX/workflow niceties when subpage_types is in use
 2014-06-23 09:42:47 +01:00
Matt Westcott
b8c0594fdf Merge branch 'kcl-ddh-master' 2014-06-20 16:14:25 +01:00
Matt Westcott
f4c51d8205 add changelog entry for construct_whitelister_element_rules hook 2014-06-20 16:10:03 +01:00
Matt Westcott
1aab35ba24 add documentation for the construct_whitelister_element_rules hook 2014-06-20 16:08:50 +01:00
Matt Westcott
505a1291a8 Move construct_whitelister_element_rules hook logic into DbWhitelister, as the whitelist module should be Wagtail-agnostic 2014-06-20 15:22:54 +01:00
Matt Westcott
9bc770d0a6 Add unit tests for DbWhitelister, including ability to override the whitelist via hooks 2014-06-20 15:21:31 +01:00
jmiguelv
2afb13667f Added a new hook to add new element rules to the Whitelister. 2014-06-20 15:21:31 +01:00
Matt Westcott
0ea934566f Merge branch 'master' of github.com:torchbox/wagtail 2014-06-20 14:08:57 +01:00
Matt Westcott
55cd5aad83 Revert frame-writing stuff from #315, as it fails when the preview loads before the placeholder - see https://github.com/torchbox/wagtail/pull/315#issuecomment-46669595 2014-06-20 14:08:49 +01:00
Dave Cranwell
ba0805e521 Update frontenddevelopers.rst 
typo fix
 2014-06-20 14:07:33 +01:00
Dave Cranwell
135d4f20a6 Update frontenddevelopers.rst 2014-06-20 14:04:11 +01:00
Dave Cranwell
c1f2f745af Update frontenddevelopers.rst 
heading level fix
 2014-06-20 13:49:25 +01:00
Dave Cranwell
8cb94f0b5c Update frontenddevelopers.rst 
Added notes about new image manipulation techniques
 2014-06-20 13:46:43 +01:00
Karl Hobley
05cb87e3eb Tests now succeed on elasticsearch 0.90.x 2014-06-20 10:31:48 +01:00
Karl Hobley
598e6193da Install elasticsearch instead of elasticutils on travis 
Conflicts:
	.travis.yml
 2014-06-20 10:31:21 +01:00
Karl Hobley
c00c4d2437 New ElasticSearch module now supports bulk insert 2014-06-20 10:30:23 +01:00
Karl Hobley
4081206c77 Scrapped ElasticUtils, use Elasticsearch-py instead 
Conflicts:
	wagtail/wagtailsearch/backends/elasticsearch.py
	wagtail/wagtailsearch/indexed.py
 2014-06-20 10:29:57 +01:00
Matt Westcott
b26744e137 changelog entry for #294 2014-06-19 22:06:41 +01:00
Matt Westcott
cac92de53f Merge branch 'sixpearls-feature/image_tag_attrs' 2014-06-19 22:03:38 +01:00
Matt Westcott
0c4b5ba556 Add unit test for image tag with extra attributes 2014-06-19 22:02:45 +01:00
Matt Westcott
5e055972cd Refactor image tag parser so that it only has two cases to handle 2014-06-19 21:55:45 +01:00
Matt Westcott
64b933ceee Merge branch 'feature/image_tag_attrs' of https://github.com/sixpearls/wagtail into sixpearls-feature/image_tag_attrs - 
Update img_tag to output extra attributes through format_html_join rather than a template.
Conflicts:
	wagtail/wagtailimages/models.py
 2014-06-19 21:34:01 +01:00
Matt Westcott
b0c462a453 Merge branch 'jeffrey-hearn-imagetags-attrs-prop' 2014-06-19 17:37:06 +01:00
Matt Westcott
aad0e24a48 Changelog entry for #299 2014-06-19 17:36:57 +01:00
Matt Westcott
f6ae1834fa Document the 'attrs' property of image renditions 2014-06-19 17:34:59 +01:00
Matt Westcott
4e8e1f97ca use self.attrs in AbstractRendition.img_tag to avoid duplication 2014-06-19 17:28:34 +01:00
Matt Westcott
188b17526d Merge branch 'imagetags-attrs-prop' of https://github.com/jeffrey-hearn/wagtail into jeffrey-hearn-imagetags-attrs-prop 2014-06-19 17:21:56 +01:00
Karl Hobley
4c5a1b1ae9 Recache coverage badge 2014-06-19 14:17:27 +01:00
Karl Hobley
dd89d2d29e Merge pull request #331 from kaedroho/tests-changes2 
Tests changes
 2014-06-19 14:04:56 +01:00
Dave Cranwell
03ce91c992 Update CONTRIBUTORS.rst 2014-06-19 12:28:07 +01:00
Karl Hobley
58ed918129 Merge pull request #330 from kaedroho/wagtailcore-cleanup 
Wagtailcore cleanup
 2014-06-19 10:14:19 +01:00
Karl Hobley
d95763251d Corrected names of userbar tests 2014-06-18 17:29:24 +01:00
Dave Cranwell
06dc598d0a Update CHANGELOG.txt 2014-06-18 17:25:58 +01:00
Karl Hobley
778c699151 Merge branch 'master' into tests-changes2 2014-06-18 17:25:47 +01:00
Karl Hobley
9a1da28c38 Changelog entries for #236, #286 and #315 2014-06-18 17:22:46 +01:00
Tom Dyson
e40dea8d28 wagtail -> Wagtail in contributing.rst 2014-06-18 17:17:14 +01:00
Karl Hobley
f53ebfd7a9 Merge pull request #236 from davecranwell/feature/styleguide 
Addition of a styleguide, for logged in users only and not publicly linked.
 2014-06-18 17:04:44 +01:00
Dave Cranwell
f6eefb02b1 merge conflict resolved 2014-06-18 16:56:05 +01:00
Dave Cranwell
d34c504ba3 Merge pull request #286 from kaedroho/new-datetime-picker 
New datetime picker
 2014-06-18 16:53:24 +01:00
Dave Cranwell
c14ce44503 Merge pull request #315 from davecranwell/feature/minor-preview-improvement 
Aesthetic improvements to preview experience.
 2014-06-18 16:53:11 +01:00
Karl Hobley
ed4af844de Added tests for userbar 2014-06-18 15:58:54 +01:00
Karl Hobley
3577e61880 Raise exception if userbar views are accessed by anonymous user 2014-06-18 15:58:22 +01:00
Karl Hobley
e76785d96d Merge branch 'master' into tests-changes2 2014-06-18 15:49:26 +01:00
Karl Hobley
9c0f4212e3 Only allow logged in users to access the userbar views 2014-06-18 15:49:02 +01:00
Karl Hobley
cbc401befe Deleted test to test query popularity over time (not implemented) 2014-06-18 14:50:42 +01:00
Karl Hobley
e220c77cc0 Added test to test reordering of editors picks 2014-06-18 14:20:42 +01:00
Karl Hobley
a05df1a534 Added posting tests to editors picks 2014-06-18 13:39:12 +01:00
Karl Hobley
620e58632f General improvements to editorspicks tests 2014-06-18 13:08:54 +01:00