20 Commity (6eefd5f991ea872c22a083ee3449b1fa674ef39a)

Autor	SHA1	Wiadomość	Data
David Ray	9d193368b7	resolve merge from master	2017-02-15 07:44:53 -05:00
David Ray	940ef04cb7	remove specific ALLOWED_HOSTS domain	2017-02-12 02:08:02 -05:00
David Ray	42d466ea89	Work on #17, move more toward common django/wagtail conventions WRT settings file; fix Vagrant issues, adjust readme accordingly	2017-02-11 19:42:48 -05:00
David Ray	4a73f34bce	tweak settings/wsgi to use whitenoise for heroku	2017-02-10 11:03:13 -05:00
David Ray	0204545966	tweak db settings for heroku	2017-02-10 11:01:46 -05:00
David Ray	9fa96f61c2	tweak for heroku	2017-02-10 10:57:18 -05:00
David Ray	2d45e8add8	merging conflicting migrations, adding heroku bits	2017-02-10 10:51:50 -05:00
Arnar Tumi Þorsteinsson	dba8b86421	Merge branch 'master' of github.com:wagtail/bakerydemo	2017-02-10 14:19:40 +00:00
Arnar Tumi Þorsteinsson	87766bffb8	api	2017-02-10 14:19:28 +00:00
David Ray	0c68d4320d	readding as this is used in settings/__init__.py for local dev and Vagrant	2017-02-10 08:56:53 -05:00
David Ray	c351ebbff7	Removing unused settings files	2017-02-10 08:31:59 -05:00
Scot Hacker	293a740f1f	Implement multi-model search	2017-02-10 13:05:54 +00:00
Scot Hacker	6c531c93ae	Resolve merge and migration conflicts	2017-02-10 10:04:43 +00:00
Scot Hacker	aecb17f67e	Static serving, URL config, start of bootstrap	2017-02-10 09:48:08 +00:00
David Ray	5e9dfac82a	Adding template dir to TEMPLATES, adding base form templates	2017-02-09 11:51:30 -05:00
Scot Hacker	e5af9f2343	Resolve conflict	2017-02-09 15:23:52 +00:00
Scot Hacker	0e6cf088bb	First draft of breads app	2017-02-09 15:21:50 +00:00
Edd Baldry	3407b16f1b	Initial commit for base app with streamfield blocks, about page, gallery page and people snippet	2017-02-09 15:18:13 +00:00
Edd Baldry	e4bc43f219	Add empty apps for demo	2017-02-09 13:11:12 +00:00
Edd Baldry	0b54a7205c	Add initial demo scaffold without any site apps	2017-02-09 12:20:21 +00:00