Miguel Jacq
|
2eb7bca242
|
Merge master branch and fix conflicts
|
2017-12-03 17:06:33 +11:00 |
|
Miguel Jacq
|
3b52f584a1
|
Don't auto-stop the share if a download is still in progress
|
2017-12-03 13:21:25 +11:00 |
|
Miguel Jacq
|
6ad2737d08
|
Properly stop the server when the timeout is reached (and reset the interface so we can share again)
|
2017-12-02 14:53:38 +11:00 |
|
Miguel Jacq
|
454a6a638b
|
Always show the shutdown timer checkbox, in case the user changes their mind and wants to unset it
|
2017-12-02 14:48:44 +11:00 |
|
Micah Lee
|
9910ea5c72
|
Allow for localization for "Share via OnionShare" string in the nautilus extension
|
2017-12-01 12:57:18 -08:00 |
|
Micah Lee
|
1d5fb3d4a9
|
Merge branch 'mig5-468_canceled_feedback_on_stopped_server'
|
2017-12-01 11:51:02 -08:00 |
|
Micah Lee
|
c664a9d3aa
|
Merge branch '468_canceled_feedback_on_stopped_server' of https://github.com/mig5/onionshare into mig5-468_canceled_feedback_on_stopped_server
|
2017-12-01 11:44:33 -08:00 |
|
Micah Lee
|
4432654c54
|
Merge branch 'mig5-fix_tor_connection_progress_bar'
|
2017-11-30 18:04:19 -08:00 |
|
Micah Lee
|
bfeeb2a1b7
|
Merge branch 'fix_tor_connection_progress_bar' of https://github.com/mig5/onionshare into mig5-fix_tor_connection_progress_bar
|
2017-11-30 18:03:09 -08:00 |
|
Micah Lee
|
2a8a60a50b
|
Merge branch 'mig5-404_response'
|
2017-11-30 18:01:28 -08:00 |
|
Micah Lee
|
e7a2b0a277
|
Merge branch '404_response' of https://github.com/mig5/onionshare into mig5-404_response
|
2017-11-30 18:01:18 -08:00 |
|
Micah Lee
|
e824682c2a
|
Merge branch 'mig5-442_use_looseversion'
|
2017-11-30 17:58:39 -08:00 |
|
Micah Lee
|
2ab4b68bb7
|
Merge branch '442_use_looseversion' of https://github.com/mig5/onionshare into mig5-442_use_looseversion
|
2017-11-30 17:58:25 -08:00 |
|
Micah Lee
|
2da13ba1fa
|
Merge branch 'fixes' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-fixes
|
2017-11-30 17:54:24 -08:00 |
|
Micah Lee
|
a7f1f4bf18
|
Merge branch 'kushaldas-rpmlint'
|
2017-11-30 15:49:56 -08:00 |
|
Kushal Das
|
31126b410d
|
Mentions python2 as the interpreter
|
2017-11-28 04:09:33 +05:30 |
|
Micah Lee
|
d544a0341f
|
Allow tests to find share folders when building .deb
|
2017-11-20 16:19:04 -08:00 |
|
Micah Lee
|
21e1dac2c3
|
Rename test files to have test_ prefix
|
2017-11-20 15:52:33 -08:00 |
|
Miguel Jacq
|
966beb9406
|
add missing arg to onion.connect() (config) which broke the Tor Connection progress dialog (regression from b19f8f)
|
2017-11-12 17:53:40 +11:00 |
|
Miguel Jacq
|
af2bef632d
|
Better wording for shutdown timer
|
2017-11-12 11:48:06 +11:00 |
|
Miguel Jacq
|
624028e49f
|
Format the argparser output better, to deal with the longer argument names
|
2017-11-12 10:40:04 +11:00 |
|
Miguel Jacq
|
275f345604
|
better metavar for --shutdown-timeout arg
|
2017-11-11 17:12:10 +11:00 |
|
Miguel Jacq
|
f220058c63
|
No longer treating shutdown_timeout as a float, but an int of seconds
|
2017-11-09 19:50:50 +11:00 |
|
Miguel Jacq
|
882057eafc
|
only prevent the share from starting when the timeout has expired, if the timeout feature was even set at all
|
2017-11-09 18:23:11 +11:00 |
|
Miguel Jacq
|
877459a560
|
undo removal of newline in web.py
|
2017-11-09 18:01:09 +11:00 |
|
Miguel Jacq
|
bb46c2de99
|
send a HTTP 404 code instead of 200, on 404 pages
|
2017-11-09 17:51:34 +11:00 |
|
Miguel Jacq
|
ac0e375a4b
|
Various safety checks to prevent a share from starting after the timeout has expired. Also enforce that a timeout lands right on the minute and not precisely when the user clicks start (e.g mid-minute), to avoid confusion that a share might be lingering longer than desired
|
2017-11-09 17:26:32 +11:00 |
|
Miguel Jacq
|
9aabc51edc
|
On subsequent shares, the default time should nudge 5 minutes ahead of the current time again, instead of 5 minutes since the time OnionShare was opened
|
2017-11-09 12:52:44 +11:00 |
|
Miguel Jacq
|
b618d8c15d
|
Calculate the time difference in a more appropriate spot (rather than on clicking Start, but when the server is ready, as it may have taken some time, but should still stop at the nominated time)
|
2017-11-09 12:35:38 +11:00 |
|
Miguel Jacq
|
44fb6c69ae
|
set the timeout default to 5 minutes into the future for convenience
|
2017-11-09 11:56:02 +11:00 |
|
Miguel Jacq
|
2dd6c5527d
|
ensure the timeout checkbox is always shown if the server is stopped and it was not already checked
|
2017-11-09 11:49:01 +11:00 |
|
Miguel Jacq
|
d49e7cf1d1
|
more UI fixes - hide checkbox if server is working/started and it was not checked. Ensure we only set the timer if the timeout checkbox was checked to begin with
|
2017-11-09 11:46:26 +11:00 |
|
Miguel Jacq
|
9657df282e
|
ensure the shutdown timeout can't go backwards in time
|
2017-11-09 11:34:59 +11:00 |
|
Miguel Jacq
|
481f33c822
|
use QDateTimeEdit instead of a spinbox for selecting a future date/time to auto-stop share
|
2017-11-09 11:29:55 +11:00 |
|
Miguel Jacq
|
a4b8a71c68
|
remove shutdown_timeout logic in the web server, it's not actually needed
|
2017-11-09 07:12:00 +11:00 |
|
Miguel Jacq
|
32108dcca2
|
Implements a shutdown timer to stop a share automatically (downloaded or not) after N hours
|
2017-11-08 20:25:59 +11:00 |
|
Miguel Jacq
|
53faa043f9
|
use LooseVersion instead of StrictVersion, so that upstream versions of Flask that contain -dev will still work. Fixes #442
|
2017-11-06 09:16:55 +11:00 |
|
Miguel Jacq
|
5edd4dd22c
|
#468 If the server is stopped before a download is completed, emit the Canceled message in the progress bar
|
2017-11-03 12:58:45 +11:00 |
|
Delirious Lettuce
|
0fb556baf2
|
Delete temporary tor data directory during cleanup
|
2017-07-13 18:14:49 -06:00 |
|
Delirious Lettuce
|
18545b7aa2
|
Reorder imports, spacing, use tempfile.gettempdir
|
2017-07-10 20:40:01 -06:00 |
|
Delirious Lettuce
|
56109a7012
|
Reorder imports, use json.load(f)
|
2017-07-10 20:13:30 -06:00 |
|
Delirious Lettuce
|
301465a49a
|
Reorder imports, remove p, use ext, use json.load(f)
|
2017-07-10 20:11:04 -06:00 |
|
Delirious Lettuce
|
52d16d21f7
|
Remove: unused import, round, formatting indexes. Use tuple
|
2017-07-10 20:00:19 -06:00 |
|
Micah Lee
|
4387589b4f
|
Merge branch 'mig5-440_settings_menu_button_disable'
|
2017-07-09 14:19:08 -07:00 |
|
Micah Lee
|
5435a4b046
|
Merge branch 'mig5-438_settings_icon_inactive'
|
2017-07-09 14:16:29 -07:00 |
|
Micah Lee
|
882ade94c7
|
Merge branch 'mig5-custom_config'
|
2017-07-09 14:12:49 -07:00 |
|
Micah Lee
|
dee616e8cb
|
Merge branch 'mig5-433_reset_downloads_on_fresh_share'
|
2017-07-09 13:19:26 -07:00 |
|
Micah Lee
|
62b0409e86
|
Merge branch 'mig5-428_fix_order'
|
2017-07-09 13:11:35 -07:00 |
|
Micah Lee
|
2a8a7fd634
|
Merge branch 'delirious-lettuce-test_onionshare_common'
|
2017-07-09 10:59:00 -07:00 |
|
Micah Lee
|
1785cb64e8
|
Remove references to nosetests, and replace them with pytest
|
2017-07-09 10:55:16 -07:00 |
|