Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-03 15:05:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/a1346054/onionshare into a1346054-develop

Browse source
This commit is contained in:
Micah Lee 2021-12-04 20:34:07 -08:00
commit 16c6a9f89d
21 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -110,7 +110,7 @@
## 1.3 ## 1.3
* Major UI redesign, introducing many UX improvements * Major UI redesign, introducing many UX improvements
* Client-side web interfact redesigned * Client-side web interface redesigned
* New feature: Support for meek_lite pluggable transports (Amazon and Azure) - not yet ready for Windows or macOS, sorry * New feature: Support for meek_lite pluggable transports (Amazon and Azure) - not yet ready for Windows or macOS, sorry
* New feature: Support for custom obfs4 and meek_lite bridges (again, meek_lite not available on Windows/macOS yet) * New feature: Support for custom obfs4 and meek_lite bridges (again, meek_lite not available on Windows/macOS yet)
* New feature: Ability to cancel share before it starts * New feature: Ability to cancel share before it starts

8
LICENSE
View file

@ -6,7 +6,7 @@ Copyright (C) 2014-2021 Micah Lee, et al. <micah@micahflee.com>
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
@ -650,7 +650,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
@ -669,11 +669,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school, You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary. if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>. <https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>. <https://www.gnu.org/licenses/why-not-lgpl.html>.

2
RELEASE.md
View file

@ -163,7 +163,7 @@ This will create `desktop/macOS/OnionShare.dmg`, signed and notarized.
## Source package ## Source package
To make a source package, run `./build-source.sh $TAG`, where `$TAG` is the the name of the signed git tag, e.g. `v2.1`. To make a source package, run `./build-source.sh $TAG`, where `$TAG` is the name of the signed git tag, e.g. `v2.1`.
This will create `dist/onionshare-$VERSION.tar.gz`. This will create `dist/onionshare-$VERSION.tar.gz`.

2
cli/onionshare_cli/resources/static/js/chat.js
View file

@ -148,7 +148,7 @@ var getScrollDiffBefore = function () {
var scrollBottomMaybe = function (scrollDiff) { var scrollBottomMaybe = function (scrollDiff) {
// Scrolls to bottom if the user is scrolled at bottom // Scrolls to bottom if the user is scrolled at bottom
// if the user has scrolled upp, it wont scroll at bottom. // if the user has scrolled up, it won't scroll at bottom.
// Note: when a user themselves send a message, it will still // Note: when a user themselves send a message, it will still
// scroll to the bottom even if they had scrolled up before. // scroll to the bottom even if they had scrolled up before.
if (scrollDiff > 0) { if (scrollDiff > 0) {

2
desktop/README.md
View file

@ -49,7 +49,7 @@ These instructions include adding folders to the path in Windows. To do this, go
Download Python 3.8.6, 32-bit (x86) from https://www.python.org/downloads/release/python-386/. I downloaded `python-3.8.6.exe`. When installing it, make sure to check the "Add Python 3.8 to PATH" checkbox on the first page of the installer. Download Python 3.8.6, 32-bit (x86) from https://www.python.org/downloads/release/python-386/. I downloaded `python-3.8.6.exe`. When installing it, make sure to check the "Add Python 3.8 to PATH" checkbox on the first page of the installer.
Download and install 7-Zip from http://www.7-zip.org/download.html. I downloaded `7z1900.exe`. Add `C:\Program Files (x86)\7-Zip` to your path. Download and install 7-Zip from https://7-zip.org/download.html. I downloaded `7z1900.exe`. Add `C:\Program Files (x86)\7-Zip` to your path.
Install python dependencies: Install python dependencies:

4
desktop/scripts/dev.sh
View file

@ -2,8 +2,8 @@
# Run OnionShare desktop, allowing you to use command-line arguments # Run OnionShare desktop, allowing you to use command-line arguments
SCRIPTS_DIR="$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )" SCRIPTS_DIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )
cd $SCRIPTS_DIR cd "$SCRIPTS_DIR"
cd ../src cd ../src
python -c "import onionshare; onionshare.main()" $@ python -c "import onionshare; onionshare.main()" $@

2
desktop/src/onionshare/tab/mode/share_mode/__init__.py
View file

@ -246,7 +246,7 @@ class ShareMode(Mode):
def start_server_step3_custom(self): def start_server_step3_custom(self):
""" """
Step 3 in starting the server. Remove zip progess bar, and display large filesize Step 3 in starting the server. Remove zip progress bar, and display large filesize
warning, if applicable. warning, if applicable.
""" """
# Remove zip progress bar # Remove zip progress bar

2
desktop/tests/gui_base_test.py
View file

@ -178,7 +178,7 @@ class GuiBaseTest(unittest.TestCase):
self.assertEqual(tab.get_mode().history.isVisible(), not currently_visible) self.assertEqual(tab.get_mode().history.isVisible(), not currently_visible)
def history_indicator(self, tab, indicator_count="1"): def history_indicator(self, tab, indicator_count="1"):
"""Test that we can make sure the history is toggled off, do an action, and the indiciator works""" """Test that we can make sure the history is toggled off, do an action, and the indicator works"""
# Make sure history is toggled off # Make sure history is toggled off
if tab.get_mode().history.isVisible(): if tab.get_mode().history.isVisible():
tab.get_mode().toggle_history.click() tab.get_mode().toggle_history.click()

2
docs/build.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=`cat ../cli/onionshare_cli/resources/version.txt` VERSION=$(cat ../cli/onionshare_cli/resources/version.txt)
# Supported locales # Supported locales
LOCALES="en fi pl pt_BR ru tr uk" LOCALES="en fi pl pt_BR ru tr uk"

2
docs/source/conf.py
View file

@ -16,7 +16,7 @@ languages = [
("Русский", "ru"), # Russian ("Русский", "ru"), # Russian
# ("Español", "es"), # Spanish # ("Español", "es"), # Spanish
("Türkçe", "tr"), # Turkish ("Türkçe", "tr"), # Turkish
("Українська", "uk"), # Ukranian ("Українська", "uk"), # Ukrainian
] ]
versions = ["2.3", "2.3.1", "2.3.2", "2.3.3", "2.4", "2.4.1"] versions = ["2.3", "2.3.1", "2.3.2", "2.3.3", "2.4", "2.4.1"]

2
docs/source/develop.rst
View file

@ -40,7 +40,7 @@ Verbose mode
When developing, it's convenient to run OnionShare from a terminal and add the ``--verbose`` (or ``-v``) flag to the command. When developing, it's convenient to run OnionShare from a terminal and add the ``--verbose`` (or ``-v``) flag to the command.
This prints a lot of helpful messages to the terminal, such as when certain objects are initialized, when events occur (like buttons clicked, settings saved or reloaded), and other debug info. For example:: This prints a lot of helpful messages to the terminal, such as when certain objects are initialized, when events occur (like buttons clicked, settings saved or reloaded), and other debug info. For example::
$ $ poetry run onionshare-cli -v ~/Documents/roms/nes/Q-bert\ \(USA\).nes $ poetry run onionshare-cli -v ~/Documents/roms/nes/Q-bert\ \(USA\).nes
╭───────────────────────────────────────────╮ ╭───────────────────────────────────────────╮
│ * ▄▄█████▄▄ * │ │ * ▄▄█████▄▄ * │
│ ▄████▀▀▀████▄ * │ │ ▄████▀▀▀████▄ * │

8
licenses/license-onionshare.txt
View file

@ -3,7 +3,7 @@ Copyright (C) 2014-2018 Micah Lee <micah@micahflee.com>
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed. of this license document, but changing it is not allowed.
@ -647,7 +647,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
@ -666,11 +666,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school, You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary. if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>. <https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>. <https://www.gnu.org/licenses/why-not-lgpl.html>.