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

Feature/save revision no conflict #240

Merged

Conversation

Snugug
Copy link
Member

@Snugug Snugug commented Aug 10, 2016

Now we can save revisions!


Resolves #221

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

@Snugug Snugug mentioned this pull request Aug 10, 2016
@@ -358,10 +359,12 @@ const routes = application => {
return next();
}

// Validation
const validated = content.form.validate(req.body, type);
if (req.body.submit === 'Save Revision') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can Save Revision be added to config so that we don't have to control what this text is in multiple places?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yah, but we nreally really need to get these things out of config and replace them with #63

@scottnath
Copy link
Contributor

@Snugug 3 responses. Indentation ones...meh, moving the text to config...not meh

Sam Richard added 2 commits August 10, 2016 15:20
Merge conflicts makes tabs not spaces and breaks all the happy things
@scottnath scottnath merged commit 62657e2 into punchcard-cms:master Aug 10, 2016
@Snugug Snugug deleted the feature/save-revision-no-conflict branch August 10, 2016 19:40
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.

None yet

2 participants