[tor-commits] [bridgedb/master] Merge branch 'fix/10803-remove-vidalia-update-options' into develop

isis at torproject.org isis at torproject.org
Sat Apr 19 17:02:43 UTC 2014


commit 42e83f5843bf02fe971a7ca74f85eb49f5d50214
Merge: ebf301d 6c5c358
Author: Isis Lovecruft <isis at torproject.org>
Date:   Mon Apr 14 19:36:40 2014 +0000

    Merge branch 'fix/10803-remove-vidalia-update-options' into develop

 lib/bridgedb/HTTPServer.py                         |   26 ++
 lib/bridgedb/templates/assets/bootstrap.min.css    |    9 -
 .../templates/assets/css/bootstrap.min.css         |    7 +
 lib/bridgedb/templates/assets/css/custom.css       |  104 +++++
 .../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                   |   69 ++--
 lib/bridgedb/templates/bridges.html                |   92 ++++-
 lib/bridgedb/templates/captcha.html                |   79 +++-
 lib/bridgedb/templates/howto.html                  |   47 +++
 lib/bridgedb/templates/index.html                  |   33 +-
 lib/bridgedb/templates/options.html                |  198 ++++++++--
 lib/bridgedb/test/test_HTTPServer.py               |   23 +-
 setup.py                                           |    8 +-
 24 files changed, 1855 insertions(+), 249 deletions(-)





More information about the tor-commits mailing list