[Pkg-privacy-commits] [onionshare] 256/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 2d2f2429b90b570eaaf377db6b9df4844ad7db72
Merge: eece964 d25c6d9
Author: Ulrike Uhlig <u at 451f.org>
Date:   Fri May 26 13:28:15 2017 +0200

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

 .travis.yml                                        |   4 +
 BUILD.md                                           |  63 ++-
 CHANGELOG.md                                       |  20 +
 README.md                                          |  26 +-
 SECURITY.md                                        |  25 --
 install/build_deb.sh                               |   8 +-
 install/build_exe.bat                              |  16 +-
 install/build_osx.sh                               |  14 +-
 install/build_rpm.sh                               |   4 +-
 install/get-tor-osx.py                             |  92 +++++
 install/get-tor-windows.py                         |  78 ++++
 install/onionshare.nsi                             | 346 +++++++++++-----
 install/ppa_release.sh                             |   2 +-
 install/pyinstaller.spec                           |  63 +++
 install/requirements-windows.txt                   |  14 +
 install/requirements.txt                           |  11 +
 install/scripts/onionshare-pyinstaller             |  44 +++
 onionshare/__init__.py                             | 159 ++------
 onionshare/{helpers.py => common.py}               |  81 +++-
 onionshare/onion.py                                | 400 ++++++++++---------
 onionshare/onionshare.py                           |  85 ++++
 onionshare/settings.py                             |  48 ++-
 onionshare/strings.py                              |  11 +-
 onionshare/web.py                                  | 111 +++---
 onionshare_gui/__init__.py                         | 409 ++-----------------
 onionshare_gui/alert.py                            |  13 +-
 onionshare_gui/downloads.py                        |  10 +-
 onionshare_gui/file_selection.py                   |  55 ++-
 onionshare_gui/menu.py                             |  49 ---
 onionshare_gui/{__init__.py => onionshare_gui.py}  | 351 +++++++++--------
 onionshare_gui/options.py                          |  98 -----
 onionshare_gui/server_status.py                    |   8 +-
 onionshare_gui/settings_dialog.py                  | 433 ++++++++++++++++++---
 onionshare_gui/tor_connection_dialog.py            | 146 +++++++
 onionshare_gui/update_checker.py                   | 176 +++++++++
 resources/locale/cs.json                           |  47 ---
 resources/locale/eo.json                           |  46 ---
 resources/locale/nl.json                           |  46 ---
 resources/version.txt                              |   1 -
 setup.py                                           | 123 +-----
 {resources => share}/html/404.html                 |   0
 {resources => share}/html/denied.html              |   0
 {resources => share}/html/index.html               |  13 +-
 {resources => share}/images/drop_files.png         | Bin
 {resources => share}/images/logo.png               | Bin
 share/images/logo_grayscale.png                    | Bin 0 -> 2258 bytes
 {resources => share}/images/server_started.png     | Bin
 {resources => share}/images/server_stopped.png     | Bin
 {resources => share}/images/server_working.png     | Bin
 share/images/settings.png                          | Bin 0 -> 411 bytes
 {resources => share}/license.txt                   |   0
 share/locale/cs.json                               |  84 ++++
 {resources => share}/locale/de.json                |   1 -
 {resources => share}/locale/en.json                |  56 ++-
 share/locale/eo.json                               |  84 ++++
 {resources => share}/locale/es.json                |   1 -
 {resources => share}/locale/fi.json                |   1 -
 {resources => share}/locale/fr.json                |   5 +-
 {resources => share}/locale/it.json                |   1 -
 share/locale/nl.json                               |  84 ++++
 {resources => share}/locale/no.json                |   3 +-
 {resources => share}/locale/pt.json                |   3 +-
 {resources => share}/locale/ru.json                |   1 -
 {resources => share}/locale/tr.json                |   1 -
 share/torrc_template                               |   9 +
 share/torrc_template-windows                       |   9 +
 share/version.txt                                  |   1 +
 {resources => share}/wordlist.txt                  |   0
 stdeb.cfg                                          |   5 +-
 ...e_helpers_test.py => onionshare_common_test.py} |  18 +-
 test/onionshare_strings_test.py                    |  10 +-
 test/onionshare_test.py                            |  17 -
 72 files changed, 2526 insertions(+), 1617 deletions(-)

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