Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-20 13:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2918 commits 30 branches 112 tags 89 MiB
Commit graph

2918 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dave Cranwell
73e7ca0098 removed include of hallo-wagtail-toolbar.js, which only appeared to be broken and was almost identical to the core version 2014-06-19 17:52:36 +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
Tom Talbot
e87190f5bb Update edit handlers unit tests 
Add more tests. Clean up modified class properties after tests finish.
Replace assertRegexpMatches with assertIn.
 2014-06-19 17:23:36 +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
Dave Cranwell
269dfe62f5 refactoring how/where fields get their classes added 2014-06-19 16:58:48 +01:00
Karl Hobley
4c5a1b1ae9 Recache coverage badge 2014-06-19 14:17:27 +01:00
Nick Smith
d778c3693d respect DOM re-ordering of formsets even if the parent form errored 2014-06-19 14:15:10 +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
62fc679720 further tweaks to colours and form layout 2014-06-19 13:47:09 +01:00
Dave Cranwell
d1b321f859 made red more distinct from salmon 2014-06-19 13:33:48 +01:00
Dave Cranwell
6a33834d29 ongoing styling of tabs an publishing fields, inc introduction of salmon colour 2014-06-19 13:30:39 +01:00
Dave Cranwell
03ce91c992 Update CONTRIBUTORS.rst 2014-06-19 12:28:07 +01:00
Dave Cranwell
59e161ad9d updates to edit page 2014-06-19 12:25:53 +01:00
Karl Hobley
879269ab20 Added versionchanged notes to docs 2014-06-19 11:22:58 +01:00
Karl Hobley
f73c7da772 Update docs to import tags from correct tags module 2014-06-19 11:17:32 +01:00
Karl Hobley
6c54fc55d1 Merge remote-tracking branch 'torchbox/master' into scheduled-publishing 
Conflicts:
	wagtail/wagtailadmin/edit_handlers.py
	wagtail/wagtailadmin/views/pages.py
	wagtail/wagtailcore/models.py
	wagtail/wagtailcore/tests.py
 2014-06-19 11:07:36 +01:00
Karl Hobley
008b3238ab Moved image_tags to wagtailimages_tags 2014-06-19 10:41:53 +01:00
Karl Hobley
b3e7951932 Moved embed_filters to wagtailembeds_tags 2014-06-19 10:39:50 +01:00
Karl Hobley
65ec6d77e8 Merged richtext tags into wagtailcore_tags 2014-06-19 10:36:03 +01:00
Karl Hobley
122abc9a8c renamed rich_text tags to wagtailrichtext_tags 2014-06-19 10:30:09 +01:00
Karl Hobley
9a5954607d Renamed pageurl tags to wagtailcore_tags 2014-06-19 10:28:56 +01:00
Karl Hobley
58ed918129 Merge pull request #330 from kaedroho/wagtailcore-cleanup 
Wagtailcore cleanup
 2014-06-19 10:14:19 +01:00
Tom Talbot
cd06b2c6e2 Remove broken test 2014-06-18 17:33:20 +01:00
Karl Hobley
d95763251d Corrected names of userbar tests 2014-06-18 17:29:24 +01:00
Tom Talbot
61290d90a9 Merge branch 'master' into edit-handlers-unit-tests 
Conflicts:
	wagtail/wagtailadmin/edit_handlers.py
 2014-06-18 17:29:01 +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
Tom Talbot
3778c476bb Add unit tests for edit_handlers.py. Lint edit_handlers.py. 2014-06-18 17:16:04 +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
20ac4ead44 begun styling and refactoring to work in the way we want 2014-06-18 16:54:31 +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
Robert Clark
733294cafa return a queryset instead of the first sibling 2014-06-18 11:04:39 -04: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
Robert Clark
6ce38148b0 Merge branch 'master' of https://github.com/torchbox/wagtail into published_pagination 2014-06-18 10:52:02 -04: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