search

strongswan / strongTNC

BYOD TNC Database Management Tool
GNU Affero General Public License v3.0
21 stars 10 forks source link

Integration Request 1 #3

Closed dbrgn closed 10 years ago

dbrgn commented 10 years ago

We rebased our commit history and added the fixes you requested.

tobiasbrunner commented 10 years ago

I pushed the branch with some minor changes to our repository (as integration): Squashed the fixes in the last commit into their respective commits, some whitespace fixes (replaced tabs with spaces, removed trailing whitespace). I only fixed whitespace errors on some of the changed lines (not all) but there are HTML files (e.g. packages.html or policies.html) with incorrect indention (tabs instead of spaces, even mixed) and in many files there is trailing whitespace (in particular on empty lines). Might be good idea to normalize the whitespace in all files in the next iteration. Let me know if the changes are OK for you, then I'll merge the branch to master.

dbrgn commented 10 years ago

Python files should be 100% compliant to our guidelines, so no trailing whitespace or tabs. This is also enforced in our test suite, violations count as test fails.

As for the HTML files, we planned to fix that in the next iteration. So if you merge this pull request as-is, everything will be fine next week or the week after :)

dbrgn commented 10 years ago

Oops, sorry, I was wrong. The cleanup commit (https://github.com/tnc-ba/strongTNC/pull/69) is not merged yet.