Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

'development' branch #3596

Merged
merged 9 commits into from Sep 10, 2019

Conversation

@mmmavis
Copy link
Member

commented Aug 30, 2019

temporary development branch

mmmavis added 2 commits Aug 28, 2019
Add BlogPageCategory Class and register it as snippet (#3594)
* Add BlogPageCategory Class and register it as snippet

* Add five initial categories

@patjouk patjouk temporarily deployed to foundation-mofostaging-pr-3596 Aug 30, 2019 Inactive

@patjouk patjouk temporarily deployed to foundation-mofostaging-pr-3596 Aug 30, 2019 Inactive

Add blog category to Blog factory (#3605)
* Add blog category to Blog factory

* Update network-api/networkapi/wagtailpages/factory/blog.py

Co-Authored-By: Pomax <pomax@nihongoresources.com>

* Update network-api/networkapi/wagtailpages/factory/blog.py

Co-Authored-By: Pomax <pomax@nihongoresources.com>

* Update network-api/networkapi/wagtailpages/factory/blog.py

Co-Authored-By: Pomax <pomax@nihongoresources.com>

* Fix indentation

@mmmavis mmmavis temporarily deployed to foundation-mofostaging-pr-3596 Sep 4, 2019 Inactive

@youriwims youriwims temporarily deployed to foundation-mofostaging-pr-3596 Sep 4, 2019 Inactive

@youriwims youriwims temporarily deployed to foundation-mofostaging-pr-3596 Sep 4, 2019 Inactive

Category pages (for Blog) (#3604)
* blog category subpage routes, with template updates specific to category cards

@Pomax Pomax temporarily deployed to foundation-mofostaging-pr-3596 Sep 6, 2019 Inactive

@mmmavis mmmavis temporarily deployed to foundation-mofostaging-pr-3596 Sep 9, 2019 Inactive

@Pomax Pomax changed the title (DO NOT MERGE) 'development' branch 'development' branch Sep 10, 2019

@Pomax
Pomax approved these changes Sep 10, 2019

@Pomax Pomax merged commit 157a769 into master Sep 10, 2019

3 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.2%) to 75.906%
Details
percy/foundation.mozilla.org Visual review approved by Pomax
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.