-
Notifications
You must be signed in to change notification settings - Fork 19
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
Ct integration #42
Merged
scottnath
merged 31 commits into
punchcard-cms:master
from
Snugug:ct-integration--no-conflict
May 27, 2016
Merged
Ct integration #42
scottnath
merged 31 commits into
punchcard-cms:master
from
Snugug:ct-integration--no-conflict
May 27, 2016
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Massive commit cause I haven't gotten one in. Will likely fail tests, not fully working
Need to get no-param-reassign under control. See punchcard-cms/eslint-config-punchcard#5
Update contentRoutes name
Resolves punchcard-cms#41 Resolves punchcard-cms#32
Resolves punchcard-cms#35 Resolves punchcard-cms#38
I think I figured out how to handle proper fallthrough 404 handling and render a page! Yay for late night code thoughts!
* ct-integration: (21 commits) 🎨 Clean up 404 handling 🆕 Add proper 404 handling ✅ Add proper 404 tests 🎨 Update error handling to be proper 404 ✅ Add Route Tests for Content/404 😒 Remove log from test 👕 Remove lint warnings for lines mean to log ✅ Add Utils tests 📝 Fix ISO documentation miss 😒 Update AVA version 😒 Update knex version 🎨 Clean up try/catch with lodash 🎨 Update utils to standard module.exports 🎨 Move messages in to config 👕 Fix linting issues 🎨 Clean up nav template 🆕 Content Type routing and saving 🐛 Fix Home Path 🆕🔮 Initial CT work 😒 Update Content Types versin ... # Conflicts: # index.js # package.json # views/_nav.html # views/content-types/add.html
Body parser not needed with connect-multiparty
Dateformat didn't handle timezones properly, Moment does
name: 'sunset', | ||
type: 'dateTime', | ||
}, | ||
{ | ||
name: 'sunset-timezone', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why can't there just be one timezone that both use?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because someone may want to sunrise/set in different timezones
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves the merge conflicts of #39
Changelog
Resolves: #11
Resolves #40
Resolves #36
Resolves #39
DCO 1.1 Signed-off-by: Sam Richard <sam@snug.ug>