632 Commits

Author SHA1 Message Date
Micah Lee
f32f710280 Add a horizontal layout wrapper around the vertical layout, in order to optionally add horizontal widgets to Modes 2018-09-19 18:50:42 -07:00
Micah Lee
845fe3f945 Merge branch 'develop' of github.com:micahflee/onionshare into develop 2018-09-19 18:40:14 -07:00
Micah Lee
d068490519 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
ebd9990a6e 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
d0e99f1a95 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
Micah Lee
b8d24515e8 Choose a port *before* starting the web service 2018-09-19 18:14:42 -07:00
Miguel Jacq
34e7290b06 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
70b0add9ef Send the public_mode argument to web.start in the WebThread 2018-09-19 14:40:30 +10:00
Miguel Jacq
10f94de237 Add 'clear history' button to downloads and uploads windows 2018-09-19 14:37:07 +10:00
Miguel Jacq
43a8afae9c 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
e9fdd623eb 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
baa75cc93c #704 wrap the upload filename label if too long 2018-09-19 10:57:12 +10:00
Micah Lee
31cdac46c6 Merge pull request #755 from mig5/upload_icon_updating
Increment/decrement the upload counters
2018-09-18 17:50:39 -07:00
Micah Lee
066e8c58ed Import onion exceptions that were missing 2018-09-18 17:44:54 -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
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
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
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
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
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
Micah Lee
868d1ac2f8 Fix suppressing the shutdown_slug message 2018-09-16 13:50:30 -07: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
Miguel Jacq
57f1d3b2ec Fix margins on HBoxLayouts in settings 2018-09-16 14:06:55 +10:00
Miguel Jacq
3b16b15b4c Move the hyperlink labels into HBox layouts with the checkboxes 2018-09-16 14:00:41 +10:00
Miguel Jacq
5443b6e63d Move stealth to general options, and add hyperlinks for more info for this and legacy addresses 2018-09-16 13:54:47 +10:00
Miguel Jacq
10771de2f8 Fix conflicts 2018-09-16 13:37:22 +10:00
Miguel Jacq
dfe18d10fa Fix bug where lack of stealth mode re-enabled v2 legacy checkbox even if persistence was still enabled 2018-09-15 16:07:08 +10:00
Miguel Jacq
3a9c4fa165 Fix conflict in tests 2018-09-15 12:07:01 +10:00
Micah Lee
905a444099 Merge branch 'develop' into receiver-mode-gui 2018-09-14 18:59:36 -07:00
Micah Lee
9765b62443 Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into develop 2018-09-14 18:43:25 -07:00
Micah Lee
5661015acb Merge branch '685_use_dist_socks' of https://github.com/mig5/onionshare into mig5-685_use_dist_socks 2018-09-14 18:40:26 -07:00
Micah Lee
e6c4c672ea Merge branch 'upload_widget_overlap' of https://github.com/mig5/onionshare into mig5-upload_widget_overlap 2018-09-14 18:33:51 -07:00
Micah Lee
7eb1300430 Merge branch 'fix_invalid_version_alert' of https://github.com/mig5/onionshare into mig5-fix_invalid_version_alert 2018-09-14 18:32:32 -07:00
Miguel Jacq
3eace71261 Pass self to help_clicked function in systray, so we can use self.common 2018-09-04 14:49:56 +10:00
Miguel Jacq
1e29a12221 Use the distribution's PySocks module instead of our custom version 2018-09-04 14:26:47 +10:00
Miguel Jacq
b0d2183a3e Fix conflict from receiver-mode-gui branch 2018-09-04 11:48:39 +10:00
Miguel Jacq
32f0e39a46 Fix conflict from develop branch 2018-09-04 11:43:35 +10:00
Micah Lee
54c98f0b57 Merge branch 'fix_spelling_grammar_receiver_mode' of https://github.com/mig5/onionshare into mig5-fix_spelling_grammar_receiver_mode 2018-09-02 22:59:06 -07:00
Micah Lee
fc5af35b33 Merge branch '707_fix_receive_mode_on_tor_disconnect' of https://github.com/mig5/onionshare into mig5-707_fix_receive_mode_on_tor_disconnect 2018-09-02 22:56:39 -07:00
Micah Lee
8b7aa3b321 Merge branch 'lingering_object_naming_issues' of https://github.com/mig5/onionshare into mig5-lingering_object_naming_issues 2018-09-02 13:33:35 -07:00
Miguel Jacq
b53469fc7d Truncate the length of the uploaded file name if it is longer than the width of the Upload window 2018-09-01 09:20:50 +10:00
Miguel Jacq
fee1a1eba2 Fix the passing of the latest version returned to the UI if it is an invalid version 2018-08-30 15:18:29 +10:00
Miguel Jacq
2aa6a72ba4 Only wrap the v3 onion if the window is too small to show it unwrapped 2018-08-28 09:33:49 +10:00
Miguel Jacq
1e70df4f22 Don't try and parse Tor version in order whether or not to show v2-only features. Just note in the QLabel what is v2-only. Still force v2 legacy mode on when using persistence or stealth. 2018-08-23 11:02:28 +10:00
Miguel Jacq
8c31505b90 Rather than hide persistence/stealth mode altogether if the Tor version is high enough for v3, give the user the option to 'use legacy v2 onions' in Settings dialog, so that they may continue to use persistence etc 2018-08-22 11:45:08 +10:00