commit cb8b01bc70e6a9ff47d76d393bd1752cacc91e2e Merge: b7cd297 136ff6c Author: Isis Lovecruft isis@torproject.org Date: Fri Jun 6 23:37:49 2014 +0000
Merge branch 'release-0.2.2'
.travis.requirements.txt | 9 + .travis.yml | 43 +- CHANGELOG | 134 ++++ bridgedb.conf | 2 +- doc/sphinx/source/bridgedb.EmailServer.rst | 8 - doc/sphinx/source/bridgedb.email.autoresponder.rst | 8 + doc/sphinx/source/bridgedb.email.dkim.rst | 8 + doc/sphinx/source/bridgedb.email.request.rst | 8 + doc/sphinx/source/bridgedb.email.server.rst | 8 + doc/sphinx/source/bridgedb.email.templates.rst | 8 + doc/sphinx/source/bridgedb.rst | 7 +- doc/sphinx/source/conf.py | 7 +- lib/bridgedb/HTTPServer.py | 5 +- lib/bridgedb/email/__init__.py | 1 + lib/bridgedb/email/autoresponder.py | 646 +++++++++++++++ lib/bridgedb/email/dkim.py | 55 ++ lib/bridgedb/email/server.py | 827 ++++++------------- lib/bridgedb/email/templates.py | 11 +- lib/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 371 +++++++-- lib/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 350 ++++++-- lib/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 9 +- lib/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 340 ++++++-- lib/bridgedb/i18n/fr_CA/LC_MESSAGES/bridgedb.po | 334 ++++++-- lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 345 ++++++-- lib/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 337 ++++++-- lib/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 104 +++ lib/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 341 ++++++-- lib/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 340 ++++++-- lib/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 339 ++++++-- lib/bridgedb/i18n/templates/bridgedb.pot | 126 +-- lib/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 8 +- lib/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 337 ++++++-- lib/bridgedb/strings.py | 24 + lib/bridgedb/templates/bridges.html | 4 +- lib/bridgedb/templates/options.html | 1 - lib/bridgedb/test/email_helpers.py | 160 ++++ lib/bridgedb/test/test_email_autoresponder.py | 562 +++++++++++++ lib/bridgedb/test/test_email_dkim.py | 86 ++ lib/bridgedb/test/test_email_server.py | 845 +++++++++++--------- lib/bridgedb/test/util.py | 10 + requirements.txt | 4 +- scripts/make-ssl-cert | 54 +- setup.py | 2 +- 43 files changed, 5645 insertions(+), 1583 deletions(-)