679 Commits

Author SHA1 Message Date
Ulrike Uhlig
cdbdd366ba Merge branch 'master' of https://github.com/micahflee/onionshare 2016-11-19 21:20:57 +01:00
Micah Lee
2794d41919 Update changelog and version bump to 0.9.2 v0.9.2 2016-11-13 13:07:14 -08:00
Micah Lee
d9171d7610 Merge branch 'xSmurf-importfix' 2016-11-13 11:39:28 -08:00
xSmurf
baba640894 Only check if we are in the sys prefix but not the actual executable name as this could be renamed or wrapped 2016-09-28 17:24:28 +00:00
Micah Lee
de6881acb1 Merge branch 'dballard-ubuntu-build' 2016-09-27 14:15:57 -07:00
Micah Lee
86983c5a10 Merge branch 'ubuntu-build' of https://github.com/dballard/onionshare into dballard-ubuntu-build 2016-09-27 14:15:17 -07:00
Micah Lee
8589e8cb91 Merge branch 'fred-a-kemp-feature/tor-control-port-from-env' 2016-09-27 14:09:39 -07:00
anonym
0314acede6 Try to get the Tor ControlPort from the environment.
... via the TOR_CONTROL_PORT variable. If set, onionshare will only
try this port.
2016-09-22 14:10:24 +02:00
Ulrike Uhlig
6cea750ad6 Merge remote-tracking branch 'micahlee/master' 2016-09-07 15:31:43 +02:00
Micah Lee
08e43ca7bc Sleep between launching threads in onionshare-gui, preventing a cx_Freeze crash related to loading the same modules in multiple threads while they're locked v0.9.1 2016-09-06 13:27:59 -07:00
Micah Lee
26212f852c Move imports to module level 2016-09-06 13:17:55 -07:00
Micah Lee
c53d4f5e24 Enable stdout in Windows, OSX CLI versions (#305) 2016-09-06 12:09:10 -07:00
Micah Lee
f963cf9365 Add instructions for using CLI version to README, and add supporting Windows/OSX CLI to changelog 2016-09-06 11:56:09 -07:00
Micah Lee
94e29d1ddf Disable writing to stdout in Windows (fixes #304) 2016-09-06 18:44:35 -07:00
Micah Lee
558e428508 Prevent canceling download from being confused with rate limit attacker 2016-09-06 10:18:50 -07:00
Micah Lee
cff538ff13 Version bump to 0.9.1, and updated changelog 2016-09-06 10:09:46 -07:00
Ulrike Uhlig
3c58b98589 Merge remote-tracking branch 'micahlee/master' 2016-09-06 13:44:22 +02:00
Micah Lee
49e75d4ab5 Make onionshare GUI use separate thread for starting onion service with await_publication=True, to avoid non-responsive window 2016-09-05 12:29:58 -07:00
Micah Lee
2bc695acd3 Refactor onionshare GUI to use await_publication=True when using ephemeral onion services 2016-09-05 11:36:41 -07:00
Micah Lee
5b19d9eaf0 Remove HSDirError exception, because it is no longer thrown 2016-09-05 11:32:30 -07:00
Micah Lee
f7882c6a74 Refactor onionshare CLI to use await_publication=True when using ephemeral onion services, instead of relying on wait_for_hs function 2016-09-05 11:29:12 -07:00
Micah Lee
eb4c8df105 Renamed hs to onion 2016-09-05 11:16:54 -07:00
Micah Lee
f926d15721 Oops, I can't have a variable called os 2016-09-05 11:06:30 -07:00
Micah Lee
9f78e34d5b Make sure tests can find the correct paths (fixes #284) 2016-09-05 10:41:20 -07:00
Micah Lee
277805ba5b Fix strings tests, now that load_strings needs helpers as an arg 2016-09-04 20:02:20 -07:00
Micah Lee
c3e8a05d51 Update build_exe.bat and NSIS installer config to support cx_Freeze 2016-09-05 02:54:25 -07:00
Micah Lee
6bb312216b Migrate from PyInstaller to cx_Freeze for OSX 2016-09-04 19:21:09 -07:00
Micah Lee
1e27cf8831 Version bump to 0.9.1-dev 2016-09-04 19:19:44 -07:00
Micah Lee
e461ba4b59 Merge branch 'master' into cx_Freeze 2016-09-04 17:23:27 -07:00
Micah Lee
9b46cbe76c Move license.txt into resources, so it will be bundled with Windows installer 2016-09-04 21:07:55 -07:00
Micah Lee
eb70648fee Refactor setup.py, and make cx_Freeze bdist_msi installer create a shortcut in the Start Menu 2016-09-04 20:57:38 -07:00
Micah Lee
828728eb2c Update Windows build instructions 2016-09-04 20:14:04 -07:00
Micah Lee
df6d5d74de Build the cx_Freeze Windows GUI in window mode instead of console mode 2016-09-04 20:13:51 -07:00
Micah Lee
4cb90dc96d Pass helpers into strings.load_strings instead of importing it, so fix issue with cx_Freeze in Windows 2016-09-04 20:09:18 -07:00
Micah Lee
b033c5ea74 Oops, use spaces instead of tabs 2016-09-04 20:08:36 -07:00
Micah Lee
d2d3be7a93 Make launcher scripts require onionshare and onionshare_gui python packages to be installed, to workaround a cx_Freeze issue 2016-09-04 19:57:34 -07:00
Micah Lee
d0e4e1653e Added resources to cx_Freeze setup, and make those resources findable by the app 2016-09-04 19:54:45 -07:00
Micah Lee
886ce1e1a1 Add instructions for installing cx_Freeze in Windows, and add cx_Freeze support to setup.py for Windows 2016-09-04 19:36:56 -07:00
Micah Lee
55c9edfabf Update Windows build instructions 2016-09-04 18:30:45 -07:00
Micah Lee
8140dbeefb Stop saying 'hidden service', start saying 'onion service' 2016-09-04 17:23:06 -07:00
Dan Ballard
3ee0718755 add python3-nose for ubuntu 16.04 2016-06-17 07:53:31 -07:00
Micah Lee
b2858de6ee Added python-nautilus as a dependency (#293) 2016-06-10 18:03:34 -07:00
Micah Lee
a8f8bd9ef4 Added a simple nautilus extension, written by the Subgraph developers (fixes #293) 2016-06-10 17:56:34 -07:00
Micah Lee
933523fde5 Merge branch 'PabloCastellano-master' 2016-06-10 17:29:44 -07:00
Micah Lee
6f95075f0a The path of the install scripts has changed, so the import path must change too if running locally 2016-06-10 17:29:22 -07:00
Micah Lee
1786699cd0 Merge branch 'master' of https://github.com/PabloCastellano/onionshare into PabloCastellano-master 2016-06-10 17:28:37 -07:00
Micah Lee
82617f0b83 Tweaked Spanish locale and typo in comment, thanks to kant (#269, #270) 2016-06-10 17:24:44 -07:00
Micah Lee
7f438052c6 Merge pull request #288 from mscherer/fix_cve
Fix CVE-2016-5026
2016-06-10 17:18:36 -07:00
Micah Lee
8cde1d80c8 Merge pull request #283 from joshbegley/patch-1
fixed typo
2016-06-10 17:14:40 -07:00
Micah Lee
185006d662 Merge pull request #280 from jvoisin/pep8
Improve pep8 conformance
2016-06-10 17:14:11 -07:00