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

Api more security #1196

Merged
merged 8 commits into from
Dec 20, 2015
Merged

Api more security #1196

merged 8 commits into from
Dec 20, 2015

Conversation

pliablepixels
Copy link
Member

Addresses issue #1195

@SteveGilvarry
Copy link
Member

@pliablepixels Can I suggest that since github tracks all changes, blame, etc and we do not have any precedent of using comments to attribute a change that we remove the "//PP" comments?
Other opinions? @knnniggett @kylejohnson

@pliablepixels
Copy link
Member Author

@SteveGilvarry - yes, this was actually a way for me to track local changes before committing - but its not needed - I'll strip and push again

… the day! Gone, and a cloud in my heart. - Tennyson
@SteveGilvarry
Copy link
Member

Maybe the #1155 ones can go altogether also

@pliablepixels
Copy link
Member Author

Everything in #1155 is also in this (including bug fixes to it) - which is why I closed 1155

@pliablepixels
Copy link
Member Author

oh you mean PP? Yes, in the update I pushed above with a heart wrenching quote from Lord Tennyson, PP is gone from there too. There will be other fragments of past PRs that will still have PP - I'll get around to removing them later, after I consult with my legacy planner on what this means to my legacy.

return;
}
// #1155 fixes
Copy link
Member

Choose a reason for hiding this comment

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

@pliablepixels Sorry I meant these "// #1155 fixes" ones, just the comment as again we can always see what belongs to what in Github. Or unless you think something needs to say why it exists in which case maybe change the comment to something more meaningful.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh ok - yes, what I really should do is refer to issues in commit messages - like I do in zmN - its a good way to map code to issues later. But I don't think I can find any quote from tennyson that will be apt for this change

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually @SteveGilvarry - I just remembered, its an easy way for me to say "This change went in due to user role auth checking" - should I remove it?

Copy link
Member

Choose a reason for hiding this comment

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

Something like //User role check if you think it would help someone reading the code understand it's purpose, but for me doesn't need to talk about a change. That is all covered by commits and PR in github.

@pliablepixels
Copy link
Member Author

done

connortechnology added a commit that referenced this pull request Dec 20, 2015
@connortechnology connortechnology merged commit 37212dc into ZoneMinder:master Dec 20, 2015
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.

3 participants