diff options
| author | Micah Lee <micah@micahflee.com> | 2021-02-22 13:50:04 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 13:50:04 -0800 |
| commit | dfaa55d2a40edfb892e123f370f5d22b79e33d04 (patch) | |
| tree | 9b2a9fc5e557b49b99c63700f9e1fa0b589790e5 | |
| parent | ee20c648c669a0a4b2781eb5ee89f7bc03d25a6b (diff) | |
| parent | 450bfcfe984734f2dbdbd84be93045ade24b46b1 (diff) | |
| download | onionshare-2.3.1.tar.gz onionshare-2.3.1.zip | |
Merge pull request #1288 from micahflee/version-2.3.1v2.3.1
Version 2.3.1
66 files changed, 82 insertions, 73 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c64fee9e..475fc552 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # OnionShare Changelog +## 2.3.1 + +* Bugfix: Fix chat mode +* Bugfix: Fix --persistent in onionshare-cli +* Bugfix: Fix checking for updates in Windows and macOS + ## 2.3 * Major new feature: Multiple tabs, including better support for persistent services, faster Tor connections @@ -1,7 +1,7 @@ (Note: Third-party licenses can be found under install/licenses/.) OnionShare -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/cli/onionshare_cli/__init__.py b/cli/onionshare_cli/__init__.py index 72212760..092e716a 100644 --- a/cli/onionshare_cli/__init__.py +++ b/cli/onionshare_cli/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -293,7 +293,11 @@ def main(cwd=None): if mode == "share" or mode == "website": # Unless you passed in a persistent filename, in which case get the filenames from # the mode settings - if persistent_filename and not mode_settings.just_created and len(filenames) != 0: + if ( + persistent_filename + and not mode_settings.just_created + and len(filenames) != 0 + ): filenames = mode_settings.get(mode, "filenames") else: @@ -321,7 +325,6 @@ def main(cwd=None): if persistent_filename: mode_settings.set(mode, "filenames", filenames) - # Create the Web object web = Web(common, False, mode_settings, mode) diff --git a/cli/onionshare_cli/common.py b/cli/onionshare_cli/common.py index e8b174b6..6e36dbd6 100644 --- a/cli/onionshare_cli/common.py +++ b/cli/onionshare_cli/common.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/mode_settings.py b/cli/onionshare_cli/mode_settings.py index 4e3a27ab..4f105653 100644 --- a/cli/onionshare_cli/mode_settings.py +++ b/cli/onionshare_cli/mode_settings.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py index 7c9d0a67..aab2e1ff 100644 --- a/cli/onionshare_cli/onion.py +++ b/cli/onionshare_cli/onion.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/onionshare.py b/cli/onionshare_cli/onionshare.py index db15a03d..30eae3f3 100644 --- a/cli/onionshare_cli/onionshare.py +++ b/cli/onionshare_cli/onionshare.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/resources/version.txt b/cli/onionshare_cli/resources/version.txt index c0943d3e..a6254504 100644 --- a/cli/onionshare_cli/resources/version.txt +++ b/cli/onionshare_cli/resources/version.txt @@ -1 +1 @@ -2.3
\ No newline at end of file +2.3.1
\ No newline at end of file diff --git a/cli/onionshare_cli/settings.py b/cli/onionshare_cli/settings.py index 00dde00c..a655d46c 100644 --- a/cli/onionshare_cli/settings.py +++ b/cli/onionshare_cli/settings.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/__init__.py b/cli/onionshare_cli/web/__init__.py index f036d011..3c7f4a51 100644 --- a/cli/onionshare_cli/web/__init__.py +++ b/cli/onionshare_cli/web/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/chat_mode.py b/cli/onionshare_cli/web/chat_mode.py index 03843ee8..d4c57438 100644 --- a/cli/onionshare_cli/web/chat_mode.py +++ b/cli/onionshare_cli/web/chat_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/receive_mode.py b/cli/onionshare_cli/web/receive_mode.py index a0da0d3c..62415578 100644 --- a/cli/onionshare_cli/web/receive_mode.py +++ b/cli/onionshare_cli/web/receive_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/send_base_mode.py b/cli/onionshare_cli/web/send_base_mode.py index ad4459fe..b09fc4c6 100644 --- a/cli/onionshare_cli/web/send_base_mode.py +++ b/cli/onionshare_cli/web/send_base_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -265,8 +265,8 @@ class SendBaseModeWeb: r.headers.set("Content-Encoding", "gzip") r.headers.set("Content-Length", filesize) filename_dict = { - 'filename': unidecode(basename), - 'filename*': "UTF-8''%s" % url_quote(basename) + "filename": unidecode(basename), + "filename*": "UTF-8''%s" % url_quote(basename), } r.headers.set("Content-Disposition", "inline", **filename_dict) r = self.web.add_security_headers(r) diff --git a/cli/onionshare_cli/web/share_mode.py b/cli/onionshare_cli/web/share_mode.py index 821f4978..72ba8c64 100644 --- a/cli/onionshare_cli/web/share_mode.py +++ b/cli/onionshare_cli/web/share_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/web.py b/cli/onionshare_cli/web/web.py index 010df3eb..6f4986e7 100644 --- a/cli/onionshare_cli/web/web.py +++ b/cli/onionshare_cli/web/web.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/onionshare_cli/web/website_mode.py b/cli/onionshare_cli/web/website_mode.py index 352f4f3c..fa8b53bd 100644 --- a/cli/onionshare_cli/web/website_mode.py +++ b/cli/onionshare_cli/web/website_mode.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/cli/pyproject.toml b/cli/pyproject.toml index 2843d0bb..e393a8c5 100644 --- a/cli/pyproject.toml +++ b/cli/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "onionshare_cli" -version = "2.3" +version = "2.3.1" description = "OnionShare lets you securely and anonymously send and receive files. It works by starting a web server, making it accessible as a Tor onion service, and generating an unguessable web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service." authors = ["Micah Lee <micah@micahflee.com>"] license = "GPLv3+" diff --git a/cli/setup.py b/cli/setup.py index fa597408..90f7ddbc 100644 --- a/cli/setup.py +++ b/cli/setup.py @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. import os import setuptools -version = "2.3" +version = "2.3.1" setuptools.setup( name="onionshare-cli", diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml index a715e9ee..de52b2cd 100644 --- a/desktop/pyproject.toml +++ b/desktop/pyproject.toml @@ -1,7 +1,7 @@ [tool.briefcase] project_name = "OnionShare" bundle = "org.onionshare" -version = "2.3" +version = "2.3.1" url = "https://onionshare.org" license = "GPLv3" author = 'Micah Lee' @@ -13,7 +13,7 @@ description = "Securely and anonymously share files, host websites, and chat wit icon = "src/onionshare/resources/onionshare" sources = ['src/onionshare'] requires = [ - "./onionshare_cli-2.3-py3-none-any.whl", + "./onionshare_cli-2.3.1-py3-none-any.whl", "pyside2==5.15.1", "qrcode" ] diff --git a/desktop/scripts/get-tor-osx.py b/desktop/scripts/get-tor-osx.py index 5cdc72b8..bf0cb5bc 100755 --- a/desktop/scripts/get-tor-osx.py +++ b/desktop/scripts/get-tor-osx.py @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/scripts/get-tor-windows.py b/desktop/scripts/get-tor-windows.py index d08ca30f..9cb8898c 100644 --- a/desktop/scripts/get-tor-windows.py +++ b/desktop/scripts/get-tor-windows.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/__init__.py b/desktop/src/onionshare/__init__.py index b1275a90..744f6979 100644 --- a/desktop/src/onionshare/__init__.py +++ b/desktop/src/onionshare/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/__main__.py b/desktop/src/onionshare/__main__.py index 7b087670..3a7f3554 100644 --- a/desktop/src/onionshare/__main__.py +++ b/desktop/src/onionshare/__main__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py index 16e0e6f5..cd576ea2 100644 --- a/desktop/src/onionshare/gui_common.py +++ b/desktop/src/onionshare/gui_common.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/main_window.py b/desktop/src/onionshare/main_window.py index f4f333d9..2f6e91d0 100644 --- a/desktop/src/onionshare/main_window.py +++ b/desktop/src/onionshare/main_window.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/settings_dialog.py b/desktop/src/onionshare/settings_dialog.py index 5aea64b9..3f913bcd 100644 --- a/desktop/src/onionshare/settings_dialog.py +++ b/desktop/src/onionshare/settings_dialog.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/strings.py b/desktop/src/onionshare/strings.py index ce9207da..a3db202c 100644 --- a/desktop/src/onionshare/strings.py +++ b/desktop/src/onionshare/strings.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/__init__.py b/desktop/src/onionshare/tab/__init__.py index 162d13aa..62ec4a74 100644 --- a/desktop/src/onionshare/tab/__init__.py +++ b/desktop/src/onionshare/tab/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/mode/__init__.py b/desktop/src/onionshare/tab/mode/__init__.py index c48f20c0..0cbccc51 100644 --- a/desktop/src/onionshare/tab/mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py index 440a97c5..2312a64e 100644 --- a/desktop/src/onionshare/tab/mode/chat_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/chat_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/mode/file_selection.py b/desktop/src/onionshare/tab/mode/file_selection.py index fed4e4c5..e9604ec5 100644 --- a/desktop/src/onionshare/tab/mode/file_selection.py +++ b/desktop/src/onionshare/tab/mode/file_selection.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/mode/history.py b/desktop/src/onionshare/tab/mode/history.py index 3e9c0571..45e37c75 100644 --- a/desktop/src/onionshare/tab/mode/history.py +++ b/desktop/src/onionshare/tab/mode/history.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/mode/mode_settings_widget.py b/desktop/src/onionshare/tab/mode/mode_settings_widget.py index 39226540..a3a315c9 100644 --- a/desktop/src/onionshare/tab/mode/mode_settings_widget.py +++ b/desktop/src/onionshare/tab/mode/mode_settings_widget.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py index b54c1168..8a848128 100644 --- a/desktop/src/onionshare/tab/mode/receive_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/receive_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/mode/share_mode/__init__.py b/desktop/src/onionshare/tab/mode/share_mode/__init__.py index b9e01f5d..74a4e2c2 100644 --- a/desktop/src/onionshare/tab/mode/share_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/share_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/mode/share_mode/threads.py b/desktop/src/onionshare/tab/mode/share_mode/threads.py index 860c2d26..6f5c44ea 100644 --- a/desktop/src/onionshare/tab/mode/share_mode/threads.py +++ b/desktop/src/onionshare/tab/mode/share_mode/threads.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/mode/website_mode/__init__.py b/desktop/src/onionshare/tab/mode/website_mode/__init__.py index 0c323b1c..6aa83de0 100644 --- a/desktop/src/onionshare/tab/mode/website_mode/__init__.py +++ b/desktop/src/onionshare/tab/mode/website_mode/__init__.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/server_status.py b/desktop/src/onionshare/tab/server_status.py index 42f60cd3..8c1c9655 100644 --- a/desktop/src/onionshare/tab/server_status.py +++ b/desktop/src/onionshare/tab/server_status.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab/tab.py b/desktop/src/onionshare/tab/tab.py index aea81e82..2d4e164c 100644 --- a/desktop/src/onionshare/tab/tab.py +++ b/desktop/src/onionshare/tab/tab.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tab_widget.py b/desktop/src/onionshare/tab_widget.py index b78e67dd..b9a70011 100644 --- a/desktop/src/onionshare/tab_widget.py +++ b/desktop/src/onionshare/tab_widget.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/threads.py b/desktop/src/onionshare/threads.py index 0c31a838..214344f7 100644 --- a/desktop/src/onionshare/threads.py +++ b/desktop/src/onionshare/threads.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/tor_connection_dialog.py b/desktop/src/onionshare/tor_connection_dialog.py index a9201aed..c3644f8b 100644 --- a/desktop/src/onionshare/tor_connection_dialog.py +++ b/desktop/src/onionshare/tor_connection_dialog.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/update_checker.py b/desktop/src/onionshare/update_checker.py index be7a5e01..1d8e8b07 100644 --- a/desktop/src/onionshare/update_checker.py +++ b/desktop/src/onionshare/update_checker.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/onionshare/widgets.py b/desktop/src/onionshare/widgets.py index 68642f28..a1880a2e 100644 --- a/desktop/src/onionshare/widgets.py +++ b/desktop/src/onionshare/widgets.py @@ -2,7 +2,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/desktop/src/org.onionshare.OnionShare.appdata.xml b/desktop/src/org.onionshare.OnionShare.appdata.xml index d18a8391..3cee6454 100644 --- a/desktop/src/org.onionshare.OnionShare.appdata.xml +++ b/desktop/src/org.onionshare.OnionShare.appdata.xml @@ -24,6 +24,6 @@ <update_contact>micah@micahflee.com</update_contact> <content_rating type="oars-1.1" /> <releases> - <release type="development" date="2021-02-21" version="2.3" /> + <release type="development" date="2021-02-22" version="2.3.1" /> </releases> </component> diff --git a/desktop/src/setup.py b/desktop/src/setup.py index d2b4f4cd..83aeeba1 100644 --- a/desktop/src/setup.py +++ b/desktop/src/setup.py @@ -3,7 +3,7 @@ """ OnionShare | https://onionshare.org/ -Copyright (C) 2014-2020 Micah Lee, et al. <micah@micahflee.com> +Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. import os import setuptools -version = "2.3" +version = "2.3.1" setuptools.setup( name="onionshare", diff --git a/docs/gettext/.doctrees/advanced.doctree b/docs/gettext/.doctrees/advanced.doctree Binary files differindex 53676cae..541f678b 100644 --- a/docs/gettext/.doctrees/advanced.doctree +++ b/docs/gettext/.doctrees/advanced.doctree diff --git a/docs/gettext/.doctrees/develop.doctree b/docs/gettext/.doctrees/develop.doctree Binary files differindex 453c9486..cdfb3740 100644 --- a/docs/gettext/.doctrees/develop.doctree +++ b/docs/gettext/.doctrees/develop.doctree diff --git a/docs/gettext/.doctrees/environment.pickle b/docs/gettext/.doctrees/environment.pickle Binary files differindex d0ad486d..18925998 100644 --- a/docs/gettext/.doctrees/environment.pickle +++ b/docs/gettext/.doctrees/environment.pickle diff --git a/docs/gettext/.doctrees/features.doctree b/docs/gettext/.doctrees/features.doctree Binary files differindex 131ab7a5..00f3b7e3 100644 --- a/docs/gettext/.doctrees/features.doctree +++ b/docs/gettext/.doctrees/features.doctree diff --git a/docs/gettext/.doctrees/help.doctree b/docs/gettext/.doctrees/help.doctree Binary files differindex 91d185a4..2d3824db 100644 --- a/docs/gettext/.doctrees/help.doctree +++ b/docs/gettext/.doctrees/help.doctree diff --git a/docs/gettext/.doctrees/index.doctree b/docs/gettext/.doctrees/index.doctree Binary files differindex 63745f21..0d526d53 100644 --- a/docs/gettext/.doctrees/index.doctree +++ b/docs/gettext/.doctrees/index.doctree diff --git a/docs/gettext/.doctrees/install.doctree b/docs/gettext/.doctrees/install.doctree Binary files differindex 0e9c5b18..c0fd77ae 100644 --- a/docs/gettext/.doctrees/install.doctree +++ b/docs/gettext/.doctrees/install.doctree diff --git a/docs/gettext/.doctrees/security.doctree b/docs/gettext/.doctrees/security.doctree Binary files differindex a7ae88a4..cd1dea98 100644 --- a/docs/gettext/.doctrees/security.doctree +++ b/docs/gettext/.doctrees/security.doctree diff --git a/docs/gettext/.doctrees/tor.doctree b/docs/gettext/.doctrees/tor.doctree Binary files differindex c8c4a576..31cd3b36 100644 --- a/docs/gettext/.doctrees/tor.doctree +++ b/docs/gettext/.doctrees/tor.doctree diff --git a/docs/gettext/advanced.pot b/docs/gettext/advanced.pot index ddfbce46..53f27186 100644 --- a/docs/gettext/advanced.pot +++ b/docs/gettext/advanced.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OnionShare 2.3\n" +"Project-Id-Version: OnionShare 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-15 15:19-0800\n" +"POT-Creation-Date: 2021-02-22 13:40-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/docs/gettext/develop.pot b/docs/gettext/develop.pot index 1561aed9..0f2bdc5e 100644 --- a/docs/gettext/develop.pot +++ b/docs/gettext/develop.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OnionShare 2.3\n" +"Project-Id-Version: OnionShare 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-15 15:19-0800\n" +"POT-Creation-Date: 2021-02-22 13:40-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/docs/gettext/features.pot b/docs/gettext/features.pot index e4f993ae..874d62b6 100644 --- a/docs/gettext/features.pot +++ b/docs/gettext/features.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OnionShare 2.3\n" +"Project-Id-Version: OnionShare 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-15 15:19-0800\n" +"POT-Creation-Date: 2021-02-22 13:40-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/docs/gettext/help.pot b/docs/gettext/help.pot index fde23966..0bcb7c10 100644 --- a/docs/gettext/help.pot +++ b/docs/gettext/help.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OnionShare 2.3\n" +"Project-Id-Version: OnionShare 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-15 15:19-0800\n" +"POT-Creation-Date: 2021-02-22 13:40-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/docs/gettext/index.pot b/docs/gettext/index.pot index 11e33b7c..f15290ec 100644 --- a/docs/gettext/index.pot +++ b/docs/gettext/index.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OnionShare 2.3\n" +"Project-Id-Version: OnionShare 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-15 15:19-0800\n" +"POT-Creation-Date: 2021-02-22 13:40-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/docs/gettext/install.pot b/docs/gettext/install.pot index 214bc5ea..d7496af0 100644 --- a/docs/gettext/install.pot +++ b/docs/gettext/install.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OnionShare 2.3\n" +"Project-Id-Version: OnionShare 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-15 15:19-0800\n" +"POT-Creation-Date: 2021-02-22 13:40-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/docs/gettext/security.pot b/docs/gettext/security.pot index ea9c7b19..3a286e6d 100644 --- a/docs/gettext/security.pot +++ b/docs/gettext/security.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OnionShare 2.3\n" +"Project-Id-Version: OnionShare 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-15 15:19-0800\n" +"POT-Creation-Date: 2021-02-22 13:40-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/docs/gettext/sphinx.pot b/docs/gettext/sphinx.pot index f7c33926..cf0dfece 100644 --- a/docs/gettext/sphinx.pot +++ b/docs/gettext/sphinx.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OnionShare 2.3\n" +"Project-Id-Version: OnionShare 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-15 15:19-0800\n" +"POT-Creation-Date: 2021-02-22 13:40-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/docs/gettext/tor.pot b/docs/gettext/tor.pot index e4d551e0..b357ad06 100644 --- a/docs/gettext/tor.pot +++ b/docs/gettext/tor.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: OnionShare 2.3\n" +"Project-Id-Version: OnionShare 2.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-02-15 15:19-0800\n" +"POT-Creation-Date: 2021-02-22 13:40-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/docs/source/conf.py b/docs/source/conf.py index 5ee45ac1..18a58d80 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -4,7 +4,7 @@ import sphinx_intl project = "OnionShare" author = copyright = "Micah Lee, et al." -version = release = "2.3" +version = release = "2.3.1" extensions = ["sphinx_rtd_theme"] templates_path = ["_templates"] @@ -19,7 +19,7 @@ languages = [ ("Українська", "uk"), # Ukranian ] -versions = ["2.3"] +versions = ["2.3", "2.3.1"] html_theme = "sphinx_rtd_theme" html_logo = "_static/logo.png" diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 13ab9bb3..00682777 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: onionshare base: core18 -version: '2.3' +version: '2.3.1' summary: Securely and anonymously share files, host websites, and chat using Tor description: | OnionShare lets you securely and anonymously send and receive files. It works by starting |