Micah Lee
|
2cf6bd94e9
|
Merge branch 'cli-auto-exit' of https://github.com/kkka/onionshare into kkka-cli-auto-exit
Conflicts:
onionshare/onionshare.py
|
2014-09-15 18:44:45 +00:00 |
|
Micah Lee
|
b74a6856b7
|
Merge pull request #138 from r4v5/fix-cli-cleanup
Fixed CLI version to properly stop the webserver
|
2014-09-15 18:38:04 +00:00 |
|
Kali Kaneko
|
60385c43b3
|
complete /es/ locales
|
2014-09-13 13:25:14 -05:00 |
|
kkka
|
e33cfd621d
|
Fix CLI version to automatically exit when the server is shut down.
|
2014-09-07 10:35:17 +09:00 |
|
Mason Donahue
|
ea06ec19a1
|
Fixed CLI version to properly stop the webserver
|
2014-09-06 00:31:47 -05:00 |
|
Micah Lee
|
7b666654f3
|
adding image files to MANIFEST.in
|
2014-09-04 19:17:38 -07:00 |
|
Micah Lee
|
d73d859fed
|
fixed Windows/OSX image path problem, and updated NSIS Windows installer to install all the new .py files from refactoring
|
2014-09-04 13:20:39 -07:00 |
|
Micah Lee
|
3c071ce500
|
don't try stopping the web app if it hasn't started
|
2014-09-03 17:56:10 -07:00 |
|
Micah Lee
|
d00b296c47
|
moving image files into /usr/share instead of /usr/lib (fixes #126)
|
2014-09-03 17:50:06 -07:00 |
|
Micah Lee
|
8d01ad7ec6
|
moved images to subfolder (#126)
|
2014-09-03 17:36:03 -07:00 |
|
Micah Lee
|
bfcd5190bd
|
try connecting to Tor SOCKS5 server on ports 9050 and 9150, instead of just 9150 (#136)
|
2014-09-03 14:23:07 -07:00 |
|
Micah Lee
|
a314ca891d
|
Merge pull request #135 from lazlolazlolazlo/logo
Fix missing window icon
|
2014-09-03 14:07:20 -07:00 |
|
Micah Lee
|
69d7f94d4c
|
Merge branch 'lazlolazlolazlo-deprecated'
|
2014-09-03 14:06:53 -07:00 |
|
Micah Lee
|
65a7cf78cf
|
Merge branch 'deprecated' of https://github.com/lazlolazlolazlo/onionshare into lazlolazlolazlo-deprecated
Conflicts:
onionshare/strings.json
|
2014-09-03 14:06:41 -07:00 |
|
Micah Lee
|
c41dc68330
|
Merge pull request #133 from lazlolazlolazlo/nl
Update Dutch translation and add missing strings
|
2014-09-03 14:04:20 -07:00 |
|
Lazlo Westerhof
|
7c9dbb0caf
|
Fix missing window icon
|
2014-09-03 20:56:46 +02:00 |
|
Lazlo Westerhof
|
a07bc739d6
|
Remove unused translations
|
2014-09-03 20:51:26 +02:00 |
|
Lazlo Westerhof
|
ea7c4dd0a0
|
Update Dutch translation and add missing strings
|
2014-09-03 20:26:13 +02:00 |
|
Micah Lee
|
2c1534979e
|
squash bug in closing Flask web server (fixes #131)
|
2014-09-03 00:11:25 -07:00 |
|
Micah Lee
|
17646641f6
|
close the wait for HS connection after it successfully connects, because then flask is unresponsive until it times out
|
2014-09-02 18:32:59 -07:00 |
|
Micah Lee
|
4edcce9ece
|
add utf-8 encoding to all .py files
|
2014-09-02 17:30:01 -07:00 |
|
Micah Lee
|
e4f0e5e8b3
|
fixed test_load_strings_loads_other_languages, because french strings were updated
|
2014-09-02 17:26:59 -07:00 |
|
Micah Lee
|
8c9bcdad6d
|
Merge pull request #124 from kkka/fix-wait_for_hs-bug
Fix wait_for_hs bug when specifying --local-only
|
2014-09-02 17:23:00 -07:00 |
|
Micah Lee
|
c161003acd
|
Merge pull request #127 from u451f/translations
french translation
|
2014-09-02 17:22:39 -07:00 |
|
Micah Lee
|
de991c8498
|
Merge pull request #128 from u451f/translation-de
german translation
|
2014-09-02 17:22:20 -07:00 |
|
Micah Lee
|
b830438d60
|
including pysocks with onionshare, and updated code to use pysocks instead of socksipy (#118)
|
2014-09-02 17:21:19 -07:00 |
|
Micah Lee
|
3ce43a65b6
|
Merge pull request #120 from r4v5/fix-travis
Fix the travis build
|
2014-09-02 17:12:05 -07:00 |
|
u451f
|
2a349b1ab8
|
fix typo
|
2014-09-03 00:14:57 +02:00 |
|
u451f
|
61fa25f883
|
german translation
|
2014-09-03 00:07:54 +02:00 |
|
u451f
|
b832c1ed78
|
french translation - improved
|
2014-09-02 23:46:27 +02:00 |
|
u451f
|
de4de6317d
|
french translation
|
2014-09-02 23:41:47 +02:00 |
|
Micah Lee
|
a6e99fcc21
|
added GPLv3 license to each source file
|
2014-09-02 12:10:42 -07:00 |
|
kkka
|
a5b3d45d1e
|
Fix wait_for_hs bug when specifying --local-only
|
2014-09-02 00:04:41 +09:00 |
|
Mason Donahue
|
15a917c60e
|
Test fix: OnionShare object doesn't have a port until we tell it to get one.
|
2014-08-31 15:06:12 -05:00 |
|
Mason Donahue
|
ad2c776a5f
|
Fix socks import issue on Travis; socksipy is ancient and abandoned.
|
2014-08-31 15:04:26 -05:00 |
|
Mason Donahue
|
33bb6c5ed0
|
Add ctags to gitignore
|
2014-08-31 15:03:38 -05:00 |
|
Micah Lee
|
c49cc75a55
|
fixed Tails bug where if you stopped server in GUI, you could not start a new server again
|
2014-08-30 01:42:17 +00:00 |
|
Micah Lee
|
cf52c2dcd0
|
fix bug caused by refactoring that made Tails launch infinite onionshare processes (oops)
|
2014-08-30 01:10:58 +00:00 |
|
Micah Lee
|
53a965a143
|
Merge branch 'master' of github.com:micahflee/onionshare
|
2014-08-30 00:06:09 +00:00 |
|
Micah Lee
|
13bd114780
|
added python-socksipy to tails build
|
2014-08-30 00:06:02 +00:00 |
|
Micah Lee
|
8666fb77d3
|
Revert "trying to add socksipy from pip instead of apt-get"
This reverts commit 7b77088a21.
|
2014-08-29 16:48:28 -07:00 |
|
Micah Lee
|
7b77088a21
|
trying to add socksipy from pip instead of apt-get
|
2014-08-29 16:20:40 -07:00 |
|
Micah Lee
|
4e5cd4a7d1
|
adding python-socksipy to travis config
|
2014-08-29 16:14:48 -07:00 |
|
Micah Lee
|
0858366e31
|
remove gui_mode from web app, because it is no longer useful
|
2014-08-29 16:06:13 -07:00 |
|
Micah Lee
|
89bad45825
|
make other_page_loaded string shorter, to fit in status bar better
|
2014-08-29 16:02:56 -07:00 |
|
Micah Lee
|
e90d90b7d5
|
keep some status bar messages around for longer
|
2014-08-29 15:57:44 -07:00 |
|
Micah Lee
|
0a28ad4538
|
can't stop a server before it has finished starting
|
2014-08-29 15:50:19 -07:00 |
|
Micah Lee
|
d1cd3c83ab
|
added status bar to GUI, populated it with useful status messages
|
2014-08-29 15:43:07 -07:00 |
|
Micah Lee
|
6688ced698
|
waits for hs to be ready in GUI too (#116)
|
2014-08-29 14:35:25 -07:00 |
|
Micah Lee
|
846b10b755
|
waits for hidden service before displaying URL. fixes #116
|
2014-08-29 14:32:19 -07:00 |
|