commit 10dd8522d76dbb020438fc59ca50fe71830aecdf Merge: f266f32 073d5c8 Author: Isis Lovecruft isis@torproject.org Date: Sat Apr 19 16:57:44 2014 +0000
Merge branch 'release-0.2.0'
.travis.yml | 2 +- CHANGELOG | 269 +++++++---- bridgedb.conf | 24 +- doc/sphinx/source/bridgedb.Util.rst | 6 +- doc/sphinx/source/bridgedb.captcha.rst | 2 + doc/sphinx/source/bridgedb.rst | 5 +- doc/sphinx/source/bridgedb.safelog.rst | 9 + doc/sphinx/source/bridgedb.txrecaptcha.rst | 9 + doc/sphinx/source/conf.py | 5 +- doc/sphinx/source/gen_bridge_descriptors.rst | 7 - lib/bridgedb/Bridges.py | 93 ++-- lib/bridgedb/Bucket.py | 104 ++--- lib/bridgedb/Dist.py | 271 ++++------- lib/bridgedb/EmailServer.py | 476 +++++++++----------- lib/bridgedb/HTTPServer.py | 183 +++----- lib/bridgedb/I18n.py | 6 +- lib/bridgedb/Main.py | 280 ++++++------ lib/bridgedb/Stability.py | 204 ++++----- lib/bridgedb/Storage.py | 158 ++++++- lib/bridgedb/Tests.py | 13 +- lib/bridgedb/Util.py | 12 - lib/bridgedb/__init__.py | 2 - lib/bridgedb/_langs.py | 2 + lib/bridgedb/captcha.py | 24 +- lib/bridgedb/crypto.py | 179 ++++++++ lib/bridgedb/parse/addr.py | 185 +++++++- lib/bridgedb/runner.py | 19 +- lib/bridgedb/safelog.py | 197 ++++++++ lib/bridgedb/templates/assets/bootstrap.min.css | 9 - lib/bridgedb/templates/assets/bridgedb.png | Bin 0 -> 2946 bytes .../templates/assets/css/bootstrap.min.css | 7 + lib/bridgedb/templates/assets/css/custom.css | 122 +++++ .../templates/assets/css/font-awesome-ie7.min.css | 384 ++++++++++++++++ .../templates/assets/css/font-awesome.min.css | 403 +++++++++++++++++ lib/bridgedb/templates/assets/css/main.css | 24 + lib/bridgedb/templates/assets/custom.css | 104 ----- .../templates/assets/font/fontawesome-webfont.eot | Bin 0 -> 37405 bytes .../templates/assets/font/fontawesome-webfont.svg | 399 ++++++++++++++++ .../templates/assets/font/fontawesome-webfont.ttf | Bin 0 -> 79076 bytes .../templates/assets/font/fontawesome-webfont.woff | Bin 0 -> 43572 bytes lib/bridgedb/templates/assets/font/lato-bold.woff | Bin 0 -> 46160 bytes .../templates/assets/font/lato-italic.woff | Bin 0 -> 47168 bytes .../templates/assets/font/lato-regular.woff | Bin 0 -> 46108 bytes lib/bridgedb/templates/assets/tor-roots-blue.svg | 95 ++++ lib/bridgedb/templates/base.html | 76 ++-- lib/bridgedb/templates/bridges.html | 89 +++- lib/bridgedb/templates/captcha.html | 71 ++- lib/bridgedb/templates/howto.html | 47 ++ lib/bridgedb/templates/index.html | 33 +- lib/bridgedb/templates/options.html | 198 ++++++-- lib/bridgedb/templates/static/bridgedb.asc | 274 +++++++++++ lib/bridgedb/test/test_EmailServer.py | 250 +++++++++- lib/bridgedb/test/test_HTTPServer.py | 104 +++-- lib/bridgedb/test/test_Storage.py | 56 +++ lib/bridgedb/test/test_bridgedb.py | 41 +- lib/bridgedb/test/test_captcha.py | 104 ++++- lib/bridgedb/test/test_safelog.py | 336 ++++++++++++++ lib/bridgedb/test/test_translations.py | 78 ++++ lib/bridgedb/translations.py | 122 +++++ lib/bridgedb/util.py | 207 +++++++++ setup.py | 10 +- 61 files changed, 5050 insertions(+), 1339 deletions(-)