[Pkg-privacy-commits] [onionshare] 73/256: Merge branch 'master' of https://github.com/micahflee/onionshare

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to branch master
in repository onionshare.

commit ebdc92bfa7ef629f1a0c2ece343bf6ee04a0c5b0
Merge: 51f538e 12acb89
Author: Ulrike Uhlig <u at 451f.org>
Date:   Wed Jan 18 20:50:03 2017 +0100

    Merge branch 'master' of https://github.com/micahflee/onionshare

 BUILD.md                                           |  78 ++--
 README.md                                          |  20 +-
 {install/scripts => dev_scripts}/onionshare        |   8 +-
 {install/scripts => dev_scripts}/onionshare-gui    |   8 +-
 install/scripts/onionshare                         |   2 +-
 install/scripts/onionshare-gui                     |   2 +-
 onionshare/__init__.py                             | 195 ++++++++-
 onionshare/helpers.py                              |  22 +-
 onionshare/onion.py                                | 219 ++++++++--
 onionshare/onionshare.py                           | 190 ---------
 onionshare/settings.py                             |  85 ++++
 onionshare/strings.py                              |   2 +-
 onionshare/web.py                                  |  31 +-
 onionshare_gui/__init__.py                         | 445 ++++++++++++++++++++-
 .../alert.py                                       |  23 +-
 onionshare_gui/downloads.py                        |  20 +-
 onionshare_gui/file_selection.py                   |   2 +-
 onionshare_gui/menu.py                             |  49 +++
 onionshare_gui/onionshare_gui.py                   | 371 -----------------
 onionshare_gui/options.py                          |  53 ++-
 onionshare_gui/server_status.py                    |  21 +-
 onionshare_gui/settings_dialog.py                  | 260 ++++++++++++
 resources/license.txt                              |   2 +-
 resources/locale/cs.json                           |   4 +-
 resources/locale/en.json                           |  43 +-
 resources/locale/eo.json                           |   3 +-
 resources/locale/fi.json                           |   3 +-
 resources/locale/it.json                           |   5 +-
 resources/locale/nl.json                           |   3 +-
 resources/locale/tr.json                           |   3 +-
 setup.py                                           |   2 +-
 test/onionshare_helpers_test.py                    |   2 +-
 test/onionshare_strings_test.py                    |   2 +-
 test/onionshare_test.py                            |   2 +-
 test/test_helpers.py                               |   2 +-
 35 files changed, 1467 insertions(+), 715 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git