David Ray
|
4d14f21ed7
|
resolve merge conflicts and code cleanup
|
2017-02-10 09:04:34 -05:00 |
Scot Hacker
|
545a49dbda
|
Merge branch 'master' of https://github.com/wagtail/bakerydemo
|
2017-02-10 14:01:16 +00:00 |
Scot Hacker
|
b0db0bba66
|
Snippet and template tag for footer text
|
2017-02-10 14:01:07 +00:00 |
David Ray
|
352dd344da
|
merging
|
2017-02-10 08:58:15 -05:00 |
Arnar Tumi Þorsteinsson
|
7ee4f404bd
|
add modeladmin
|
2017-02-10 13:57:17 +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 |
Arnar Tumi Þorsteinsson
|
35ddf6b13a
|
fixtures
|
2017-02-10 13:41:36 +00:00 |
Scot Hacker
|
35dc25f6d7
|
Remove unused imports
|
2017-02-10 13:33:59 +00:00 |
David Ray
|
c351ebbff7
|
Removing unused settings files
|
2017-02-10 08:31:59 -05:00 |
David Ray
|
e845b820cd
|
cleanup templates, except for base.html
|
2017-02-10 08:29:53 -05:00 |
Scot Hacker
|
14b5f47851
|
Merge branch 'master' of https://github.com/wagtail/bakerydemo
|
2017-02-10 13:27:38 +00:00 |
Scot Hacker
|
44ab2aab8e
|
Google Maps embed on LocationPage
|
2017-02-10 13:27:10 +00:00 |
David Ray
|
a5a4aac429
|
Extending form templates from base.html
|
2017-02-10 08:21:55 -05:00 |
Scot Hacker
|
293a740f1f
|
Implement multi-model search
|
2017-02-10 13:05:54 +00:00 |
David Ray
|
3e5ce066f8
|
adding fixtures stub and load_initial_data management command
|
2017-02-10 07:58:01 -05:00 |
David Ray
|
6830504a93
|
Add migrations
|
2017-02-10 07:18:57 -05:00 |
David Ray
|
c428998049
|
Add messages to base.html, handle /tags/ and /tags/[bad-slug]/
|
2017-02-10 07:10:49 -05:00 |
David Ray
|
68ca56d640
|
Use object.full_url to avoid incorrectly built URLs for BlogPage from the tag_archive view
|
2017-02-10 06:28:12 -05:00 |
David Ray
|
6d7db27b59
|
Simplify BlogPage model, remove unneeded properties and methods
|
2017-02-10 06:04:22 -05:00 |
David Ray
|
c918afa1de
|
Adds a custom view via RoutablePageMixin to render blog posts related to a particular tag via /[blog-index-slug]/tag/[tag-slug]
|
2017-02-10 06:00:11 -05:00 |
Edd Baldry
|
fb08c7db33
|
Delete migrations for all apps
|
2017-02-10 10:13:15 +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 |
Edd Baldry
|
9b952f5fbb
|
Basic templatetags and templates for main menu and breadcrumbs
|
2017-02-10 08:25:36 +00:00 |
Edd Baldry
|
4529b2789b
|
Basic template for blogs
|
2017-02-09 22:40:15 +00:00 |
Edd Baldry
|
588e31a083
|
Basic template for locations app
|
2017-02-09 22:31:59 +00:00 |
Edd Baldry
|
3533a04154
|
Allow people to be accessible via template for blog post
|
2017-02-09 22:24:27 +00:00 |
Edd Baldry
|
b664bc6e35
|
Basic template for breads app within context in index page
|
2017-02-09 22:18:27 +00:00 |
David Ray
|
b68225c2b8
|
add missing form landing page, tweak the getter for Gallery image collections
|
2017-02-09 12:25:11 -05:00 |
Edd Baldry
|
c35aaafd13
|
Relationships between locations and about page, blogs and authors
|
2017-02-09 17:14:59 +00:00 |
Edd Baldry
|
5bbe2b3006
|
Merge branch 'master' of github.com:wagtail/bakerydemo
|
2017-02-09 17:01:57 +00:00 |
Edd Baldry
|
573b6bbb65
|
Blog app
|
2017-02-09 17:01:41 +00:00 |
David Ray
|
5e9dfac82a
|
Adding template dir to TEMPLATES, adding base form templates
|
2017-02-09 11:51:30 -05:00 |
David Ray
|
3594066b17
|
merge
|
2017-02-09 11:25:58 -05:00 |
David Ray
|
e059e5d6de
|
adding locations app
|
2017-02-09 11:21:38 -05:00 |
Arnar Tumi Þorsteinsson
|
9d32c1437c
|
Choices block in gallery
|
2017-02-09 16:20:51 +00:00 |
Edd Baldry
|
d2d8a60f18
|
Adding a try except to getimagecollections method
|
2017-02-09 16:04:16 +00:00 |
Edd Baldry
|
479c993b85
|
Re-introducing migrations for base app
|
2017-02-09 15:50:02 +00:00 |
Scot Hacker
|
4899dfb96a
|
Re-add .gitignore
|
2017-02-09 15:31:15 +00: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
|
ec24a17f1c
|
Removing migrations
|
2017-02-09 15:19:39 +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 |