1149 Commits

Author SHA1 Message Date
Micah Lee
ca50d997df Update build instructions for Windows, using newer software. And rename installer to onionshare-setup.exe 2018-01-15 15:53:02 -08:00
Micah Lee
c5e797c4fb Merge branch 'mig5-528_disable_check_for_updates_if_disconnected' 2018-01-14 19:13:54 -08:00
Micah Lee
74c9f11ca0 Merge branch '528_disable_check_for_updates_if_disconnected' of https://github.com/mig5/onionshare into mig5-528_disable_check_for_updates_if_disconnected 2018-01-14 19:00:39 -08:00
Micah Lee
5a1b025e68 Merge branch 'mig5-check_is_valid_file' 2018-01-14 18:59:14 -08:00
Micah Lee
d0c07266bb Merge branch 'check_is_valid_file' of https://github.com/mig5/onionshare into mig5-check_is_valid_file 2018-01-14 18:54:48 -08:00
Micah Lee
2c832f3855 Merge branch 'mig5-reuse_private_key' 2018-01-14 18:36:38 -08:00
Micah Lee
a5b09fb51d Merge branch 'reuse_private_key' of https://github.com/mig5/onionshare into mig5-reuse_private_key 2018-01-14 18:15:23 -08:00
Micah Lee
6a401d477d Merge branch 'master' into Baccount-Update-get-tor-osx.py 2018-01-14 18:06:00 -08:00
Micah Lee
63bb71b5b3 Merge branch 'Baccount-Update-get-tor-windows.py' 2018-01-14 18:04:46 -08:00
Micah Lee
36a69a8fd4 Merge branch 'Update-get-tor-windows.py' of https://github.com/Baccount/onionshare into Baccount-Update-get-tor-windows.py 2018-01-14 18:04:15 -08:00
Micah Lee
95e841ffb9 Merge branch 'Update-get-tor-osx.py' of https://github.com/Baccount/onionshare into Baccount-Update-get-tor-osx.py 2018-01-14 17:58:43 -08:00
Miguel Jacq
e8a4d513b4 Save the slug when using a persistent private key 2018-01-15 10:01:34 +11:00
Miguel Jacq
2c22fcc2e0 Catch the OSError in CLI mode when a file/folder can't be zipped up, and error out more gracefully 2018-01-14 20:36:43 +11:00
Miguel Jacq
a7edf810c8 Merge branch 'master' into check_is_valid_file 2018-01-14 20:24:02 +11:00
Miguel Jacq
e97bee96fe Resolve conflict with upstream's onion.py 2018-01-14 18:49:49 +11:00
Miguel Jacq
3d6ccac376 Resolve conflict with upstream's onion.py 2018-01-14 18:45:10 +11:00
Miguel Jacq
339eb09b57 Add a 'persistent URL' label when re-using a private key 2018-01-14 18:41:54 +11:00
Micah Lee
8664b98b1a Merge branch 'mig5-493_500_detect_broken_tor_connection' 2018-01-13 22:50:57 -08:00
Micah Lee
a34cae0b17 Create the timer before the TorConnectionDialog dialog, but start it after. This way if you cancel the dialog, then click save in the settings, OnionShareGui.timer will already exist, even though though TorConnectionDialog hasn't closed yet 2018-01-13 22:46:57 -08:00
Micah Lee
2dd2052c69 Don't start the check_for_requests timer until after connected to Tor, and remove OnionShareGui.tor_con and TorConnectionDialog.t as class variables, making them local variables instead 2018-01-13 22:42:27 -08:00
Micah Lee
ac29bdb5df Better way to get the onion service_id 2018-01-13 19:18:33 -08:00
Micah Lee
1cd36f6bbf Merge branch 'mig5-525_catch_failure_to_obtain_service_id' 2018-01-13 19:14:33 -08:00
Micah Lee
861c4a7244 Merge branch '525_catch_failure_to_obtain_service_id' of https://github.com/mig5/onionshare into mig5-525_catch_failure_to_obtain_service_id 2018-01-13 19:09:03 -08:00
Micah Lee
552bfd7140 Merge branch 'mig5-520_fix_hyperlink_qlabel' 2018-01-13 17:01:55 -08:00
Micah Lee
97788976dd Merge branch '520_fix_hyperlink_qlabel' of https://github.com/mig5/onionshare into mig5-520_fix_hyperlink_qlabel 2018-01-13 16:59:24 -08:00
Micah Lee
369aa7e9a5 Merge branch 'mig5-disable_start_share_on_no_files' 2018-01-13 16:41:41 -08:00
Micah Lee
f76cf1e258 Merge branch 'disable_start_share_on_no_files' of https://github.com/mig5/onionshare into mig5-disable_start_share_on_no_files 2018-01-13 16:41:06 -08: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
Micah Lee
3527c0440a Merge branch 'mig5-495_clear_status_bar_early' 2018-01-13 16:12:13 -08:00
Micah Lee
9df10c2d4c Merge branch '495_clear_status_bar_early' of https://github.com/mig5/onionshare into mig5-495_clear_status_bar_early 2018-01-13 16:09:11 -08:00
Micah Lee
d5c6cc482a Merge branch 'mig5-453_catch_oserror_on_crunching_files' 2018-01-13 15:59:46 -08:00
Micah Lee
22e8676eda Merge branch '453_catch_oserror_on_crunching_files' of https://github.com/mig5/onionshare into mig5-453_catch_oserror_on_crunching_files 2018-01-13 15:58:15 -08:00
Micah Lee
4453f12e20 Merge branch 'lazlolazlolazlo-dutch' 2018-01-13 15:05:22 -08:00
Micah Lee
daaf88ffb9 Merge branch 'dutch' of https://github.com/lazlolazlolazlo/onionshare into lazlolazlolazlo-dutch 2018-01-13 15:04:54 -08:00
Micah Lee
9a4c52ff20 Merge branch 'Baccount-Increasing-the-timeout' 2018-01-13 13:49:54 -08:00
Micah Lee
46eccb53f2 Merge branch 'Increasing-the-timeout' of https://github.com/Baccount/onionshare into Baccount-Increasing-the-timeout 2018-01-13 13:46:51 -08:00
Miguel Jacq
efb9ba2e26 Attempt to fix tests 2018-01-13 21:03:44 +11:00
Miguel Jacq
eff94d7bfd Move the saving of private key into the SettingsDialog and Onion objects entirely (no QPushButton to save it) 2018-01-13 20:58:24 +11:00
Micah Lee
0ba357eb73 Merge branch 'master' of https://github.com/wondratsch/onionshare 2018-01-12 18:58:41 -08:00
Micah Lee
6f0ec022a5 Merge branch 'mig5-onion_cleanup_on_stop_server' 2018-01-12 18:57:36 -08:00
Micah Lee
cd85fe896a Merge branch 'onion_cleanup_on_stop_server' of https://github.com/mig5/onionshare into mig5-onion_cleanup_on_stop_server 2018-01-12 18:56:03 -08:00
Miguel Jacq
2d606d5e7f Don't re-enable the Check for Updates button after testing Tor connection, if the main Tor connection is still not active 2018-01-04 08:43:43 +11:00
Miguel Jacq
5a08810f23 #528 disable the 'Check for Updates' button in the SettingsDialog if Tor is not connected 2018-01-03 11:16:50 +11:00
Miguel Jacq
ffa7f97905 catch error in start_onion_service in case we somehow failed to parse a service_id in Stem controller response 2018-01-02 16:35:48 +11:00
Miguel Jacq
d6677060af 4096 byte dir check is not consistent across platforms, remove it for now 2018-01-02 09:46:00 +11:00
Miguel Jacq
4079704be5 Check the file is a valid file or dir (not just that it exists) 2018-01-02 09:36:57 +11:00
Miguel Jacq
40eeb2cfd3 #520 trigger browser action properly in QLabel hyperlink 2017-12-27 20:08:38 +11:00
Baccount
9c9f968ab5 Update get-tor-osx.py
Fixes 5 exploits 2 of the exploits effect onion services https://blog.torproject.org/new-stable-tor-releases-security-fixes-0319-03013-02914-02817-02516
2017-12-26 23:00:34 -08:00
Baccount
38eb14d0e3 Update get-tor-windows.py
Fixes 2 onion service exploits
2017-12-26 22:57:47 -08:00
Baccount
f96ff3328f Update onion.py 2017-12-26 22:53:44 -08:00