thomas
c9decaba05
Merge branch 'master' into receiverMode
...
Conflicts:
onionshare/onionshare.py
2014-08-17 00:59:57 -04:00
twhite
32e4bed660
Will only receive one file if --stay-open isn't True
...
Added a way to shutdown onionshare without ^C (maybe we could forward to this address/send a request with the code in the request body?)
Receiver mode and sending mode cannot be run at the same time. However one of them needs to be set to True for onionshare to run
2014-08-17 00:56:30 -04:00
twhite
680d3f215a
Submit for now allows for the sender to add the SHA1 hash if they pre-generated it. This information is passed along to the receiver in the console.
2014-07-30 15:07:42 -04:00
Thomas White
becc8dc58e
added the ability to designate where the file will be saved
2014-07-29 23:05:41 -04:00
twhite
c770e0386e
File transfers can now be reversed with the --receive flag when launching onionshare.py. The receive_mode.html now has variables that allows it to be reused when the user sends the file. The except Exception as e in receive_file() is just there in case I need to debug later. This mode is not yet accessable with the GUI (though that is getting reworked so I don't know if I should try to get it to work with the current GUI) and there is no progress bar, but it is a good start for getting #97 done.
2014-07-29 17:05:00 -04:00
twhite
caedcd836c
Some changes with strings.json are to counteract what I did in master (Why would I ever develop in master?) Added a new HTML file for when in receive mode and changed filename arg to --filename. This was to make --receive and --filename mutually exclusive.
2014-07-29 13:55:41 -04:00
twhite
53685c96b3
Set up initial method for receiving and saving files. this only works for windows right now (I think)
2014-07-29 11:56:48 -04:00
twhite
9702b18096
re-added the __init__.py in onionshare_gui after deleting it accidentally
2014-07-21 12:08:22 -04:00
twhite
c02263230a
Merge remote-tracking branch 'upstream/master'
2014-07-21 11:00:04 -04:00
Micah Lee
e8cc7c3a4a
fixed issue with pyinstaller packaging Qt4 on some OSX
2014-07-16 04:48:01 -07:00
Micah Lee
90a22f7249
version bump
2014-07-16 02:30:30 -07:00
Micah Lee
542cec15c6
add Content-Security-Policy so if there are other xss vulns they won't execute
2014-07-16 02:19:22 -07:00
Micah Lee
7a05516a65
use hash of /dev/urandom data instead of urandom data directly, to avoid leaking state of entropy
2014-07-15 19:17:09 -07:00
Micah Lee
d9aa55b991
fixed critical XSS bug that can deanonymize user
2014-07-15 19:13:44 -07:00
Micah Lee
2edde2eb1f
Encoded strings passed to constant_time_compare as ascii, because it was
...
throwing errors in OSX. Also added --debug to command line version, and made onionshare server
log errors as well as the GUI.
2014-07-07 17:01:51 -07:00
Micah Lee
ad284f98a4
Merge pull request #88 from lazlolazlolazlo/patch-3
...
Add missing Dutch translation string
2014-07-04 20:52:53 -07:00
Micah Lee
ac1c921095
version bump to 0.4dev
2014-07-04 13:06:35 -07:00
Lazlo
be8358175d
Add missing Dutch translation string
2014-07-04 21:02:54 +02:00
Micah Lee
c1bec61e8d
Merge pull request #86 from garrettr/push-hook
...
add push hook that runs test suite
2014-07-03 17:33:27 -07:00
Garrett Robinson
42adc90abc
add push hook that runs test suite
2014-07-03 15:13:39 -07:00
Micah Lee
0e830b319d
Merge pull request #84 from garrettr/constant-time-routes
...
constant time compare the slug to avoid timing attacks
2014-07-03 13:20:02 -07:00
Garrett Robinson
426d744d58
constant time compare the slug to avoid timing attacks
2014-07-03 13:06:46 -07:00
Micah Lee
05ec78dc34
Merge pull request #73 from rufoa/patch-1
...
fix iptables rule removal
2014-07-01 11:05:37 -07:00
rufoa
7317d929bf
fix iptables rule removal
...
tails_close_port should remove the previously added ACCEPT rule, rather than inserting an explicit REJECT rule. This ensures the firewall is restored to its original state, which may not necessarily have had a REJECT rule on that port.
2014-06-30 18:09:20 +01:00
twhite
c73d3effc8
Merge remote-tracking branch 'origin/master'
...
Conflicts:
onionshare_gui/onionshare.py
onionshare_gui/onionshare_gui.py
onionshare_gui/webapp.py
2014-06-30 11:14:58 -04:00
twhite
5f742f2002
Working on #44 (for English), need to test how torbrowser-launcher works on linux
2014-06-30 11:14:06 -04:00
twhite
7f0d3b836f
Merge branch 'master' of https://github.com/micahflee/onionshare
2014-06-30 10:25:09 -04:00
twhite
3bb0f1c53c
commit for pull
2014-06-30 10:25:01 -04:00
Micah Lee
1036ae68ff
version bump from 0.3dev to 0.3
2014-06-29 18:37:53 -04:00
Micah Lee
2eee6caa63
updated changelog
2014-06-29 18:17:20 -04:00
Micah Lee
64eb557240
Merge branch 'djsmith85-patch-1'
2014-06-29 00:43:39 -07:00
Micah Lee
1243b234bc
Merge branch 'patch-1' of https://github.com/djsmith85/onionshare into djsmith85-patch-1
...
Conflicts:
onionshare/strings.json
2014-06-29 00:43:27 -07:00
Micah Lee
e92a73f121
Merge pull request #67 from komachi/master
...
Add Russian translation (and make "Copy URL" translatable)
2014-06-29 00:41:46 -07:00
djsmith85
1fbb2cda43
Added German translations
2014-06-29 03:56:15 +02:00
Anton Nesterov
1a8a42a43d
Add Russian translation (and make "Copy URL" translatable)
2014-06-29 03:11:04 +04:00
Micah Lee
96009048b3
updated readme, added link to https://onionshare.org/ for binaries
2014-06-27 21:26:11 -04:00
Micah Lee
9a2d5863cf
better compression for windows installer, making it 13mb instead of 19mb
2014-06-27 19:07:20 -04:00
Micah Lee
91abbca21e
Merge branch 'master' of github.com:micahflee/onionshare
2014-06-27 18:18:50 -04:00
Micah Lee
00261f1866
fixes windows packaging issue
2014-06-27 18:18:43 -04:00
Micah Lee
0be38a0898
Merge pull request #65 from cryptostone/master
...
Update Spanish strings
2014-06-26 21:34:01 -07:00
Michael Ball
a81ca4e8b8
Update strings.json
2014-06-26 19:44:26 -06:00
Michael Ball
9a8df2ae4a
Update strings.json
2014-06-26 19:44:09 -06:00
Michael Ball
c005aba5c9
Update Spanish strings
2014-06-26 18:41:29 -06:00
Micah Lee
fc97e45295
Merge pull request #61 from joke2k/0.3/ita
...
update italian translation for 0.3
2014-06-26 16:05:49 -07:00
Micah Lee
126200c9c1
Merge pull request #62 from enotodden/master
...
Add new norwegian strings and fix unicode issues.
2014-06-26 16:05:21 -07:00
Micah Lee
6503f2afa1
implemeted debug mode. fixes #50
2014-06-26 19:02:59 -04:00
Micah Lee
9bf8814a92
simplified windows build system, and only include .pyc and not .py in windows installer package
2014-06-26 18:57:28 -04:00
Espen Kåsa Notodden
4e5eb62dca
Merge branch 'master' of https://github.com/micahflee/onionshare
2014-06-26 22:51:20 +02:00
Espen Kåsa Notodden
10f8600e54
use the translated() function in onionshare_gui
2014-06-26 22:37:25 +02:00
Espen Kåsa Notodden
eb69586b12
New norwegian translations.
2014-06-26 22:36:42 +02:00
