Micah Lee
|
42debc7cf1
|
Merge branch 'mig5-shutdown_timer'
|
2017-12-05 13:58:16 -08:00 |
|
Miguel Jacq
|
1cd4b9ec24
|
Better wording when OnionShare can't connect to Tor and the attempt to configure settings is canceled
|
2017-12-05 11:27:16 +11:00 |
|
Miguel Jacq
|
721ac80c84
|
Let the timer stop the share if there were no downloads, or all downloads are done
|
2017-12-05 11:18:26 +11:00 |
|
Micah Lee
|
ba6c8c34f2
|
Merge branch 'mig5-431_filelist_minimum_height'
|
2017-12-04 15:27:05 -08:00 |
|
Miguel Jacq
|
8f4bd32bea
|
#447 show alert and exit if the Settings dialog is canceled yet Tor is still not connected
|
2017-12-04 18:43:40 +11:00 |
|
Miguel Jacq
|
cd83d90ef1
|
#431 Set minimum height of FileList to prevent resize bug affecting scrolling/visibility of bottom rows
|
2017-12-04 16:39:22 +11:00 |
|
Miguel Jacq
|
3fc360a0ae
|
Update comment to reflect that we don't hide the timer checkbox when checked anymore
|
2017-12-04 15:22:46 +11:00 |
|
Miguel Jacq
|
6d02d2ef91
|
Better fix for preventing timeout firing if a download is not yet done (works for CLI as well as GUI)
|
2017-12-04 15:03:28 +11:00 |
|
Miguel Jacq
|
f6763b25ef
|
Merge master branch and fix conflicts
|
2017-12-03 17:06:33 +11:00 |
|
Miguel Jacq
|
487cd6c799
|
Don't auto-stop the share if a download is still in progress
|
2017-12-03 13:21:25 +11:00 |
|
Miguel Jacq
|
501d771064
|
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
|
b0aae09f70
|
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
|
e54836a69a
|
Allow for localization for "Share via OnionShare" string in the nautilus extension
|
2017-12-01 12:57:18 -08:00 |
|
Micah Lee
|
3ed0c38205
|
Merge branch 'mig5-468_canceled_feedback_on_stopped_server'
|
2017-12-01 11:51:02 -08:00 |
|
Micah Lee
|
4c1a10b1d2
|
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
|
e4804e5594
|
Merge branch 'mig5-fix_tor_connection_progress_bar'
|
2017-11-30 18:04:19 -08:00 |
|
Micah Lee
|
9c19239f33
|
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
|
3f57199b2e
|
Merge branch 'mig5-404_response'
|
2017-11-30 18:01:28 -08:00 |
|
Micah Lee
|
df49baaadd
|
Merge branch '404_response' of https://github.com/mig5/onionshare into mig5-404_response
|
2017-11-30 18:01:18 -08:00 |
|
Micah Lee
|
94387c6986
|
Merge branch 'mig5-442_use_looseversion'
|
2017-11-30 17:58:39 -08:00 |
|
Micah Lee
|
d5d8d2495a
|
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
|
4c3dcf50ea
|
Merge branch 'fixes' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-fixes
|
2017-11-30 17:54:24 -08:00 |
|
Micah Lee
|
9b1dd9430d
|
Merge branch 'kushaldas-rpmlint'
|
2017-11-30 15:49:56 -08:00 |
|
Kushal Das
|
2a3e7b3b14
|
Mentions python2 as the interpreter
|
2017-11-28 04:09:33 +05:30 |
|
Micah Lee
|
f56df5be46
|
Allow tests to find share folders when building .deb
|
2017-11-20 16:19:04 -08:00 |
|
Micah Lee
|
fac6debe32
|
Rename test files to have test_ prefix
|
2017-11-20 15:52:33 -08:00 |
|
Miguel Jacq
|
2f4d8610c8
|
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
|
4a2f5daaf8
|
Better wording for shutdown timer
|
2017-11-12 11:48:06 +11:00 |
|
Miguel Jacq
|
bcb61f3627
|
Format the argparser output better, to deal with the longer argument names
|
2017-11-12 10:40:04 +11:00 |
|
Miguel Jacq
|
a4a4035e10
|
better metavar for --shutdown-timeout arg
|
2017-11-11 17:12:10 +11:00 |
|
Miguel Jacq
|
ee9dfb7a8b
|
No longer treating shutdown_timeout as a float, but an int of seconds
|
2017-11-09 19:50:50 +11:00 |
|
Miguel Jacq
|
d6324080ac
|
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
|
183b149bc6
|
undo removal of newline in web.py
|
2017-11-09 18:01:09 +11:00 |
|
Miguel Jacq
|
f9d7cce90a
|
send a HTTP 404 code instead of 200, on 404 pages
|
2017-11-09 17:51:34 +11:00 |
|
Miguel Jacq
|
7ac6bfa215
|
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
|
ef92f92c40
|
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
|
16f34ca49e
|
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
|
5bc1a45a1e
|
set the timeout default to 5 minutes into the future for convenience
|
2017-11-09 11:56:02 +11:00 |
|
Miguel Jacq
|
daafd53446
|
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
|
abec0b037b
|
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
|
f2ae2eb778
|
ensure the shutdown timeout can't go backwards in time
|
2017-11-09 11:34:59 +11:00 |
|
Miguel Jacq
|
f5b45539b0
|
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
|
89129a2ca7
|
remove shutdown_timeout logic in the web server, it's not actually needed
|
2017-11-09 07:12:00 +11:00 |
|
Miguel Jacq
|
c6f36e2086
|
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
|
263d0a102b
|
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
|
d59462fcbe
|
#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
|
ca4f10d35c
|
Delete temporary tor data directory during cleanup
|
2017-07-13 18:14:49 -06:00 |
|
Delirious Lettuce
|
5aedac5143
|
Reorder imports, spacing, use tempfile.gettempdir
|
2017-07-10 20:40:01 -06:00 |
|
Delirious Lettuce
|
5fd3973983
|
Reorder imports, use json.load(f)
|
2017-07-10 20:13:30 -06:00 |
|
Delirious Lettuce
|
b59a442bf1
|
Reorder imports, remove p, use ext, use json.load(f)
|
2017-07-10 20:11:04 -06:00 |
|