Commit Graph

1428 Commits

Author SHA1 Message Date
Micah Lee
289a8650b4
Merge branch 'Baccount-Update-URL' into develop 2018-01-30 21:03:16 -08:00
Micah Lee
5aed6f96a1
Merge branch 'Update-URL' of https://github.com/Baccount/onionshare into Baccount-Update-URL 2018-01-30 21:02:21 -08:00
Micah Lee
ce38c3cc97
Merge branch 'mig5-556_obfs4_in_custom_bridges' into develop 2018-01-30 20:54:59 -08:00
Micah Lee
a996d2d86a
Merge branch '556_obfs4_in_custom_bridges' of https://github.com/mig5/onionshare into mig5-556_obfs4_in_custom_bridges 2018-01-30 20:47:29 -08:00
Micah Lee
29ad669e54
Create github code owners file, make myself the owner 2018-01-30 14:59:43 -08:00
Miguel Jacq
8cc651a370
#523 prioritise connecting to the v3 onionshare site when checking for updates, if Tor version is >= 0.3.2.9 2018-01-24 11:37:48 +11:00
Baccount
6fda59551f
Update get-tor-windows.py 2018-01-23 09:24:27 -08:00
Baccount
0a66951508
Update macOS version tor to 0.2.3.9 2018-01-23 09:19:53 -08:00
Miguel Jacq
a28f427c0c
reinstate the emitted signals for invalid version/error checking for updates 2018-01-23 16:51:13 +11:00
Miguel Jacq
70a624c331
#535 do the forced update check via a (non-blocking) QThread 2018-01-23 16:32:14 +11:00
Miguel Jacq
9a3bcb9834
stricter regex of IPv4 as well as IPv6 IPs in custom bridges 2018-01-22 16:24:26 +11:00
Miguel Jacq
524f8839d2
Add instruction to update Python 3.6's internal certificate store, to avoid validation error on archive.torproject.org 2018-01-21 13:42:46 +11:00
Miguel Jacq
a068bf4518
Merge pull request #560 from Baccount/eject-DMG
Eject dmg
2018-01-21 13:37:03 +11:00
Miguel Jacq
b82f17717d
Merge pull request #563 from pierwill/french-translations
French string translations
2018-01-21 13:31:41 +11:00
pierwill
c8215f9670 French string translations 2018-01-20 15:41:52 -06:00
Baccount
1fb2116efd
Update en.json 2018-01-18 22:36:34 -08:00
Baccount
e597ce0c2b
Update get-tor-osx.py 2018-01-18 22:29:35 -08:00
Miguel Jacq
16bd3291e3
Support for obfs4 in custom bridges 2018-01-19 15:31:11 +11:00
Micah Lee
95c8c0fb81
Merge branch 'mig5-fix_slug_cli_mode' 2018-01-18 12:40:55 -08:00
Micah Lee
c797dc93e1
Merge branch 'fix_slug_cli_mode' of https://github.com/mig5/onionshare into mig5-fix_slug_cli_mode 2018-01-18 12:15:57 -08:00
Miguel Jacq
206472cb78
load Settings in onionshare/__init__.py before we initiate the web thread, since it needs to send the saved slug to the web server 2018-01-18 22:42:43 +11:00
Micah Lee
849998226a
Updated changelog again 2018-01-17 19:47:24 -08:00
Micah Lee
1d1648bb90
Version bump to 1.2 and updated changelog 2018-01-17 19:36:56 -08:00
Micah Lee
f499b126cc
Temporary fix for #550 2018-01-17 18:53:45 -08:00
Micah Lee
3b013f379f
Force yes when extracting Tor Browser exe 2018-01-17 17:14:19 -08:00
Micah Lee
6629aec341
Typo in 7-Zip URL 2018-01-17 17:13:59 -08:00
Micah Lee
713e45084a
Merge branch '435_support_bridges' of https://github.com/mig5/onionshare into mig5-435_support_bridges 2018-01-17 16:19:30 -08:00
Micah Lee
ec6adfdb8f
Merge branch 'mig5-fix_persistent_url' 2018-01-17 16:05:47 -08:00
Micah Lee
ae75624c0d
Merge branch 'fix_persistent_url' of https://github.com/mig5/onionshare into mig5-fix_persistent_url 2018-01-17 16:05:38 -08:00
Micah Lee
c34360de7a
Merge branch 'mig5-save_autoupdate_setting' 2018-01-17 16:02:29 -08:00
Micah Lee
53e15096e3
Merge branch 'save_autoupdate_setting' of https://github.com/mig5/onionshare into mig5-save_autoupdate_setting 2018-01-17 16:02:03 -08:00
Micah Lee
549a66dfdf
Merge branch 'mig5-updatethread_reload_settings_before_save' 2018-01-17 16:00:53 -08:00
Micah Lee
14bc4d4ccc
Merge branch 'updatethread_reload_settings_before_save' of https://github.com/mig5/onionshare into mig5-updatethread_reload_settings_before_save 2018-01-17 16:00:30 -08:00
Micah Lee
09f09c7d44
Merge branch 'master' of github.com:micahflee/onionshare into windows-1.2 2018-01-17 14:26:31 -08:00
Micah Lee
790d07a4e7
Fix issue with Windows codesigning 2018-01-17 14:26:15 -08:00
Miguel Jacq
bbb6c8ddf8
Re-load the settings in the UpdateCheck thread before saving, in case settings have changed in between starting thread and saving, so we don't clobber them 2018-01-18 08:43:14 +11:00
Miguel Jacq
9ed748db86
load the Settings in onionshare/__init__.py later, so that when saving slug, the private_key/hidservauth string have already been saved by the Onion object 2018-01-18 08:14:36 +11:00
Miguel Jacq
4b5319bb4e
Save the use_autoupdate setting 2018-01-18 07:54:19 +11:00
Miguel Jacq
fc2dcafafc
Clarify that obfs4 bridges can't be used as custom bridges, and that obfs4proxy is needed for obfs4 bridges 2018-01-17 16:30:12 +11:00
Miguel Jacq
8375520e10
Add missing items to the onionshare.nsi 2018-01-17 13:17:55 +11:00
Miguel Jacq
7237b65a32
resolve conflicts 2018-01-17 12:50:11 +11:00
Miguel Jacq
40ee114803
Extract tor and obfs4proxy executables from the main TorBrowser executable with 7-zip on Windows 2018-01-17 12:45:37 +11:00
Micah Lee
4261670b59
Merge branch 'mig5-update_build_docs' 2018-01-16 15:19:13 -08:00
Micah Lee
ffe56c5655
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
f0d68f7e28
Merge branch 'mig5-update_check_translation_script' 2018-01-16 15:18:26 -08:00
Micah Lee
7d5eda6fac
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
adee5f54ad
Merge branch 'windows-1.2' 2018-01-16 15:16:13 -08:00
Micah Lee
dc12523ed1
Merge branch 'master' into windows-1.2 2018-01-16 15:15:59 -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