Wykres commitów

682 Commity (f8a14d8c1ac3a8fd95a61dd98a7945db47c513cb)

Autor SHA1 Wiadomość Data
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
Edd Baldry b70e8aa92a Adding conditional if uploaded image is too small 2017-02-23 16:50:24 +00:00
David Ray fdc597aa18 Fixes #37, place sqlite file in PROJECT_ROOT 2017-02-23 04:37:19 -05:00
Scot Hacker 7837f32e09 Link gallery images to the pages they're first used in 2017-02-22 22:46:39 -08:00
Scot Hacker 953e64b4d9 PEP-8 2017-02-22 22:46:14 -08:00
Edd Baldry c2a12194d6 Equal height cards. Correcting image width. 2017-02-22 22:36:58 +00:00
Edd Baldry f61be1f1f5 Initial styling of blog index page 2017-02-22 21:47:08 +00:00
David Ray cfa0a868eb Merge pull request #55 from wagtail/22_modeladmingroup
Refactor WagtailBakery admin menu item(s)
2017-02-22 11:56:28 -05:00
Scot Hacker f3f2f4fd09 Merge branch 'master' of https://github.com/wagtail/bakerydemo 2017-02-22 00:05:16 -08:00
Scot Hacker 3fd43d9ea1 Rename choices to collection on Gallery page
- For clarity in admin UI
- Prevent gallery introduction from wrapping into images
- Toward #36
2017-02-22 00:04:31 -08:00
David Ray e562ca95a5 Merge pull request #59 from wagtail/readme_virtualenv
Modify readme to cover virtualenv for manual setups
2017-02-21 21:46:41 -05:00
Scot Hacker 6b4cb1d61f Use blog intro field on blog index, detail; blog bylines, avatars
- Resolves #60
2017-02-21 01:07:04 -08:00
Scot Hacker e2bf6524d7 Modify readme to cover virtualenv for manual setups
- Also .gitignore .env file
2017-02-20 23:45:35 -08:00
Scot Hacker df17d528eb Use font-awesome icons in the wagtail_hooks menus 2017-02-20 11:02:34 -08:00
Scot Hacker d2300a362f Refactor WagtailBakery admin menu item(s)
- Access to People, FooterText, BreadType and Country from custom menu items
- Now uses wagtail_hooks  rather than putting config in the models
- Resolves #22
2017-02-20 11:02:34 -08:00
Scot Hacker dc93606135 Merge pull request #47 from wagtail/41-abstract-base-page
Create abstract base class for common fields
2017-02-20 10:30:15 -08:00
David Ray d1dac6783e Merge pull request #56 from wagtail/contributing
adding contributing doc
2017-02-20 05:55:44 -05:00
David Ray 8a1b691154 Add punctuation. 2017-02-20 05:47:26 -05:00
David Ray 07f12aae9f add blurb about linking to issues on commit and make markdown hyperlinks the same style as readme.me 2017-02-20 05:46:30 -05:00
David Ray 3f87c359c5 adding contributing doc 2017-02-20 05:15:48 -05:00
David Ray cace34cd65 restore BlogPage.subtitle and inject Panel into appropriate position 2017-02-20 04:52:24 -05:00
David Ray 0d5dac6c56 Merge branch 'master' into 41-abstract-base-page 2017-02-20 04:37:08 -05:00
David Ray 09dc151a8f Merge pull request #46 from wagtail/33-breadcrumb-changes
Breadcrumb changes
2017-02-20 04:31:20 -05:00