Permalink
Browse files

Style guideline: add newline to EOF; no trailing whitespace

  • Loading branch information...
ndarville committed Nov 22, 2012
1 parent b030fd1 commit bf4a3a9b5e07d4ac023f73a300718a7d018f81d6
Showing with 2,343 additions and 2,327 deletions.
  1. +1 −1 .gitignore
  2. +1 −1 .travis.yml
  3. +17 −1 CONTRIBUTING.mdown
  4. +2 −2 README.mdown
  5. +1 −1 _installation/INSTALLATION.mdown
  6. +4 −4 _postinstall/definesite.py
  7. +1 −1 _postinstall/mkadmin.py
  8. +1 −1 _postinstall/mkcategorythreadpost.py
  9. +1 −1 _postinstall/mkplaceholders.py
  10. +1 −1 dotcloud.yml
  11. +1 −1 forum/admin.py
  12. +1 −1 forum/fixtures/admin_user.json
  13. +8 −8 forum/fixtures/categories.json
  14. +1,777 −1,777 forum/fixtures/posts.json
  15. +48 −48 forum/fixtures/registered_users.json
  16. +65 −65 forum/fixtures/threads.json
  17. +266 −266 forum/fixtures/users.json
  18. +1 −1 forum/form_tests.py
  19. +1 −1 forum/forms.py
  20. +1 −1 forum/model_tests.py
  21. +8 −8 forum/models.py
  22. +3 −3 forum/static/css/dyslexia.css
  23. +11 −11 forum/static/css/reset.css
  24. +4 −4 forum/static/css/style.css
  25. +2 −2 forum/static/js/subscriptions-js.js
  26. +2 −2 forum/static/js/thread-js.js
  27. +2 −2 forum/static/js/user-js.js
  28. +1 −1 forum/templates/404.html
  29. +1 −1 forum/templates/500.html
  30. +2 −2 forum/templates/add.html
  31. +1 −1 forum/templates/base.html
  32. +2 −2 forum/templates/category.html
  33. +3 −3 forum/templates/create.html
  34. +2 −2 forum/templates/deprecated/lock.html
  35. +1 −1 forum/templates/deprecated/logout.html
  36. +1 −1 forum/templates/deprecated/register.html
  37. +1 −1 forum/templates/deprecated/remove.html
  38. +2 −2 forum/templates/deprecated/sticky.html
  39. +1 −1 forum/templates/deprecated/twostepauth/login.html
  40. +3 −3 forum/templates/deprecated/twostepauth/profile.html
  41. +3 −3 forum/templates/deprecated/twostepauth/signin_token_form.html
  42. +3 −3 forum/templates/edit.html
  43. +2 −2 forum/templates/home.html
  44. +1 −1 forum/templates/includes/configuration-warning.html
  45. +1 −1 forum/templates/includes/entries.html
  46. +1 −1 forum/templates/includes/js-blocked-warning.html
  47. +3 −3 forum/templates/includes/markdown.html
  48. +2 −2 forum/templates/includes/navigation.html
  49. +1 −1 forum/templates/includes/pagination.html
  50. +1 −1 forum/templates/includes/preview.html
  51. +1 −1 forum/templates/includes/thread-buttons.html
  52. +2 −2 forum/templates/includes/threadbar.html
  53. +3 −3 forum/templates/merge.html
  54. +2 −2 forum/templates/moderate.html
  55. +2 −2 forum/templates/move.html
  56. +1 −1 forum/templates/page.html
  57. +1 −1 forum/templates/post.html
  58. +1 −1 forum/templates/registration/activate.html
  59. +1 −1 forum/templates/registration/activation_complete.html
  60. +2 −2 forum/templates/registration/activation_email.txt
  61. +2 −2 forum/templates/registration/login.html
  62. +1 −1 forum/templates/registration/password_change_done.html
  63. +1 −1 forum/templates/registration/password_change_form.html
  64. +1 −1 forum/templates/registration/password_reset_complete.html
  65. +2 −2 forum/templates/registration/password_reset_confirm.html
  66. +1 −1 forum/templates/registration/password_reset_done.html
  67. +2 −2 forum/templates/registration/password_reset_email.html
  68. +2 −2 forum/templates/registration/password_reset_form.html
  69. +1 −1 forum/templates/registration/registration_complete.html
  70. +2 −2 forum/templates/registration/registration_form.html
  71. +2 −2 forum/templates/reply.html
  72. +2 −2 forum/templates/report.html
  73. +2 −2 forum/templates/reports.html
  74. +1 −1 forum/templates/saves_and_bookmarks.html
  75. +1 −1 forum/templates/settings.html
  76. +1 −1 forum/templates/simple_mod_action.html
  77. +2 −2 forum/templates/site_configuration.html
  78. +1 −1 forum/templates/subscriptions.html
  79. +1 −1 forum/templates/thread-mod-buttons.html
  80. +2 −2 forum/templates/thread.html
  81. +1 −1 forum/templates/user.html
  82. +1 −1 forum/templates/user_content.html
  83. +1 −1 forum/view_tests.py
  84. +15 −15 forum/views.py
  85. +1 −1 manage.py
  86. +1 −1 nginx.conf
  87. +1 −1 ponyforum/example_local_settings.py
  88. +2 −2 ponyforum/settings.py
  89. +1 −1 ponyforum/urls.py
  90. +1 −1 postinstall
  91. +1 −1 requirements.txt
  92. +1 −1 wsgi.py
View
@@ -8,4 +8,4 @@ venv/
.DS_Store
.coverage
local_settings.py
secret.txt
secret.txt
View
@@ -36,4 +36,4 @@ after_script:
notifications:
email:
on_success: change
on_failure: always
on_failure: always
View
@@ -1,6 +1,22 @@
Contribution Guidelines
=======================
Pedantic Style Guidelines
-------------------------
* End all files in a newline. Exceptions are files where it affects the execution:
* `.txt` files
Tips
----
If you use Sublime Text 2 as an editor, set these two settings to `True` in your default settings:
* `"trim_trailing_white_space_on_save"`
* `"ensure_newline_at_eof_on_save"`
This makes your editor do this automatically with you having to worry about cleaning up your code and making it comply with the Pedantic Style Guidelines(TM).
There is a rub, though: you will have to turn off `"ensure_newline_at_eof_on_save"` when editing the files exempt from the newline rule.
Issues
------
This project is in its infancy, to say the least. Because of this, inundating me with feature suggestions that will have to be implemented six months from now will mainly serve to clutter the Issues, or worse, clog it, rendering it useless.
@@ -19,4 +35,4 @@ I will later create Travis tests that try to strike a balance between catching e
Finally—and Most Important
--------------------------
Please don‘t take it personally, if your suggestion or contribution is rejected. It is incredibly strenuous and time-consuming to manage a project of this magnitude without succumbing to feature creep, design by committee, and people who feel entitled to appropriate the project and make the decisions. Such users are welcome to fork the project and take it in their own direction.
Please don‘t take it personally, if your suggestion or contribution is rejected. It is incredibly strenuous and time-consuming to manage a project of this magnitude without succumbing to feature creep, design by committee, and people who feel entitled to appropriate the project and make the decisions. Such users are welcome to fork the project and take it in their own direction.
View
@@ -175,7 +175,7 @@ dotcloud var unset ponyforum EMAIL_HOST_PASSWORD
Obviously, you need to change the `USER` and `PASSWORD` fields to your own. Also note that if you are using Google's [two-factor authentication][tfa], you default password will not work, because you need to create a designated application password for it [here][app-password]. The reason is that if you use two-factor authentication, you will not use the password for your actual account outside of Google's own sites, but an application password. The advantage of this is that you can remove this application in your Google account settings right away, if you accidentally share it through GitHub or elsewhere.
This is a much better security solution, because it is much easier to shut down a compromised application password by just removing it in your account settings than replacing your general password and playing cat and mouse with any potential hacker, as well as trying to recall your mother's middle name. If you aren't already using two-factor authentication, I urge you to do it to improve your Google and Gmail security significantly. Not because of Pony Forum, but the general security advantages it affods you.
This is a much better security solution, because it is much easier to shut down a compromised application password by just removing it in your account settings than replacing your general password and playing cat and mouse with any potential hacker, as well as trying to recall your mother's middle name. If you aren't already using two-factor authentication, I urge you to do it to improve your Google and Gmail security significantly. Not because of Pony Forum, but the general security advantages it affods you.
After you have changed and saved your new settings in `settings.py`, run the `dotcloud push -A ponyforum --git` command again, and your new settings will be (derp) pushed to your instance. If nothing happens, follow it up with the command `dotcloud restart ponyforum.www`.
@@ -329,4 +329,4 @@ And much, much more.
[+filters]: https://tools.ietf.org/html/rfc3696
[ios-icon]: https://github.com/ndarville/pony-forum/issues/54
[sep-email]: https://twitter.com/mikko/status/231726890933698560
[implicit-pwd]: https://www.schneier.com/blog/archives/2012/07/implicit_passwo.html
[implicit-pwd]: https://www.schneier.com/blog/archives/2012/07/implicit_passwo.html
@@ -82,4 +82,4 @@ That’s it! Feel free to play around with your new forum and check out the [REA
[7-success]: https://github.com/ndarville/pony-forum/raw/master/_installation/screenshots/7-success.png
[readme]: http://ndarville.github.com/pony-forum/
[flavors]: http://docs.dotcloud.com/0.4/guides/flavors/
[tada]: https://github.com/ndarville/pony-forum/raw/master/_screenshots/regular.png
[tada]: https://github.com/ndarville/pony-forum/raw/master/_screenshots/regular.png
@@ -5,9 +5,9 @@
import os
if 'DOTCLOUD_ENVIRONMENT' in os.environ:
import json
from wsgi import *
import json
from wsgi import *
from django.contrib.sites.models import Site
with open('/home/dotcloud/environment.json') as f:
@@ -17,4 +17,4 @@
s = Site.objects.get_current()
s.domain = unicode(env['DOTCLOUD_WWW_HTTP_URL'])
s.name = unicode(name.capitalize())
s.save()
s.save()
View
@@ -16,4 +16,4 @@
u.set_password('password')
u.is_superuser = True
u.is_staff = True
u.save()
u.save()
@@ -35,4 +35,4 @@
content_plain="Play around with the formatting and buttons.",
content_html="<p>Play around with the formatting and buttons.</p>",
creation_date=now)
p.save()
p.save()
@@ -114,4 +114,4 @@ def parse_manuscript(text):
if name == "text.txt":
filepath = os.path.join(root, "text.txt")
with open(filepath) as text:
parse_manuscript(text)
parse_manuscript(text)
View
@@ -3,4 +3,4 @@ www:
config:
python_version: v2.7
db:
type: postgresql
type: postgresql
View
@@ -128,4 +128,4 @@ def admin_restore(self, request, queryset):
# admin.site.register(Post, PostAdmin)
# admin.site.unregister(User)
# admin.site.register(User, CustomUserAdmin)
# admin.site.register(User, CustomUserAdmin)
@@ -32,4 +32,4 @@
"auto_subscribe": true
}
}
]
]
@@ -1,18 +1,18 @@
[
{
"pk": 1,
"model": "forum.category",
"pk": 1,
"model": "forum.category",
"fields": {
"title_html": "Discussions",
"title_html": "Discussions",
"title_plain": "Discussions"
}
},
},
{
"pk": 2,
"model": "forum.category",
"pk": 2,
"model": "forum.category",
"fields": {
"title_html": "The Forum",
"title_html": "The Forum",
"title_plain": "The Forum"
}
}
]
]
Oops, something went wrong.

0 comments on commit bf4a3a9

Please sign in to comment.