2061 Commits

Author SHA1 Message Date
Micah Lee
f3998d2f3d Remove some debug logs 2018-09-18 16:58:16 -07:00
Miguel Jacq
02ba4b056f Merge pull request #754 from micahflee/update-deps
Update deps
2018-09-19 09:52:57 +10:00
Micah Lee
2378529cc0 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
901ecb6adc 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
2f1e866652 While I'm at it, bump the version to 2.0.dev 2018-09-18 16:19:07 -07:00
Micah Lee
0ec2e67f2f 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
3afa9b6b19 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
ed6d2ee318 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
1dab03abbd Make Web.set_file_info return False on cancel 2018-09-18 13:42:13 -07:00
Micah Lee
c146d1a352 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
8253990eed 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
0cbbd5a923 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
aed48e6e40 Merge branch 'develop' into update-deps 2018-09-17 21:03:37 -07:00
Micah Lee
afdcfffc1e 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
0dc03ecd4c 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
2bded19462 Fix the auto-scrolling to bottom of Download and Upload windows 2018-09-18 12:59:01 +10:00
Miguel Jacq
35154b8591 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
bc097c738e Increment/decrement the upload counters 2018-09-18 11:19:20 +10:00
Miguel Jacq
f0bf9fb727 Merge pull request #695 from micahflee/receiver-mode-gui
Receiver mode GUI
2018-09-18 10:48:56 +10:00
Micah Lee
06463bab7b 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
Miguel Jacq
58259d4500 Fix conflict 2018-09-18 10:26:16 +10:00
Miguel Jacq
2c14575c10 Fix test 2018-09-18 09:59:06 +10:00
Micah Lee
6f93000724 Merge branch 'develop' into receiver-mode-gui 2018-09-17 16:15:08 -07:00
Micah Lee
8bb4ec2a18 Merge branch 'mig5-prop224_receiver_mode' into receiver-mode-gui 2018-09-17 16:12:06 -07:00
Micah Lee
2c80a74467 Make what's this links use the same string, and change their style 2018-09-17 16:11:52 -07:00
Micah Lee
245716c726 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
ba1a33e1ff 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
56b4bf08a8 Update Mac deps to python 3.7.0 and Qt 5.11.1 2018-09-17 15:37:48 -07:00
Miguel Jacq
551e7e97ca Remove unnecessary loop. Remove the Close route/setting which can DoS another running upload. Fix detecting whether any uploads are still in progress before terminating the service after timer expires. Don't register 404s for uploads after expiry has finished (throw a 403 instead)" 2018-09-18 08:36:07 +10:00
Micah Lee
33643fc444 Get tor binary from Tor Browser 8.0 2018-09-17 15:15:16 -07:00
Micah Lee
d43a9ac31b 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
268bab5233 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
4db1943ae0 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
2896f1e3a8 Use the term 'upload' rather than 'download' in the Receive mode tooltip icons 2018-09-17 18:48:22 +10:00
Miguel Jacq
2e6bd74fa8 Hold a share open if its timer hsa expired but a file is still uploading. Don't allow other uploads during this time 2018-09-17 17:42:04 +10:00
Miguel Jacq
94cc76729c Update stdeb.cfg to depend on bionic and Python 3.6 2018-09-17 09:16:11 +10:00
Miguel Jacq
73508f380f Hide the legacy settings if legacy mode is not enabled. Fix unrelated bug regarding displaying the HidServAuth copy button/label 2018-09-17 09:12:13 +10:00
Miguel Jacq
47a6d94ef3 reduce verbosity of persistent mode label 2018-09-17 09:02:35 +10:00
Miguel Jacq
e9721aa243 Add 'what's this' labels to each General Setting 2018-09-17 09:01:30 +10:00
Miguel Jacq
5f31767a7b Reorder the general settings 2018-09-17 08:44:56 +10:00
Miguel Jacq
5a8f3b4f5c Use 'settings' rather than 'options' in the SettingsDialog labels 2018-09-17 08:43:19 +10:00
Micah Lee
868d1ac2f8 Fix suppressing the shutdown_slug message 2018-09-16 13:50:30 -07:00
Micah Lee
38dd9ce4cb Merge pull request #749 from mig5/shutdown_slug_systray_message
Don't show the Flask shutdown slug route in the status bar as if it w…
2018-09-16 12:38:17 -07:00
Miguel Jacq
244696afc9 Bump windows versions of pip packages to match those of OS X 2018-09-16 15:41:50 +10:00
Miguel Jacq
1a3d2b88d1 Don't show the Flash shutdown slug route in the status bar as if it were an unexpected 404 route 2018-09-16 15:15:40 +10:00
Micah Lee
a77f75fc84 Merge branch 'develop' of github.com:micahflee/onionshare into develop 2018-09-15 22:04:57 -07:00
Micah Lee
e4d5a74cca Monkeypatch flask to suppress output that isn't applicable to OnionShare 2018-09-15 22:04:08 -07:00
Miguel Jacq
dd1231061f Merge pull request #745 from micahflee/740_pip_dependencies
Update all pip dependency versions
2018-09-16 14:54:58 +10:00
Miguel Jacq
d4ac357a87 Merge branch 'receiver-mode-gui' into prop224_receiver_mode 2018-09-16 14:53:49 +10:00
Micah Lee
053cd42ff1 Merge pull request #746 from mig5/fix_public_mode_test
Fix public mode tests for 404
2018-09-15 21:50:59 -07:00