Micah Lee
67da71c410
Merge branch 'mig5-onion_cleanup_on_stop_server'
2018-01-12 18:57:36 -08:00
Micah Lee
9eb4131839
Merge branch 'onion_cleanup_on_stop_server' of https://github.com/mig5/onionshare into mig5-onion_cleanup_on_stop_server
2018-01-12 18:56:03 -08:00
Micah Lee
5c390f1bd9
Merge branch 'intrigeri-bugfix/nautilus-extension-dont-spam-logs'
2017-12-07 14:32:07 -08:00
Micah Lee
149e6a15d0
Merge branch 'bugfix/nautilus-extension-dont-spam-logs' of https://github.com/intrigeri/onionshare into intrigeri-bugfix/nautilus-extension-dont-spam-logs
2017-12-07 14:30:22 -08:00
intrigeri
4da79cac79
Nautilus extension: avoid spamming the logs due to missing method.
...
Without this change I see a dozen or so warnings in the Journal:
nautilus_menu_provider_get_background_items: assertion
'NAUTILUS_IS_MENU_PROVIDER (provider)' failed
Nautilus upstream developers are going to discuss if/how they want to address
this on their side; in the meantime they recommend simply adding a no-op method
to silence the logs, so here we go.
2017-12-07 06:04:48 +00:00
Miguel Jacq
a12f9ed4d8
cleanup the ephemeral hidden service when GUI server is stopped, but don't disconnect from Tor
2017-12-07 16:10:52 +11:00
Micah Lee
be0dbc5c64
Upgrade Windows and Mac version of bundled Tor to 0.3.1.8
2017-12-06 16:37:10 -08:00
Micah Lee
c9190f9d9a
Merge branch 'mig5-no_available_port_error'
2017-12-06 16:15:34 -08:00
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
