mirror
/
wagtail-bakerydemo
kopia lustrzana https://github.com/wagtail/bakerydemo
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność
354 Commity
4 Gałęzie
11 Tagi
27 MiB
Wykres commitów

354 Commity (d7a2f94e87a0bd59c3aa011f6776cbfbd885b4f8)

Autor SHA1 Wiadomość Data
Edd Baldry 1bd97ee2e1 Homepage template and initial styling. Workson #58. 2017-02-28 22:32:34 +00:00
Edd Baldry 5cc612b6ab Add function on IndexPage models to return children. Workson #58 2017-02-28 17:38:47 +00:00
Edd Baldry eca02103cd Change to homepage model for styling. Workson #58. 2017-02-28 17:27:58 +00:00
Scot Hacker aba7aebf05 Add missing merge migration 2017-02-28 08:19:57 -08:00
Scot Hacker bc5481bea7 Merge pull request #73 from wagtail/15-style-formpage 
Styling form page
 2017-02-28 00:20:06 -08:00
Edd Baldry 1696ac1b1b Merge master with about page style. Workson #15 2017-02-28 07:50:35 +00:00
David Ray bf83e01414 Merge pull request #77 from wagtail/sh_rem_aboutlocations 
Remove  aboutlocations
 2017-02-28 02:31:38 -05:00
Scot Hacker 994dccd4ee Merge pull request #76 from wagtail/75-about-style 
About template styling (and amended header include)
 2017-02-27 23:20:57 -08:00
Scot Hacker 3e1263d960 Remove AboutLocationRelationship model 
- Overlaps with functionality of Locations view
- Resolves #54
 2017-02-27 23:15:56 -08:00
Scot Hacker d7de3aa068 Merge branch 'master' of https://github.com/wagtail/bakerydemo 2017-02-27 23:10:54 -08:00
Edd Baldry f3c4d2ebb1 Better image handling on generic header include. Workson #75 2017-02-28 06:54:15 +00:00
Edd Baldry c890bb72c8 About template styling and amended header include. Workson #75 2017-02-28 06:49:28 +00:00
Edd Baldry 2dda668db2 Use hero title include. Add conditionals to include where no image set. Workson #15 2017-02-27 22:20:52 +00:00
Edd Baldry 600bfc482d Amend form model to name imagefield image. Workson #15. 2017-02-27 22:20:11 +00:00
Edd Baldry a870eb57ad Initial styling form success page. Workson #15. 2017-02-27 22:00:12 +00:00
Edd Baldry 268228dc31 Merge master to 15-style-formpage branch. Including bread styles. Workson #15. 2017-02-27 21:49:38 +00:00
Edd Baldry 1f222d9f8b Initial styling of form page. Workson #15 2017-02-27 17:54:12 +00:00
Scot Hacker e44888e738 Merge pull request #71 from wagtail/57-styling-bread 
Bread styling
 2017-02-27 08:35:34 -08:00
Edd Baldry f80b4a443c Consistent use of page.foo rather than self.foo on breadpage. Workson #57 2017-02-27 08:12:52 +00:00
Edd Baldry 3b221e2ef2 Removing commented code on bread page template. Workson #57 2017-02-26 18:35:56 +00:00
Edd Baldry 16eb8374c2 Breadpage image same asset on mobile and desktop. Works on #57 2017-02-26 18:31:48 +00:00
Edd Baldry 283422956f Handle large images on bread detail page. Workson #57 2017-02-26 18:25:00 +00:00
Edd Baldry 81cd0ebeb9 Two col design for bread detail page. Workson #57 2017-02-26 18:02:11 +00:00
Scot Hacker bb24157057 Merge branch 'master' of https://github.com/wagtail/bakerydemo 2017-02-25 23:19:11 -08:00
Edd Baldry dc561bedb3 Merge branch '57-styling-bread' of github.com:wagtail/bakerydemo into 57-styling-bread. Workson #57. 2017-02-25 19:23:02 +00:00
Edd Baldry bb2c926729 Add bread index page template styling conditionals for optional fields. Workson #57 2017-02-25 19:22:41 +00:00
David Ray 73720ce050 Update property to method and adjust calls to invoke the method 2017-02-25 14:08:31 -05:00
Edd Baldry ff20327de1 Merge branch 'master' into 57-styling-bread. Workson #57. 2017-02-25 19:03:55 +00:00
Edd Baldry df3a587083 Finish styling index page. Works on #57 2017-02-25 18:55:53 +00:00
Edd Baldry 684023cbd3 List 12 breads per page. Works on #57 2017-02-25 18:55:28 +00:00
David Ray 4d74b41c22 Merge pull request #70 from wagtail/64-bread-ingredients 
BreadIngredient <--> Bread M2M example
 2017-02-25 04:10:42 -05:00
David Ray 619ceb6406 wrap ingredients field within a collapsible multi field paenl 2017-02-25 03:53:31 -05:00
Scot Hacker 54ede130f5 Merge branch 'master' of https://github.com/wagtail/bakerydemo 2017-02-25 00:25:50 -08:00
Edd Baldry 686d5446b8 Remove commented out code. Works on #57 2017-02-24 22:07:47 +00:00
Edd Baldry e96591d5f9 Separating pagination from context on model. Introduce pagination on template. Works on #57 2017-02-24 22:03:50 +00:00
Edd Baldry b9f4661b0f Initial styling of bread index page. Workson #57 2017-02-24 17:36:57 +00:00
David Ray af0ab93980 Fixes #64; add M2M example for bread model 2017-02-24 05:57:46 -05:00
David Ray 1e710543a2 Merge pull request #69 from wagtail/63_posts 
Rename blogs method to get_posts; simplify list comprehensions
 2017-02-24 04:03:35 -05:00
Scot Hacker e20eb1cfbc Merge branch 'master' of https://github.com/wagtail/bakerydemo 2017-02-23 23:52:02 -08:00
Scot Hacker e198892b49 Merge pull request #67 from wagtail/37-sqlite-path 
Place sqlite file in conventional PROJECT_ROOT path
 2017-02-23 23:51:06 -08:00
Scot Hacker 92df81d8a2 Simplify list comprehensions when getting all tags for children of BlogPage 2017-02-23 23:45:03 -08:00
Scot Hacker 07e6823751 Rename blogs method to get_posts; tweak indentation 2017-02-23 23:31:23 -08:00
Scot Hacker e39840882c Merge branch 'master' of https://github.com/wagtail/bakerydemo 2017-02-23 23:09:43 -08:00
Scot Hacker d4e0aa703e Readme note re: open source content 2017-02-23 23:09:37 -08:00
Scot Hacker 05db45f3cd Merge pull request #63 from wagtail/62-blog-index-styling 
Blog index styling
 2017-02-23 23:08:43 -08:00
Edd Baldry 45288f2103 Style tags on blog index page. Style tag pages. Minor height tweak on cards 2017-02-23 22:21:01 +00:00
Edd Baldry 6fb5c65344 Merge branch '62-blog-index-styling' of github.com:wagtail/bakerydemo into 62-blog-index-styling 2017-02-23 21:24:27 +00:00
Edd Baldry b64b2f08bc Merge pull request #68 from wagtail/62a-tags-blog-index 
Add helper method to get all BlogIndexPage's child BlogPage's tags
 2017-02-23 21:11:12 +00:00
Edd Baldry cdb3585b26 Merge branch 'master' into 62-blog-index-styling 2017-02-23 21:02:45 +00:00
David Ray c4d05b43c6 Add helper metrhod to get all BlogIndexPage's child BlogPage's tags 2017-02-23 13:45:45 -05:00