[Pkg-privacy-commits] [onionshare] 66/66: Merge remote-tracking branch 'micahlee/master'

[Ulrike Uhlig]

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

u-guest pushed a commit to branch master
in repository onionshare.

commit 261ccdda1fe7d4065dffdb175c5b2fae03dad5e7
Merge: bb5688e 83da767
Author: Ulrike Uhlig <u at 451f.org>
Date:   Thu Apr 14 00:17:08 2016 +0200

    Merge remote-tracking branch 'micahlee/master'

 .gitignore                                        |    1 +
 .travis.yml                                       |   13 +-
 BUILD.md                                          |   63 +-
 CHANGELOG.md                                      |   15 +
 LICENSE                                           |    2 +-
 MANIFEST.in                                       |   10 +-
 README.md                                         |   17 +-
 SECURITY.md                                       |    4 +-
 install/build_deb.sh                              |    4 +-
 install/build_exe.bat                             |    4 +-
 install/build_osx.sh                              |   21 +-
 install/build_rpm.sh                              |    6 +-
 install/license.txt                               |    3 +-
 install/onionshare-launcher.py                    |   30 -
 install/onionshare-win.spec                       |   45 -
 install/onionshare.appdata.xml                    |    3 +-
 install/onionshare.desktop                        |    2 +-
 install/onionshare.nsi                            |  232 +-
 install/osx_scripts/onionshare                    |   30 -
 install/osx_scripts/onionshare-gui                |   21 -
 install/prepare_for_codesign.py                   |   36 -
 install/pyinstaller.spec                          |   59 +
 install/{linux_scripts => scripts}/onionshare     |    4 +-
 install/{linux_scripts => scripts}/onionshare-gui |    4 +-
 locale/it.json                                    |   11 -
 locale/tr.json                                    |   12 -
 onionshare/__init__.py                            |    4 +-
 onionshare/helpers.py                             |  132 +-
 onionshare/hs.py                                  |   37 +-
 onionshare/onionshare.py                          |   43 +-
 onionshare/strings.py                             |   20 +-
 onionshare/web.py                                 |  135 +-
 onionshare_gui/__init__.py                        |    4 +-
 onionshare_gui/common.py                          |   49 -
 onionshare_gui/downloads.py                       |   99 +-
 onionshare_gui/file_selection.py                  |   47 +-
 onionshare_gui/onionshare_gui.py                  |   94 +-
 onionshare_gui/options.py                         |   12 +-
 onionshare_gui/server_status.py                   |   48 +-
 {onionshare => resources/html}/404.html           |    0
 resources/html/denied.html                        |   18 +
 {onionshare => resources/html}/index.html         |    2 +-
 {images => resources/images}/drop_files.png       |  Bin
 {images => resources/images}/logo.png             |  Bin
 {images => resources/images}/server_started.png   |  Bin
 {images => resources/images}/server_stopped.png   |  Bin
 {images => resources/images}/server_working.png   |  Bin
 {locale => resources/locale}/cs.json              |    0
 {locale => resources/locale}/de.json              |    0
 {locale => resources/locale}/en.json              |   10 +-
 {locale => resources/locale}/eo.json              |    0
 {locale => resources/locale}/es.json              |    0
 {locale => resources/locale}/fi.json              |    0
 {locale => resources/locale}/fr.json              |    0
 resources/locale/it.json                          |   45 +
 {locale => resources/locale}/nl.json              |   10 +-
 {locale => resources/locale}/no.json              |    0
 {locale => resources/locale}/pt.json              |    0
 {locale => resources/locale}/ru.json              |    0
 resources/locale/tr.json                          |   45 +
 resources/version.txt                             |    1 +
 resources/wordlist.txt                            | 6800 +++++++++++++++++++++
 screenshots/appdata-client.png                    |  Bin 63246 -> 87558 bytes
 screenshots/appdata-server.png                    |  Bin 114551 -> 107845 bytes
 screenshots/client.png                            |  Bin 61687 -> 90359 bytes
 screenshots/server.png                            |  Bin 37632 -> 65065 bytes
 setup.py                                          |  131 +-
 stdeb.cfg                                         |    9 +-
 test/onionshare_helpers_test.py                   |    4 +-
 test/onionshare_strings_test.py                   |    2 +-
 test/onionshare_test.py                           |    2 +-
 test/onionshare_web_test.py                       |   35 -
 test/test_helpers.py                              |    2 +-
 version                                           |    1 -
 74 files changed, 7657 insertions(+), 836 deletions(-)

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