Wykres commitów

95 Commity (ca109433b1366418be00b49385d590c918e8d790)

Autor SHA1 Wiadomość Data
David Ray 1b8f29b814 Merge pull request #26 from wagtail/3-heroku
Clean up Heroku deploy
2017-02-14 15:04:54 -05:00
Edd Baldry 1251d82fa6 Merge branch 'master' of github.com:wagtail/bakerydemo 2017-02-12 11:02:34 +00:00
Edd Baldry 0877b62574 Change block name on about page and 404 2017-02-12 11:02:25 +00:00
David Ray 940ef04cb7 remove specific ALLOWED_HOSTS domain 2017-02-12 02:08:02 -05:00
Scot Hacker be10bed28c Use `pageurl` in locations index, rather than simple slug 2017-02-11 23:47:16 +00:00
Scot Hacker 8fb66fc8fc Fix location maps by bubbling head-extra up through base.html 2017-02-11 23:46:53 +00:00
Scot Hacker 08efb42c81 Fix search regression 2017-02-11 22:54:29 +00:00
Scot Hacker acb109439a Fix open/close of `block content-body` in some places 2017-02-11 22:51:38 +00:00
David Ray d6c4d7e969 add missing migration for base app 2017-02-11 17:34:22 -05:00
David Ray ef4274756a Add migration 2017-02-11 17:30:56 -05:00
David Ray 095e61419e Fixes #19, add RegexValidator for Location lat_long field 2017-02-11 17:29:07 -05:00
Edd Baldry 6a0c4cccc3 Minor. Remove reference in base to non-existent js file. Closes #21 2017-02-11 22:25:33 +00:00
Edd Baldry d552e462ae Merge branch 'master' of github.com:wagtail/bakerydemo 2017-02-11 22:19:37 +00:00
Edd Baldry a37d9e8ad6 Initial mobile nav. Will need to use navbar-nav not pills. Work on #9. 2017-02-11 22:19:28 +00:00
David Ray a308f948af Fixes #7, adds tags back to blog detail page 2017-02-11 16:59:57 -05:00
Edd Baldry 21ce6e9573 Blog introduction and subtitle as per designs. closes #18 2017-02-11 21:32:29 +00:00
Edd Baldry 2767d65de3 Splitting base into includes. Increase number of blocks to help with presentation flexibility 2017-02-11 20:24:23 +00:00
Edd Baldry 1c754ac8a2 Header and navigation style addiitons 2017-02-11 20:17:32 +00:00
Edd Baldry 1eb29f5af1 Need to use page.url rather than full_url because of localhost port 2017-02-11 19:01:05 +00:00
Edd Baldry c867036770 Updating styles. Allowing dropdown menus 2017-02-11 19:00:18 +00:00
Edd Baldry 5a70e34b3a Print success message for when load_initial_data runs 2017-02-11 17:22:53 +00:00
David Ray f824745445 merge migrations 2017-02-10 11:27:54 -05:00
Edd Baldry 9f2ca052a1 Merge branch 'master' of github.com:wagtail/bakerydemo 2017-02-10 16:25:35 +00:00
Edd Baldry 6eec1ff693 Remove hardcoded image url from css. Add styles for breadcrumb 2017-02-10 16:23:56 +00:00
Arnar Tumi Þorsteinsson 4a6819ff89 Merge branch 'master' of github.com:wagtail/bakerydemo 2017-02-10 16:21:08 +00:00
Arnar Tumi Þorsteinsson 313eba154f fix merge 2017-02-10 16:21:04 +00:00
David Ray 8c5867d05c merge 2017-02-10 11:20:49 -05:00
Edd Baldry 031e6fe4d5 Remove commented todo from base.html 2017-02-10 16:20:23 +00:00
David Ray fe08f90b3b merge 2017-02-10 11:20:22 -05:00
Arnar Tumi Þorsteinsson d47d9adba7 blog page 2017-02-10 16:18:32 +00:00
Edd Baldry 0db1cefea6 Merge branch 'master' of github.com:wagtail/bakerydemo 2017-02-10 16:17:54 +00:00
Edd Baldry 12ea728a53 Amended styles based on updates from Ben 2017-02-10 16:15:12 +00: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 567725cc3f Merge branch 'master' of github.com:wagtail/bakerydemo 2017-02-10 15:28:16 +00:00
Arnar Tumi Þorsteinsson 64134fdf9d gallery and pagination 2017-02-10 15:28:06 +00:00
David Ray f9b3d6f8d0 adding some basic docstrings to classes that did not have them 2017-02-10 10:18:45 -05:00
Edd Baldry e0b93c6aec Initial styling without merge errors 2017-02-10 14:50:33 +00:00
Edd Baldry fe4be457da Minor styling 2017-02-10 14:41:28 +00:00
David Ray cae0f56612 merge 2017-02-10 09:32:02 -05:00
David Ray df399f5869 normalize on double quote for dosctrings versus single quote 2017-02-10 09:25:12 -05:00
Scot Hacker ac0059ff73 Missing migration 2017-02-10 14:21:20 +00: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
Scot Hacker ea54ed8c1e Merge branch 'master' of https://github.com/wagtail/bakerydemo 2017-02-10 14:11:25 +00:00
Scot Hacker 39214b54bf Add pin to Location maps 2017-02-10 14:10:43 +00:00
David Ray a26918f98d normalize multiline imports 2017-02-10 09:09:38 -05:00
David Ray 87ced7ad8f resolve merge conflicts 2017-02-10 09:07:37 -05:00