diff options
author | Micah Lee <micah@micahflee.com> | 2021-06-01 16:27:08 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-01 16:27:08 -0700 |
commit | f1135b32816ec19d2e23c5105a0a8f5006a1cfba (patch) | |
tree | 6af698f96fcc59f1c7868d552e104db8c1e2aaaa | |
parent | ead2825327e0e65f834b49cc438dc4f6b2a63c43 (diff) | |
parent | 1599ff06c887c38b933dc336d0579b1616843709 (diff) | |
download | onionshare-f1135b32816ec19d2e23c5105a0a8f5006a1cfba.tar.gz onionshare-f1135b32816ec19d2e23c5105a0a8f5006a1cfba.zip |
Merge pull request #1372 from micahflee/version-2.3.2v2.3.2
Version 2.3.2
25 files changed, 31 insertions, 21 deletions
@@ -14,7 +14,7 @@ Before making a release, you must update the version in these places: - [ ] `docs/source/conf.py` (`version` at the top, and the `versions` list too) - [ ] `snap/snapcraft.yaml` -If you update flask-socketio, ensure that you also update the [socket.io.min.js](https://github.com/micahflee/onionshare/blob/develop/cli/onionshare_cli/resources/static/js/socket.io.min.js) file to a version that is [supported](https://flask-socketio.readthedocs.io/en/latest/#version-compatibility) by the updated version of flask-socketio. +If you update `flask-socketio`, ensure that you also update the [socket.io.min.js](https://github.com/micahflee/onionshare/blob/develop/cli/onionshare_cli/resources/static/js/socket.io.min.js) file to a version that is [supported](https://flask-socketio.readthedocs.io/en/latest/#version-compatibility) by the updated version of `flask-socketio`. Use tor binaries from the latest Tor Browser: @@ -28,6 +28,7 @@ Update the documentation: Finalize localization: - [ ] Merge all the translations from weblate +- [ ] In `docs` run `poetry run ./check-weblate.py [API_KEY]` to see which translations are >90% in the app and docs - [ ] Edit `cli/onionshare_cli/settings.py`, make sure `self.available_locales` lists only locales that are >90% translated - [ ] Edit `docs/source/conf.py`, make sure `languages` lists only languages that are >90% translated - [ ] Edit `docs/build.sh` and make sure `LOCALES=` lists the same languages as above, in `docs/source/conf.py` diff --git a/cli/onionshare_cli/resources/version.txt b/cli/onionshare_cli/resources/version.txt index 4ba9db07..e7034819 100644 --- a/cli/onionshare_cli/resources/version.txt +++ b/cli/onionshare_cli/resources/version.txt @@ -1 +1 @@ -2.3.2.dev1
\ No newline at end of file +2.3.2
\ No newline at end of file diff --git a/desktop/README.md b/desktop/README.md index 97d0fd30..eb91e315 100644 --- a/desktop/README.md +++ b/desktop/README.md @@ -15,6 +15,8 @@ cd onionshare/desktop If you're using Linux, install `tor` and `obfs4proxy` from either the [official Debian repository](https://support.torproject.org/apt/tor-deb-repo/), or from your package manager. +In Ubuntu 20.04 you also need the `libxcb-xinerama0` package installed. + #### macOS Download and install Python 3.8.6 from https://www.python.org/downloads/release/python-386/. I downloaded `python-3.8.6-macosx10.9.pkg`. (You may need to also run `/Applications/Python\ 3.8/Install\ Certificates.command`.) diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml index 3b31a1bd..a39aa94d 100644 --- a/desktop/pyproject.toml +++ b/desktop/pyproject.toml @@ -1,7 +1,7 @@ [tool.briefcase] project_name = "OnionShare" bundle = "org.onionshare" -version = "2.3.2.dev1" +version = "2.3.2" url = "https://onionshare.org" license = "GPLv3" author = 'Micah Lee' diff --git a/desktop/src/org.onionshare.OnionShare.appdata.xml b/desktop/src/org.onionshare.OnionShare.appdata.xml index 049609ee..5ae702ff 100644 --- a/desktop/src/org.onionshare.OnionShare.appdata.xml +++ b/desktop/src/org.onionshare.OnionShare.appdata.xml @@ -13,7 +13,7 @@ <launchable type="desktop-id">org.onionshare.OnionShare.desktop</launchable> <screenshots> <screenshot type="default"> - <image>https://raw.githubusercontent.com/micahflee/onionshare/master/docs/source/_static/screenshots/tabs.png</image> + <image>https://docs.onionshare.org/2.3.2/en/_images/tabs.png</image> <caption>Types of services that OnionShare supports</caption> </screenshot> </screenshots> @@ -24,6 +24,6 @@ <update_contact>micah@micahflee.com</update_contact> <content_rating type="oars-1.1" /> <releases> - <release type="development" date="2021-05-04" version="2.3.2" /> + <release type="development" date="2021-05-31" version="2.3.2" /> </releases> </component> diff --git a/desktop/src/setup.py b/desktop/src/setup.py index 82a5f98a..060fa93c 100644 --- a/desktop/src/setup.py +++ b/desktop/src/setup.py @@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ import setuptools -version = "2.3.1" +version = "2.3.2" setuptools.setup( name="onionshare", diff --git a/docs/gettext/.doctrees/advanced.doctree b/docs/gettext/.doctrees/advanced.doctree Binary files differindex 0b23bda0..29e035cc 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 45a2d587..5a17cbfd 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 ba79cd05..4263632b 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 9411a3a0..00a9a3ba 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 bfb05b4f..d5c54b91 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 0907fdee..173f9f45 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 6c9b9ade..2c4cbb22 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 48200490..ed5e9f68 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 332a20d0..8bbdadd5 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 ecb4bcc9..78bc92ca 100644 --- a/docs/gettext/advanced.pot +++ b/docs/gettext/advanced.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\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 3822530c..57cfdb8e 100644 --- a/docs/gettext/develop.pot +++ b/docs/gettext/develop.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\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 0ca234b0..32470e11 100644 --- a/docs/gettext/features.pot +++ b/docs/gettext/features.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\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 c2172a2f..6081589d 100644 --- a/docs/gettext/help.pot +++ b/docs/gettext/help.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\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 dbabad62..0d30e83d 100644 --- a/docs/gettext/index.pot +++ b/docs/gettext/index.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\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 f9b9242e..2a4bd757 100644 --- a/docs/gettext/install.pot +++ b/docs/gettext/install.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\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 4dfa7776..60c6d4b6 100644 --- a/docs/gettext/security.pot +++ b/docs/gettext/security.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\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 e367403f..c4770634 100644 --- a/docs/gettext/sphinx.pot +++ b/docs/gettext/sphinx.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\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 66d64a75..55131838 100644 --- a/docs/gettext/tor.pot +++ b/docs/gettext/tor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: OnionShare 2.3.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-20 11:33-0400\n" +"POT-Creation-Date: 2021-05-31 10:12-0700\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/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3c049e59..f99242b1 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: onionshare base: core18 -version: '2.3.2.dev1' +version: '2.3.2' 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 @@ -8,7 +8,7 @@ description: | 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. -grade: devel # stable or devel +grade: stable # stable or devel confinement: strict apps: @@ -23,6 +23,8 @@ apps: - removable-media extensions: - gnome-3-34 + environment: + LANG: C.UTF-8 cli: common-id: org.onionshare.OnionShareCli @@ -32,6 +34,8 @@ apps: - network - network-bind - removable-media + environment: + LANG: C.UTF-8 parts: onionshare: @@ -40,7 +44,7 @@ parts: python-version: python3 python-packages: - psutil - - pyside2==5.15.2 + - pyside2 == 5.15.2 - qrcode stage-packages: - libasound2 @@ -114,21 +118,24 @@ parts: - click - flask - flask-httpauth - - flask-socketio + - flask-socketio == 5.0.1 - pycryptodome + - psutil - pysocks - requests - stem - urllib3 - eventlet + - setuptools + - colorama stage: - -usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 - -usr/share/doc/libssl1.1/changelog.Debian.gz after: [tor, obfs4] tor: - source: https://dist.torproject.org/tor-0.4.5.7.tar.gz - source-checksum: sha256/447fcaaa133e2ef22427e98098a60a9c495edf9ff3e0dd13f484b9ad0185f074 + source: https://dist.torproject.org/tor-0.4.5.8.tar.gz + source-checksum: sha256/57ded091e8bcdcebb0013fe7ef4a4439827cb169358c7874fd05fa00d813e227 source-type: tar plugin: autotools build-packages: |