Micah Lee
eb00a29ca7
Merge branch 'master' of https://github.com/eightnoteight/onionshare into eightnoteight-master
...
Conflicts:
onionshare/web.py
onionshare_gui/onionshare_gui.py
resources/locale/cs.json
resources/locale/eo.json
resources/locale/nl.json
This merge required quite a bit of refactoring because.
2016-12-22 16:00:06 -08:00
Micah Lee
a67a037885
Merge branch 'choltz95-wrap-progress-bar'
2016-12-22 15:15:50 -08:00
Micah Lee
4bafd1eb2a
Hide downloads progress bars until download starts, and improve the look of progress bar display
2016-12-22 15:15:37 -08:00
Micah Lee
28df4e40c5
Merge branch 'wrap-progress-bar' of https://github.com/choltz95/onionshare into choltz95-wrap-progress-bar
2016-12-22 14:43:03 -08:00
Micah Lee
0f36354dc5
Removing instructions from readme, and adding link to wiki instead
2016-12-22 13:43:07 -08:00
Micah Lee
e46c4f510a
Add support for Tor control port authentication
2016-12-22 13:39:32 -08:00
Micah Lee
5ebc745d60
Merge branch 'u451f-apparmor'
2016-12-21 23:16:51 -08:00
Micah Lee
f2dbced33d
Merge branch 'apparmor' of https://github.com/u451f/onionshare into u451f-apparmor
2016-12-21 23:16:42 -08:00
Micah Lee
9cd41bf112
Merge branch 'b3sigma-shutdowncrashfix'
2016-12-21 23:14:10 -08:00
Micah Lee
05e25b120a
Merge branch 'shutdowncrashfix' of https://github.com/b3sigma/onionshare into b3sigma-shutdowncrashfix
2016-12-21 23:08:33 -08:00
Micah Lee
1d49a1e15c
Merge branch 'commandnotfound-sanitize_filenames'
2016-12-21 22:56:34 -08:00
Micah Lee
cff11cd7e4
Replaced sanitize_html() function that was based on regex with python3's html.escape()
2016-12-21 22:56:15 -08:00
Micah Lee
737d1697b7
Merge branch 'sanitize_filenames' of https://github.com/commandnotfound/onionshare into commandnotfound-sanitize_filenames
2016-12-21 21:53:00 -08:00
Micah Lee
31bbedf57d
Merge branch 'commandnotfound-improved_wordlist'
2016-12-21 21:48:05 -08:00
Sigma
58d8f55a63
Fix crash when tor is closed first and then onionshare is closed and a stem.SocketClosed exception is raised.
2016-12-20 01:44:20 -08:00
Emmanuel Morales
11c5f5b699
Added a function to remove HTML from file and directory names
2016-12-18 21:07:38 -08:00
Emmanuel Morales
ddce359298
Replaced wordlist with well researched and more usable wordlist from EFF
2016-12-17 17:05:53 -08:00
Ulrike Uhlig
9bc87b2d1f
Icons should simply be readable
2016-11-19 21:27:57 +01:00
Ulrike Uhlig
b5aa66c239
AppArmor profiles for Onionshare, written by Tails developers
2016-11-19 21:26:57 +01:00
Ulrike Uhlig
1d031739c5
Merge branch 'master' of https://github.com/micahflee/onionshare
2016-11-19 21:20:57 +01:00
Micah Lee
ae760a15c8
Update changelog and version bump to 0.9.2
2016-11-13 13:07:14 -08:00
Micah Lee
27bb8216c1
Merge branch 'xSmurf-importfix'
2016-11-13 11:39:28 -08:00
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
