1167 Commits

Author SHA1 Message Date
Micah Lee
5a438ad86e Merge branch 'update_build_docs' of https://github.com/mig5/onionshare into mig5-update_build_docs 2018-01-16 15:19:06 -08:00
Micah Lee
d7fe301f03 Merge branch 'mig5-update_check_translation_script' 2018-01-16 15:18:26 -08:00
Micah Lee
dfc4db1436 Merge branch 'update_check_translation_script' of https://github.com/mig5/onionshare into mig5-update_check_translation_script 2018-01-16 15:17:23 -08:00
Micah Lee
b3f080b6fc Merge branch 'windows-1.2' 2018-01-16 15:16:13 -08:00
Micah Lee
2047eba610 Merge branch 'master' into windows-1.2 2018-01-16 15:15:59 -08:00
Micah Lee
2ca24d2c6a 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
20e5394a8f Change another Windows python 3.5 reference to 3.6 2018-01-16 08:42:55 -08:00
Micah Lee
ba0736e1c6 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
Miguel Jacq
57ef436536 Fix indentation... 2018-01-16 16:48:35 +11:00
Miguel Jacq
5483aac129 Better match for lang code filter 2018-01-16 16:45:54 +11:00
Micah Lee
366ec6724e Updating Windows build deps, and recreating the nsis installer script for new files 2018-01-15 21:32:55 -08:00
Miguel Jacq
ed9ed1770d Add -l arg to check_lacked_trans.py, to filter on a specific language code 2018-01-16 16:32:26 +11:00
Miguel Jacq
5a36f945b1 Update the check_lacked_trans.py script to work with latest codebase and use python 3 2018-01-16 16:17:23 +11:00
Miguel Jacq
5c64a9c7f8 Link to the Linux Distribution Support wiki doc for help building from source, due to various differences in Tor, Stem, Stdeb versions 2018-01-16 14:50:00 +11:00
Micah Lee
f0f2243c4e Update pip requirements for Windows 2018-01-15 16:45:07 -08:00
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
c1d9f5c1b4 Merge branch 'b-meson-docs-readme' 2018-01-15 12:26:45 -08:00
Micah Lee
4498919700 Merge branch 'docs-readme' of https://github.com/b-meson/onionshare into b-meson-docs-readme 2018-01-15 12:26:34 -08:00
Micah Lee
c5e797c4fb Merge branch 'mig5-528_disable_check_for_updates_if_disconnected' 2018-01-14 19:13:54 -08:00
Freddy Martinez
b61b3c7b23 this commit cleans up the README.md 2018-01-14 19:06:58 -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