Commit Graph

2236 Commits

Author SHA1 Message Date
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
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
Miguel Jacq
0333ec915c
Fix indentation... 2018-01-16 16:48:35 +11:00
Miguel Jacq
83e0d9f4de
Better match for lang code filter 2018-01-16 16:45:54 +11: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
Miguel Jacq
c3bf8f0739
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
ce1b2bd513
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
76cf0ae107
Fix conflicts arising from the reuse_private_key branch 2018-01-16 15:30:36 +11:00
Miguel Jacq
cc9a08c07d
Add obfs4proxy as a dependency on Debian/Fedora-like distros, for obfs4 bridge support 2018-01-16 15:29:03 +11:00
Miguel Jacq
3d6309ba94
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
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
c7dac6c40c
Merge branch 'b-meson-docs-readme' 2018-01-15 12:26:45 -08:00
Micah Lee
23f0ad54d8
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
21112fa433
Merge branch 'mig5-528_disable_check_for_updates_if_disconnected' 2018-01-14 19:13:54 -08:00
Freddy Martinez
97a077854a
this commit cleans up the README.md 2018-01-14 19:06:58 -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
3f3d1c751d
Fix tests for obfs4proxy 2018-01-15 12:56:24 +11:00
Miguel Jacq
284213aa2d
support obfs4 via obfs4proxy on macOS 2018-01-15 12:49:29 +11:00
Miguel Jacq
82b1860dac
add missing 'toggled' connect for obfs4 radio. Remove the enabling/disabling of radios for bridges, it obstructs normal UX 2018-01-15 11:25:08 +11:00
Miguel Jacq
55c390eb7f
remove the adjustSize stuff which causes more problems than it solves. Revert the change to positioning of the Test Tor button. Set maximum height for custom bridges QPlainTextEdit widget, seems to help with overlap issues 2018-01-15 10:49:17 +11: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
bf01fcaa6e
Validate syntax of custom bridges 2018-01-14 20:12:24 +11:00
Miguel Jacq
ed8c4c8302
ensure hte obfs4 torrc template is included in installers 2018-01-14 20:12:06 +11:00
Miguel Jacq
011b635cae
ensure custom bridges hyperlink opens a browser as per #520 2018-01-14 18:57:52 +11:00
Miguel Jacq
bdb10b7eeb
Resolve conflict with upstream's onion.py 2018-01-14 18:53:46 +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