Commit Graph

1155 Commits

Author SHA1 Message Date
Micah Lee
790d07a4e7
Fix issue with Windows codesigning 2018-01-17 14:26:15 -08:00
Micah Lee
f0e23949c9
Update macOS build instructions and pip dependency versions, and also update stem for Windows as well 2018-01-16 14:47:50 -08:00
Micah Lee
4cee88125d
Change another Windows python 3.5 reference to 3.6 2018-01-16 08:42:55 -08:00
Micah Lee
a6bc9b92c3
Change Windows build instructions reference from python 3.5 to 3.6, and remove the pyinstaller-script.py hack instructions becase they are not needed anymore 2018-01-16 08:41:43 -08:00
Micah Lee
b7192f2764
Updating Windows build deps, and recreating the nsis installer script for new files 2018-01-15 21:32:55 -08:00
Micah Lee
ea908c1841
Update pip requirements for Windows 2018-01-15 16:45:07 -08:00
Micah Lee
fa280036e6
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
21112fa433
Merge branch 'mig5-528_disable_check_for_updates_if_disconnected' 2018-01-14 19:13:54 -08:00
Micah Lee
c29259cdea
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
58f4e7e756
Merge branch 'mig5-check_is_valid_file' 2018-01-14 18:59:14 -08:00
Micah Lee
808c4cfac2
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
1eea734fb5
Merge branch 'mig5-reuse_private_key' 2018-01-14 18:36:38 -08:00
Micah Lee
a18b069ca1
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
df959db095
Merge branch 'master' into Baccount-Update-get-tor-osx.py 2018-01-14 18:06:00 -08:00
Micah Lee
e2cff2921e
Merge branch 'Baccount-Update-get-tor-windows.py' 2018-01-14 18:04:46 -08:00
Micah Lee
122ab2a5e1
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
2a5877ae9f
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
3e7d4c64ff
Save the slug when using a persistent private key 2018-01-15 10:01:34 +11:00
Miguel Jacq
f656bafd4c
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
d9e6650a19 Merge branch 'master' into check_is_valid_file 2018-01-14 20:24:02 +11:00
Miguel Jacq
448f6af796
Resolve conflict with upstream's onion.py 2018-01-14 18:49:49 +11:00
Miguel Jacq
4da5ddf2c9
Resolve conflict with upstream's onion.py 2018-01-14 18:45:10 +11:00
Miguel Jacq
9aef3cdbb3
Add a 'persistent URL' label when re-using a private key 2018-01-14 18:41:54 +11:00
Micah Lee
a75faea407
Merge branch 'mig5-493_500_detect_broken_tor_connection' 2018-01-13 22:50:57 -08:00
Micah Lee
6ab6ea564a
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
8f585db127
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
a73f1471a2
Better way to get the onion service_id 2018-01-13 19:18:33 -08:00
Micah Lee
627ea18f83
Merge branch 'mig5-525_catch_failure_to_obtain_service_id' 2018-01-13 19:14:33 -08:00
Micah Lee
597008d380
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
c0252826ab
Merge branch 'mig5-520_fix_hyperlink_qlabel' 2018-01-13 17:01:55 -08:00
Micah Lee
2a4e1f0de0
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
e6177c0e10
Merge branch 'mig5-disable_start_share_on_no_files' 2018-01-13 16:41:41 -08:00
Micah Lee
c387a2a7c5
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
ebbe490a65
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
4374d5cef2
Merge branch 'mig5-495_clear_status_bar_early' 2018-01-13 16:12:13 -08:00
Micah Lee
04d2f0c0e1
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
fe2d72db5c
Merge branch 'mig5-453_catch_oserror_on_crunching_files' 2018-01-13 15:59:46 -08:00
Micah Lee
d42369a0f9
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
2dee9f84de
Merge branch 'lazlolazlolazlo-dutch' 2018-01-13 15:05:22 -08:00
Micah Lee
7227df5848
Merge branch 'dutch' of https://github.com/lazlolazlolazlo/onionshare into lazlolazlolazlo-dutch 2018-01-13 15:04:54 -08:00
Micah Lee
c88ef4422e
Merge branch 'Baccount-Increasing-the-timeout' 2018-01-13 13:49:54 -08:00
Micah Lee
5e98a9c283
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
488d88886d
Attempt to fix tests 2018-01-13 21:03:44 +11:00
Miguel Jacq
e90908c5b0
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
36968a45cb
Merge branch 'master' of https://github.com/wondratsch/onionshare 2018-01-12 18:58:41 -08:00
Micah Lee
67da71c410
Merge branch 'mig5-onion_cleanup_on_stop_server' 2018-01-12 18:57:36 -08:00
Micah Lee
9eb4131839
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
cdb7a4df71
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
249f9fa18b
#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
9b3963799e
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