 Edd Baldry
|
91a000a020
Fix merge conflicts, including migration merge issue
|
8 anni fa |
|
David Ray
|
413c3fec5a
Merge pull request #44 from wagtail/27-s3-media
|
8 anni fa |
|
David Ray
|
8cfa0615af
update readme for S3 language
|
8 anni fa |
|
David Ray
|
afb50f0bb1
Merge branch 'master' into 27-s3-media
|
8 anni fa |
|
David Ray
|
99328a169f
Fixes #43, upgrade to wagtail 1.9
|
8 anni fa |
|
David Ray
|
abba63f0c7
update readme
|
8 anni fa |
|
David Ray
|
a992f62f7c
Fixes #27; adjust readme to give optional config steps for S3 based media
|
8 anni fa |
|
Scot Hacker
|
ed07adc2e0
Use common content-header for all site sections
|
8 anni fa |
|
Scot Hacker
|
bc54cb4c65
Add image and intro fields to breads page
|
8 anni fa |
|
Scot Hacker
|
988fb54ba3
Add image and introduction fields to locations index
|
8 anni fa |
|
Scot Hacker
|
efb18406cd
Fix endblock in breads index template
|
8 anni fa |
|
Scot Hacker
|
b0f85e9dcf
Add missing intro text on gallery template
|
8 anni fa |
|
Vagrant Default User
|
bee8cb9015
Fixes #39, adjust djrun alias now that we no longer set DJANGO_SETTINGS_MODULE in .bashrc
|
8 anni fa |
|
Edd Baldry
|
2bc9d56b4e
Merge branch 'master' of github.com:wagtail/bakerydemo
|
8 anni fa |
|
Scot Hacker
|
aae64c9d6a
Fix readme reference to local.py.example
|
8 anni fa |
|
David Ray
|
f8b099b902
Merge pull request #25 from wagtail/17-vagrant-issues
|
8 anni fa |
|
David Ray
|
745136b5fc
merge from master
|
8 anni fa |
|
David Ray
|
c3762e4fbf
Merge pull request #34 from wagtail/28-pin-reqs
|
8 anni fa |
|
Edd Baldry
|
7cfcd6fede
Add scrollwheel false to google api call
|
8 anni fa |
|
Arnar Tumi Þorsteinsson
|
ccad5ed974
small changes to gallery page
|
8 anni fa |
|
Edd Baldry
|
d4d931b1e4
Increase constrast on location index page headlines
|
8 anni fa |
|
Scot Hacker
|
c22ab78ad7
Document dummy/live email settings to support contact form
|
8 anni fa |
|
Edd Baldry
|
3afe2a4cb7
Add new fields to locations. Style detail page
|
8 anni fa |
|
David Ray
|
e2fd5168e4
better formatting
|
8 anni fa |
|
David Ray
|
2841127423
Actually add the dependency that we are discussing....
|
8 anni fa |
|
David Ray
|
009d113f20
Update base.txt
|
8 anni fa |
|
David Ray
|
dfcd58fd80
Merge branch 'master' into 28-pin-reqs
|
8 anni fa |
|
David Ray
|
9d193368b7
resolve merge from master
|
8 anni fa |
|
Scot Hacker
|
0a5358d13f
Alphabetize locations, show location thumbnails
|
8 anni fa |
|
Scot Hacker
|
355ef11589
Enhance tag view with button links, page header
|
8 anni fa |
