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

738 Commity (main)

Autor SHA1 Wiadomość Data
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
Edd Baldry cab38ff3bc Merge master into 33-breadcrumb-changes after resolving conflicts 2017-02-20 08:28:29 +00:00
David Ray fa5cf63b82 Merge branch 'master' into 41-abstract-base-page 2017-02-19 20:26:37 -05:00
David Ray 407af8d2f6 Work on #41; adding BasePageFieldsMixin to more pages 2017-02-19 20:24:43 -05:00
Scot Hacker 68180bf3c6 Merge pull request #53 from wagtail/51-location-styling-missing-styles 
Amend location page to include styling
 2017-02-19 14:27:29 -08:00
Edd Baldry dbc03228fd Removing HTML body extra head styling 2017-02-19 22:05:52 +00:00
Scot Hacker 19fd2f23e7 Remove duplicate About page template 2017-02-19 13:57:06 -08:00
Edd Baldry 4184a2540c Styling of breadcrumb 2017-02-19 21:54:01 +00:00
Edd Baldry 0d5ce5a1e9 Amend location page to include styling 2017-02-19 21:01:13 +00:00
Edd Baldry e1e59b472f Remove content-header content-body blocks replace with content on all templates 2017-02-19 20:35:46 +00:00
David Ray b6a1e39e67 Merge pull request #45 from tobiasmcnulty/docker 
Add Dockerfile and docker-compose.yml
 2017-02-19 11:58:44 -05:00
Tobias McNulty 6652c42d09 Add Dockerfile, docker-compose.yml, S3 uploaded media settings (configurable via the environment), Docker instructions, and a .travis.yml to build/test the Docker image. 2017-02-19 11:46:34 -05:00
David Ray 23cdf1f82f Merge branch 'master' into 41-abstract-base-page 2017-02-19 06:52:12 -05:00
Scot Hacker 6eefd5f991 Improve admin display of body text on Locations (label, position) 2017-02-19 01:44:22 -08:00
Scot Hacker 89acb88252 Restore styles needed for Google maps display 2017-02-19 01:05:31 -08:00
Scot Hacker 57592cba81 Merge branch 'location-enhancements' 
- With merge conflict resolved
 2017-02-19 00:36:57 -08:00
Scot Hacker ee8bd1169d Merge pull request #48 from wagtail/38-is-store-open-logic 
Logic to determine if a store is currently open
 2017-02-18 15:46:19 -08:00
David Ray af6bfc2e30 Work on #28; decided a template tag was not necessary to determine if a store was open or not; added model methods and updated template 2017-02-18 08:38:34 -05:00
David Ray f30ec597a2 rename mixin 2017-02-18 06:37:12 -05:00
David Ray b8090a1ccf Fixes #41; create abstrat base class for common fields 2017-02-18 06:21:21 -05:00
Edd Baldry 33f862b0f5 Initial change to base, removing content-header and content-body to replace with content block 2017-02-18 09:29:18 +00:00
Edd Baldry 91a000a020 Fix merge conflicts, including migration merge issue 2017-02-18 09:24:02 +00:00
David Ray 413c3fec5a Merge pull request #44 from wagtail/27-s3-media 
Add documentation to discuss how to serve media on S3
 2017-02-17 20:14:22 -05:00
David Ray 8cfa0615af update readme for S3 language 2017-02-17 20:13:04 -05:00
David Ray afb50f0bb1 Merge branch 'master' into 27-s3-media 2017-02-17 19:57:53 -05:00
David Ray 99328a169f Fixes #43, upgrade to wagtail 1.9 2017-02-17 19:57:38 -05:00
David Ray abba63f0c7 update readme 2017-02-17 19:08:47 -05:00
David Ray a992f62f7c Fixes #27; adjust readme to give optional config steps for S3 based media 2017-02-17 18:50:35 -05:00
Scot Hacker ed07adc2e0 Use common content-header for all site sections 2017-02-17 01:15:22 -08:00
Scot Hacker bc54cb4c65 Add image and intro fields to breads page 2017-02-17 00:57:17 -08:00
Scot Hacker 988fb54ba3 Add image and introduction fields to locations index 2017-02-17 00:33:32 -08:00
Scot Hacker efb18406cd Fix endblock in breads index template 2017-02-17 00:30:19 -08:00
Scot Hacker b0f85e9dcf Add missing intro text on gallery template 2017-02-16 23:58:41 -08:00
Vagrant Default User bee8cb9015 Fixes #39, adjust djrun alias now that we no longer set DJANGO_SETTINGS_MODULE in .bashrc 2017-02-16 23:15:52 +00:00
Edd Baldry 2bc9d56b4e Merge branch 'master' of github.com:wagtail/bakerydemo 2017-02-16 20:33:40 +00:00
Scot Hacker aae64c9d6a Fix readme reference to local.py.example 2017-02-16 00:04:19 -08:00
David Ray f8b099b902 Merge pull request #25 from wagtail/17-vagrant-issues 
Amending initial settings
 2017-02-15 18:06:05 -05:00
David Ray 745136b5fc merge from master 2017-02-15 18:04:28 -05:00
David Ray c3762e4fbf Merge pull request #34 from wagtail/28-pin-reqs 
Pin versions of requirements
 2017-02-15 18:01:50 -05:00
Edd Baldry 7cfcd6fede Add scrollwheel false to google api call 2017-02-15 22:15:56 +00:00
Arnar Tumi Þorsteinsson ccad5ed974 small changes to gallery page 2017-02-15 20:54:06 +00:00
Edd Baldry d4d931b1e4 Increase constrast on location index page headlines 2017-02-15 18:26:14 +00:00
Scot Hacker c22ab78ad7 Document dummy/live email settings to support contact form 2017-02-15 09:06:39 -08:00
Edd Baldry 3afe2a4cb7 Add new fields to locations. Style detail page 2017-02-15 15:44:42 +00:00
David Ray e2fd5168e4 better formatting 2017-02-15 08:52:25 -05:00