Commit Graph

831 Commits

Author SHA1 Message Date
xSmurf
4f464aaf2c 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
94f26ea83d
Merge branch 'dballard-ubuntu-build' 2016-09-27 14:15:57 -07:00
Micah Lee
95c37746d4
Merge branch 'ubuntu-build' of https://github.com/dballard/onionshare into dballard-ubuntu-build 2016-09-27 14:15:17 -07:00
Micah Lee
d8b0a4e152
Merge branch 'fred-a-kemp-feature/tor-control-port-from-env' 2016-09-27 14:09:39 -07:00
anonym
c74d892968 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
3b058f6392 Merge remote-tracking branch 'micahlee/master' 2016-09-07 15:31:43 +02:00
Micah Lee
373f24e64b
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 2016-09-06 13:27:59 -07:00
Micah Lee
76937d5cb5
Move imports to module level 2016-09-06 13:17:55 -07:00
Micah Lee
7a46336149
Enable stdout in Windows, OSX CLI versions (#305) 2016-09-06 12:09:10 -07:00
Micah Lee
9c250fc4e4
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
e093c7298a Disable writing to stdout in Windows (fixes #304) 2016-09-06 18:44:35 -07:00
Micah Lee
7ab936cec2
Prevent canceling download from being confused with rate limit attacker 2016-09-06 10:18:50 -07:00
Micah Lee
8a40602574
Version bump to 0.9.1, and updated changelog 2016-09-06 10:09:46 -07:00
Ulrike Uhlig
7a8c5d9353 Merge remote-tracking branch 'micahlee/master' 2016-09-06 13:44:22 +02:00
Micah Lee
590edc5d6d 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
b7d1a7339c
Refactor onionshare GUI to use await_publication=True when using ephemeral onion services 2016-09-05 11:36:41 -07:00
Micah Lee
87761c6fce
Remove HSDirError exception, because it is no longer thrown 2016-09-05 11:32:30 -07:00
Micah Lee
360fb6cfcc
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
1372239ed7
Renamed hs to onion 2016-09-05 11:16:54 -07:00
Micah Lee
fbe512a2ea
Oops, I can't have a variable called os 2016-09-05 11:06:30 -07:00
Micah Lee
115345477a
Make sure tests can find the correct paths (fixes #284) 2016-09-05 10:41:20 -07:00
Micah Lee
22f104cf65
Fix strings tests, now that load_strings needs helpers as an arg 2016-09-04 20:02:20 -07:00
Micah Lee
acd8afeb80 Update build_exe.bat and NSIS installer config to support cx_Freeze 2016-09-05 02:54:25 -07:00
Micah Lee
db9d81ba90
Migrate from PyInstaller to cx_Freeze for OSX 2016-09-04 19:21:09 -07:00
Micah Lee
79938e9518
Version bump to 0.9.1-dev 2016-09-04 19:19:44 -07:00
Micah Lee
bba46e088f
Merge branch 'master' into cx_Freeze 2016-09-04 17:23:27 -07:00
Micah Lee
e2fb8b77cc Move license.txt into resources, so it will be bundled with Windows installer 2016-09-04 21:07:55 -07:00
Micah Lee
e192585668 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
0ad1311dd5 Update Windows build instructions 2016-09-04 20:14:04 -07:00
Micah Lee
52ef78a007 Build the cx_Freeze Windows GUI in window mode instead of console mode 2016-09-04 20:13:51 -07:00
Micah Lee
dbf4af02ac 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
7e8b3e1750 Oops, use spaces instead of tabs 2016-09-04 20:08:36 -07:00
Micah Lee
4ce64ed83e 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
8e8ea9c357 Added resources to cx_Freeze setup, and make those resources findable by the app 2016-09-04 19:54:45 -07:00
Micah Lee
3f1180c404 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
6ec5c15a0a Update Windows build instructions 2016-09-04 18:30:45 -07:00
Micah Lee
310d861ce0
Stop saying 'hidden service', start saying 'onion service' 2016-09-04 17:23:06 -07:00
Srinivas Devaki
3b11f4d382 small refactoring 2016-08-24 02:15:58 +05:30
Srinivas Devaki
c570d7ea77 added progress bar for zipping files 2016-08-24 01:43:21 +05:30
choltz95
6379ca5e48 very poor auto scrolling 2016-08-02 23:46:13 -04:00
choltz95
d0f085f756 reorganize, add comment 2016-08-02 16:43:40 +00:00
choltz95
b1dd45a94b wrap progress bar 2016-08-02 01:43:17 -04:00
Dan Ballard
d05fed16d4 add python3-nose for ubuntu 16.04 2016-06-17 07:53:31 -07:00
Micah Lee
1295399d34
Added python-nautilus as a dependency (#293) 2016-06-10 18:03:34 -07:00
Micah Lee
57dd6db166
Added a simple nautilus extension, written by the Subgraph developers (fixes #293) 2016-06-10 17:56:34 -07:00
Micah Lee
900276a524 Merge branch 'PabloCastellano-master' 2016-06-10 17:29:44 -07:00
Micah Lee
7a895d4117
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
cd2baff91f Merge branch 'master' of https://github.com/PabloCastellano/onionshare into PabloCastellano-master 2016-06-10 17:28:37 -07:00
Micah Lee
62e7035d3d
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