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

Ct integration #42

Merged
merged 31 commits into from
May 27, 2016
Merged

Conversation

Snugug
Copy link
Member

@Snugug Snugug commented May 27, 2016

Resolves the merge conflicts of #39

Changelog

**New**

* Content Type Saving/Validation/Updating
* New Navigation

**Changed**

* Clean Up Routing
*  Clean Up Navigation

Resolves: #11
Resolves #40
Resolves #36
Resolves #39

DCO 1.1 Signed-off-by: Sam Richard <sam@snug.ug>

Sam Richard added 30 commits May 23, 2016 14:04
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
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',
Copy link
Contributor

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?

Copy link
Member Author

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

@scottnath scottnath merged commit 6492168 into punchcard-cms:master May 27, 2016
@Snugug Snugug deleted the ct-integration--no-conflict branch May 27, 2016 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants