mirror
/
wagtail
kopia lustrzana https://github.com/wagtail/wagtail
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
1 425 Commity
55 Gałęzie
256 Tagi
3,4 GiB
Wykres commitów

1425 Commity (a5376dd2ea0a18008441f487cba5967a223cca94)

Autor SHA1 Wiadomość Data
Karl Hobley d4aa5d5090 Added __repr__ method to ElasticSearchResults 2014-06-20 11:43:33 +01:00
Karl Hobley 1475d440e3 len(ESResults) now runs query and gets the length of the results. Added ESResults.count() which asks Elasticsearch for the count but doesn't run the query 2014-06-20 11:42:17 +01:00
Karl Hobley 16b385da97 Slicing ESResults now returns a new ESResults object 
Previously, slicing an ESResults object made it run a query against ElasticSearch and return the results
This commit changes this by making slice return a new ESResults object with start and stop limits applied. To get results, you now have to iterate the ESResults object.
 2014-06-20 11:35:19 +01:00
Karl Hobley 69c9863d4c Made finding objects for search results the responsibility of do_search 2014-06-20 11:18:18 +01:00
Karl Hobley 3d3d0eb2bd Removed ability to use prefetch_related in search queries 
This will be replaced by search on queryset
 2014-06-20 11:15:02 +01:00
Karl Hobley f73d66908e Added __repr__ method to ElasticSearchQuery 2014-06-20 11:02:12 +01:00
Karl Hobley b2844a3225 Renamed a couple of methods on ElasticSearchResults 2014-06-20 11:01:19 +01:00
Karl Hobley 112ff57d20 Split ESResults into ESResults and ESQuery 2014-06-20 10:58:44 +01:00
Tom Talbot 2156c0ddd2 Fix Travis test failures 2014-06-20 10:55:49 +01:00
Dave Cranwell 2c50a49ef6 further tweaks to prevent scrolling of date inputs 2014-06-20 10:34:27 +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
Tom Talbot 342699839b Merge branch 'master' into edit-handlers-unit-tests 2014-06-20 10:16:25 +01:00
Dave Cranwell 91fe81bb9b addressing issue where toolbar was in wrong place. hallo-wagtail-toolbar appeared to override the version provided by hallo, yet removed the one feature from the original version that was essential. 2014-06-20 10:11:10 +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
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
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