Commit History

Autor SHA1 Mensaxe Data
  David Ray 23cdf1f82f Merge branch 'master' into 41-abstract-base-page %!s(int64=8) %!d(string=hai) anos
  Scot Hacker 6eefd5f991 Improve admin display of body text on Locations (label, position) %!s(int64=8) %!d(string=hai) anos
  Scot Hacker 89acb88252 Restore styles needed for Google maps display %!s(int64=8) %!d(string=hai) anos
  Scot Hacker 57592cba81 Merge branch 'location-enhancements' %!s(int64=8) %!d(string=hai) anos
  Scot Hacker ee8bd1169d Merge pull request #48 from wagtail/38-is-store-open-logic %!s(int64=8) %!d(string=hai) anos
  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 %!s(int64=8) %!d(string=hai) anos
  David Ray f30ec597a2 rename mixin %!s(int64=8) %!d(string=hai) anos
  David Ray b8090a1ccf Fixes #41; create abstrat base class for common fields %!s(int64=8) %!d(string=hai) anos
  Edd Baldry 91a000a020 Fix merge conflicts, including migration merge issue %!s(int64=8) %!d(string=hai) anos
  David Ray 413c3fec5a Merge pull request #44 from wagtail/27-s3-media %!s(int64=8) %!d(string=hai) anos
  David Ray 8cfa0615af update readme for S3 language %!s(int64=8) %!d(string=hai) anos
  David Ray afb50f0bb1 Merge branch 'master' into 27-s3-media %!s(int64=8) %!d(string=hai) anos
  David Ray 99328a169f Fixes #43, upgrade to wagtail 1.9 %!s(int64=8) %!d(string=hai) anos
  David Ray abba63f0c7 update readme %!s(int64=8) %!d(string=hai) anos
  David Ray a992f62f7c Fixes #27; adjust readme to give optional config steps for S3 based media %!s(int64=8) %!d(string=hai) anos
  Scot Hacker ed07adc2e0 Use common content-header for all site sections %!s(int64=8) %!d(string=hai) anos
  Scot Hacker bc54cb4c65 Add image and intro fields to breads page %!s(int64=8) %!d(string=hai) anos
  Scot Hacker 988fb54ba3 Add image and introduction fields to locations index %!s(int64=8) %!d(string=hai) anos
  Scot Hacker efb18406cd Fix endblock in breads index template %!s(int64=8) %!d(string=hai) anos
  Scot Hacker b0f85e9dcf Add missing intro text on gallery template %!s(int64=8) %!d(string=hai) anos
  Vagrant Default User bee8cb9015 Fixes #39, adjust djrun alias now that we no longer set DJANGO_SETTINGS_MODULE in .bashrc %!s(int64=8) %!d(string=hai) anos
  Edd Baldry 2bc9d56b4e Merge branch 'master' of github.com:wagtail/bakerydemo %!s(int64=8) %!d(string=hai) anos
  Scot Hacker aae64c9d6a Fix readme reference to local.py.example %!s(int64=8) %!d(string=hai) anos
  David Ray f8b099b902 Merge pull request #25 from wagtail/17-vagrant-issues %!s(int64=8) %!d(string=hai) anos
  David Ray 745136b5fc merge from master %!s(int64=8) %!d(string=hai) anos
  David Ray c3762e4fbf Merge pull request #34 from wagtail/28-pin-reqs %!s(int64=8) %!d(string=hai) anos
  Edd Baldry 7cfcd6fede Add scrollwheel false to google api call %!s(int64=8) %!d(string=hai) anos
  Arnar Tumi Þorsteinsson ccad5ed974 small changes to gallery page %!s(int64=8) %!d(string=hai) anos
  Edd Baldry d4d931b1e4 Increase constrast on location index page headlines %!s(int64=8) %!d(string=hai) anos
  Scot Hacker c22ab78ad7 Document dummy/live email settings to support contact form %!s(int64=8) %!d(string=hai) anos