77 Commits

Author SHA1 Message Date
Miguel Jacq
293c17cf00 Resolve conflict with upstream's onion.py 2018-01-14 18:53:46 +11:00
Micah Lee
7c653b6a8d Merge branch '493_500_detect_broken_tor_connection' of https://github.com/mig5/onionshare into mig5-493_500_detect_broken_tor_connection 2018-01-13 16:32:56 -08:00
Miguel Jacq
5faecdb3c6 Don't show alert dialogs when Tor disconnects - just display in statusbar and stop any active share. 2017-12-23 16:43:58 +11:00
Miguel Jacq
c3c50c0955 Fixes for the edge case where Tor connection dialog is canceled, but the Tor process remains open in the background, which was causing onion.is_authenticated() to True. Remove excessive alerts 2017-12-21 14:08:13 +11:00
Miguel Jacq
1f47177c7b Fix the Bridges widgets so that they only appear when bundled Tor is chosen. Fixes all the other widget cramming issues. 2017-12-12 08:43:12 +11:00
Miguel Jacq
f7ea85d67f experimenting with adjustSize() which seems to help the widget issue. Also adjust the custom Bridge parsing so that it injects the Bridge prefix automatically (means we can copy/pasta from https://bridges.torproject.org/bridges) 2017-12-11 17:58:53 +11:00
Miguel Jacq
25cf9ec9db Add bridge support (obfs4 or user-supplied) 2017-12-11 14:53:13 +11:00
Lazlo Westerhof
cbf173580d Add missing comma. 2017-12-08 21:56:09 +01:00
Lazlo Westerhof
1b610fa224 Update Dutch translation. 2017-12-08 21:53:51 +01:00
Miguel Jacq
00e37894a9 Better wording for no_available_port error 2017-12-07 08:59:34 +11:00
Miguel Jacq
9052a6c33f Raise an error if we were unable to obtain a random port 2017-12-07 08:49:10 +11:00
Micah Lee
7d0ea87cb4 Merge branch '447_reload_tor_if_not_connected_and_settings_cancelled' of https://github.com/mig5/onionshare into mig5-447_reload_tor_if_not_connected_and_settings_cancelled 2017-12-05 14:05:16 -08:00
Miguel Jacq
1cd4b9ec24 Better wording when OnionShare can't connect to Tor and the attempt to configure settings is canceled 2017-12-05 11:27:16 +11:00
Miguel Jacq
8f4bd32bea #447 show alert and exit if the Settings dialog is canceled yet Tor is still not connected 2017-12-04 18:43:40 +11:00
Miguel Jacq
f6763b25ef Merge master branch and fix conflicts 2017-12-03 17:06:33 +11:00
Miguel Jacq
487cd6c799 Don't auto-stop the share if a download is still in progress 2017-12-03 13:21:25 +11:00
Micah Lee
e54836a69a Allow for localization for "Share via OnionShare" string in the nautilus extension 2017-12-01 12:57:18 -08:00
Miguel Jacq
4a2f5daaf8 Better wording for shutdown timer 2017-11-12 11:48:06 +11:00
Miguel Jacq
ee9dfb7a8b No longer treating shutdown_timeout as a float, but an int of seconds 2017-11-09 19:50:50 +11:00
Miguel Jacq
7ac6bfa215 Various safety checks to prevent a share from starting after the timeout has expired. Also enforce that a timeout lands right on the minute and not precisely when the user clicks start (e.g mid-minute), to avoid confusion that a share might be lingering longer than desired 2017-11-09 17:26:32 +11:00
Miguel Jacq
f5b45539b0 use QDateTimeEdit instead of a spinbox for selecting a future date/time to auto-stop share 2017-11-09 11:29:55 +11:00
Miguel Jacq
c6f36e2086 Implements a shutdown timer to stop a share automatically (downloaded or not) after N hours 2017-11-08 20:25:59 +11:00
Micah Lee
3333c81c77 Merge branch 'mig5-438_settings_icon_inactive' 2017-07-09 14:16:29 -07:00
Miguel Jacq
b7da267d4b #438 Make settings icon lighter grey when inactive 2017-06-02 11:34:19 +10:00
Miguel Jacq
e8304b861f Make it possible to supply a custom json settings file from somewhere else 2017-06-01 17:35:27 +10:00
Micah Lee
abf2498ff2 Updated changelog even more, and version bump to 1.1 2017-05-30 12:54:37 -07:00
Miguel Jacq
18bec095d3 Make adding of files/folders a single button 2017-05-29 10:22:16 +10:00
Micah Lee
5de542234d Version bump to 1.1.dev2 2017-05-23 15:24:05 -07:00
Micah Lee
4460c4e414 Merge branch 'add_help_button' of https://github.com/mig5/onionshare into mig5-add_help_button 2017-05-22 16:44:10 -07:00
Micah Lee
caed1d5336 Update desktop notification settings text 2017-05-22 16:38:46 -07:00
Micah Lee
c26ccd48fa Update desktop notification text 2017-05-22 16:35:59 -07:00
Micah Lee
c0daea953f Add a grayscale OnionShare logo for the systray icon in macOS 2017-05-22 16:23:19 -07:00
Micah Lee
d1512dcd9c Merge branch '285_systray_notifications' of https://github.com/mig5/onionshare into mig5-285_systray_notifications 2017-05-22 16:15:06 -07:00
Micah Lee
d4e6fbb584 Merge branch 'select_multiple_folders' of https://github.com/mig5/onionshare into mig5-select_multiple_folders 2017-05-22 16:04:56 -07:00
Miguel Jacq
5a166e9fc1 Add desktop notification messages on download events (via systray) 2017-05-22 16:47:23 +10:00
Miguel Jacq
4b4de9add3 Adjust folder dialog caption to be plural 2017-05-21 16:25:15 +10:00
Miguel Jacq
9d20749610 Adjust French translation for the dialog caption to be plural 2017-05-21 16:23:48 +10:00
Miguel Jacq
d9e882cbdc Make it possible to select multiple folders by using non-native QFileDialog 2017-05-21 16:14:32 +10:00
Miguel Jacq
b3bde7083f Add help button to settings dialog, which takes user to the wiki 2017-05-20 13:56:20 +10:00
Miguel Jacq
fc863e2532 Be explicit that the the first filesize is that of the compressed zip file and that it contains the files beneath. Use the headers in the table that we've styled for 2017-05-19 15:44:03 +10:00
Miguel Jacq
5f92e3d606 #345 - validate the readability of files before adding them 2017-05-18 18:09:49 +10:00
Micah Lee
62b5d64bc7 Catch errors that occur when connection_type is bundled_tor, but the tor process closes before it can connect 2017-05-17 12:00:42 -07:00
Micah Lee
d5ae4d838d Updated changelog and version bump to 1.1.dev1 2017-05-17 09:10:21 -07:00
Micah Lee
41f4b666e7 When saving settings, if Tor settings changed or if Tor isn't connected, reboot the Onion object, so that it's always connected to Tor when using the app 2017-05-16 16:50:33 -07:00
Micah Lee
cc4ac170c7 Remove the menu bar, and replace it with a settings button owned by the OnionShareGui object 2017-05-16 15:24:14 -07:00
Micah Lee
b7a9574490 Fixed signal/slot/thread issue in TorConnectionDialog and TorConnectionThread, and updated the language of bundled Tor error messages 2017-05-16 13:09:27 -07:00
Micah Lee
6b35a44d41 Renamed onionshare.helpers module to onionshare.common 2017-05-16 11:05:48 -07:00
Micah Lee
68e02dab1f Make UpdateChecker use the shared Onion object instead of creating a new one 2017-05-14 19:54:12 -07:00
Micah Lee
224f2bb0ad Now when you cancel connecting to Tor, it prompts you if you want to quit or open settings 2017-05-14 19:21:33 -07:00
Micah Lee
915d548399 Began making a TorConnectionDialog, which handles connecting to the Tor network 2017-04-17 20:26:35 -07:00