Micah Lee
2b9791e07f
Merge branch 'develop' of github.com:micahflee/onionshare into develop
2018-09-19 18:40:14 -07:00
Micah Lee
286979952a
Merge branch 'send_public_mode_arg_to_web_start' of https://github.com/mig5/onionshare into mig5-send_public_mode_arg_to_web_start
2018-09-19 18:39:07 -07:00
Micah Lee
093cf9bd85
Merge pull request #766 from mig5/clear_history_button
...
Add 'clear history' button to downloads and uploads windows
2018-09-19 18:36:50 -07:00
Micah Lee
d0d4d61008
Merge pull request #762 from mig5/textwrap_upload_filename_widget
...
#704 wrap the upload filename label if too long
2018-09-19 18:33:30 -07:00
Miguel Jacq
a9586049cc
Merge pull request #769 from micahflee/fix_app_port
...
Choose a port *before* starting the web service
2018-09-20 11:28:45 +10:00
Micah Lee
fc7afecb7b
Choose a port *before* starting the web service
2018-09-19 18:14:42 -07:00
Micah Lee
fe9b510a9e
Merge pull request #768 from mig5/start_web_thread_earlier_than_onion_service
...
Start the WebThread earlier than the Onion service. This gives it a c…
2018-09-19 18:03:04 -07:00
Miguel Jacq
8b704a0070
Start the WebThread earlier than the Onion service. This gives it a chance to generate its slug before the Onion Service finishes starting up, which can otherwise lead to a crash
2018-09-19 15:07:04 +10:00
Miguel Jacq
abb270834b
Log the public_mode flag as well
2018-09-19 14:53:33 +10:00
Miguel Jacq
20c97a61ab
Send the public_mode argument to web.start in the WebThread
2018-09-19 14:40:30 +10:00
Miguel Jacq
28674bf023
Add 'clear history' button to downloads and uploads windows
2018-09-19 14:37:07 +10:00
Miguel Jacq
62804dfdce
Merge pull request #758 from micahflee/665_cancel_compression
...
Fix zip progress bar not canceling problem
2018-09-19 10:59:11 +10:00
Micah Lee
3743a1b0ec
Merge pull request #756 from mig5/reset_uploads_on_share_restart
...
Close the upload widget on reset so that it properly disappears from the Uploads window
2018-09-18 17:58:25 -07:00
Miguel Jacq
c08f6f3db1
#704 wrap the upload filename label if too long
2018-09-19 10:57:12 +10:00
Micah Lee
6ac1ca3784
Merge pull request #755 from mig5/upload_icon_updating
...
Increment/decrement the upload counters
2018-09-18 17:50:39 -07:00
Miguel Jacq
f819942582
Merge pull request #761 from micahflee/760_fix_tor_crash
...
Fixes tor crash
2018-09-19 10:46:32 +10:00
Micah Lee
d63808f419
Import onion exceptions that were missing
2018-09-18 17:44:54 -07:00
Micah Lee
6da5ae84f7
Tor version must actually be 0.3.3.1 for ephemeral v3 onion services
2018-09-18 17:31:40 -07:00
Micah Lee
cc265491fd
Properly handle exceptions in CLI, and pass the actual exception message in TorErrorProtocolError exceptions
2018-09-18 17:17:25 -07:00
Micah Lee
5448c4f345
Remove some debug logs
2018-09-18 16:58:16 -07:00
Miguel Jacq
88e186ba35
Merge pull request #754 from micahflee/update-deps
...
Update deps
2018-09-19 09:52:57 +10:00
Micah Lee
50b69e4316
Merge pull request #757 from mig5/auto_scroll_download_upload_window
...
Fix the auto-scrolling to bottom of Download and Upload windows
2018-09-18 16:35:17 -07:00
Micah Lee
0234ff5f37
Set self.cancel_compression to false in the set_file_info() function instead of Web's constructor, so it gets reset every time
2018-09-18 16:28:54 -07:00
Micah Lee
b4a5280cf2
While I'm at it, bump the version to 2.0.dev
2018-09-18 16:19:07 -07:00
Micah Lee
814897e9bb
Update NSIS file to no longer have to specify each individual file (omg I should have done this foreever ago)
2018-09-18 16:05:54 -07:00
Micah Lee
31fd2ee7b6
For Mac build instructions, update a command to use Python 3.7 instead of 3.6, and install pip dependencies without sudo. For Windows, install requirements.txt instead of requirements-windows.txt. Also pywin32 is no longer a dependency, so remove it from build instructions.
2018-09-18 15:37:33 -07:00
Micah Lee
725434ed97
Generated a new requirements.txt by installing the latest version of
...
these pip packages:
pip3 install certifi cryptography Flask PyInstaller PyQt5 PySocks pycrypto pynacl requests stem
Then running "pip3 freeze". Also, deleted requirements-windows.txt. Mac
and Windows can share.
2018-09-18 15:35:10 -07:00
Micah Lee
c52c846227
Make Web.set_file_info return False on cancel
2018-09-18 13:42:13 -07:00
Micah Lee
72f76bf659
We shouldn't call CompressThread.cancel() there because it's already called in a signal
2018-09-18 13:39:09 -07:00
Miguel Jacq
a8dc03da37
Update the path to the Tor data from inside the mounted .dmg, and the libevent version name
2018-09-18 15:36:00 +10:00
Miguel Jacq
56280d722f
Re-add the python dependencies necessary for v3 onion support, which got lost in the merge
2018-09-18 15:35:26 +10:00
Micah Lee
fc0defe0c2
Merge branch 'develop' into update-deps
2018-09-17 21:03:37 -07:00
Micah Lee
ef71c351c6
Oops, update URL and filename for Tor Browser 8.0 dmg as well as the sha256 checksum
2018-09-17 21:02:39 -07:00
Micah Lee
174de57405
Refactor all of the threading.Threads into QThreads, and quit them all when canceling the server. When canceling the compression thread, specifically mass a cancel message into the Web and ZipWriter objects to make the bail out on compression early
2018-09-17 20:55:54 -07:00
Miguel Jacq
d54b52691c
Fix the auto-scrolling to bottom of Download and Upload windows
2018-09-18 12:59:01 +10:00
Miguel Jacq
bf6de202b0
Close the upload widget on reset so that it properly disappears from the Uploads window.
2018-09-18 11:51:32 +10:00
Miguel Jacq
c8fd40c3b0
Increment/decrement the upload counters
2018-09-18 11:19:20 +10:00
Miguel Jacq
06f90b91ce
Merge pull request #695 from micahflee/receiver-mode-gui
...
Receiver mode GUI
2018-09-18 10:48:56 +10:00
Micah Lee
7c5d154519
Make separate function for comparing the slug and comparing the shutdown_slug, to prevent 404 errors on the shutdown request
2018-09-17 17:42:21 -07:00
Micah Lee
6efc281fbb
Merge branch 'develop' into receiver-mode-gui
2018-09-17 16:15:08 -07:00
Micah Lee
6d9d861083
Merge branch 'mig5-prop224_receiver_mode' into receiver-mode-gui
2018-09-17 16:12:06 -07:00
Micah Lee
359e470383
Make what's this links use the same string, and change their style
2018-09-17 16:11:52 -07:00
Micah Lee
cddc7f8c57
Merge branch 'prop224_receiver_mode' of https://github.com/mig5/onionshare into mig5-prop224_receiver_mode
2018-09-17 15:57:15 -07:00
Micah Lee
eb66aceeca
Update travis config to use python 3.6+, and to install proper versions of dependencies, and to use bionic instead of trusty
2018-09-17 15:54:37 -07:00
Micah Lee
92ef6f7139
Update Mac deps to python 3.7.0 and Qt 5.11.1
2018-09-17 15:37:48 -07:00
Micah Lee
711a7b84d7
Get tor binary from Tor Browser 8.0
2018-09-17 15:15:16 -07:00
Micah Lee
abfc2f1c65
Update Windows deps to python 3.7.0, pywin32 223, and Qt 5.11.1
2018-09-17 15:07:19 -07:00
Micah Lee
f0c6a225ad
Merge pull request #750 from mig5/740_pip_dependencies_round_2
...
Bump windows versions of pip packages to match those of OS X
2018-09-17 15:01:51 -07:00
Micah Lee
6ca5f05d19
Merge pull request #753 from mig5/uploads_tooltips
...
[receiver-mode-gui] Use the term 'upload' rather than 'download' in the Receive mode tooltip icons
2018-09-17 12:20:35 -07:00
Miguel Jacq
953727419c
Use the term 'upload' rather than 'download' in the Receive mode tooltip icons
2018-09-17 18:48:22 +10:00