Micah Lee
|
ed2c55c097
|
Merge branch 'no_available_port_error' of https://github.com/mig5/onionshare into mig5-no_available_port_error
|
2017-12-06 16:14:21 -08:00 |
|
Micah Lee
|
5bb885c6ec
|
Merge branch 'mig5-dont_uncheck_timer_checkbox_on_stop'
|
2017-12-06 16:11:11 -08:00 |
|
Micah Lee
|
0158870172
|
Merge branch 'dont_uncheck_timer_checkbox_on_stop' of https://github.com/mig5/onionshare into mig5-dont_uncheck_timer_checkbox_on_stop
|
2017-12-06 16:03:23 -08:00 |
|
Miguel Jacq
|
235abd6042
|
Better wording for no_available_port error
|
2017-12-07 08:59:34 +11:00 |
|
Miguel Jacq
|
0aacfae925
|
Raise an error if we were unable to obtain a random port
|
2017-12-07 08:49:10 +11:00 |
|
Micah Lee
|
b94c671911
|
Merge branch 'wondratsch-master'
|
2017-12-06 12:02:28 -08:00 |
|
wondratsch
|
1efe4a6949
|
fix typo
|
2017-12-06 12:57:47 +01:00 |
|
wondratsch
|
787877c12b
|
add OpenBSD Support
|
2017-12-06 12:47:47 +01:00 |
|
Miguel Jacq
|
d500069398
|
Actually still uncheck the timer when the server stops, but *only* when it stops
|
2017-12-06 10:21:39 +11:00 |
|
Miguel Jacq
|
bddb9596d1
|
Don't uncheck the auto-stop timer when the server stops (adding new files before starting the share will otherwise uncheck it)
|
2017-12-06 10:02:22 +11:00 |
|
Micah Lee
|
58ec047a53
|
Merge branch '447_reload_tor_if_not_connected_and_settings_cancelled' of https://github.com/mig5/onionshare into mig5-447_reload_tor_if_not_connected_and_settings_cancelled
|
2017-12-05 14:05:16 -08:00 |
|
Micah Lee
|
44b5474249
|
Merge branch 'mig5-shutdown_timer'
|
2017-12-05 13:58:16 -08:00 |
|
Miguel Jacq
|
ba1f535dcb
|
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
|
eaa37206e5
|
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
|
7912ff148e
|
Merge branch 'mig5-431_filelist_minimum_height'
|
2017-12-04 15:27:05 -08:00 |
|
Miguel Jacq
|
fe311f591f
|
#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
|
17ba97becc
|
#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
|
884d8389ed
|
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
|
91a0c60189
|
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
|
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 |
|