Micah Lee
7fb2ce4d49
Merge branch 'delirious-lettuce-format_seconds'
2017-05-30 11:47:58 -07:00
Micah Lee
da0a2d1930
Merge branch 'format_seconds' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-format_seconds
2017-05-30 11:44:44 -07:00
Micah Lee
3c1a568a6a
Merge branch 'delirious-lettuce-socket_context_manager'
2017-05-30 11:41:07 -07:00
Delirious Lettuce
5880741c9d
Fix issue mentioned by @mig5
2017-05-26 10:12:11 -06:00
Delirious Lettuce
979242b478
Use divmod to simplify the calculations, seconds==0 -> '0s'
2017-05-24 22:20:50 -06:00
Delirious Lettuce
d4477ff617
* Use context manager inside of get_available_port
...
* Rearrange imports, one per line
* Reuse original `import random` for `random.SystemRandom` (instead of a separate `from random import SystemRandom`)
* Two blank lines above each function definition
2017-05-24 21:20:07 -06:00
Micah Lee
d25c6d949f
Merge branch 'delirious-lettuce-build_slug'
2017-05-24 14:04:49 -07:00
Micah Lee
5c02bbffa3
Merge branch 'build_slug' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-build_slug
2017-05-24 14:04:06 -07:00
Micah Lee
63b45d348e
Merge branch 'mig5-fix_shutdown_from_gui'
2017-05-24 14:02:45 -07:00
Micah Lee
3e329b1bac
Merge branch 'fix_shutdown_from_gui' of https://github.com/mig5/onionshare into mig5-fix_shutdown_from_gui
2017-05-24 14:00:50 -07:00
Delirious Lettuce
bf7735821c
Removing '\n' arg negates the need for wordlist.remove(), renamed unused variable 'x' to '_'
2017-05-24 13:22:41 -06:00
Micah Lee
19f2fca2c1
Version bump to 1.1.dev2
2017-05-23 15:24:05 -07:00
Micah Lee
af65855f97
Updated changelog
2017-05-23 15:21:54 -07:00
Micah Lee
a6bd77d18a
Merge branch 'mig5-remove_resource_warnings_on_unclosed_files'
2017-05-23 15:20:23 -07:00
Micah Lee
befc253d4b
Fix indenting
2017-05-23 15:16:27 -07:00
Miguel Jacq
36de1951e7
open files via the 'with' statement, to avoid ResourceWarnings on unclosed files
2017-05-23 21:22:14 +10:00
Micah Lee
444f50868d
Remove the extra instances of the Settings object, and only use OnionShareGui.settings
2017-05-22 17:11:41 -07:00
Micah Lee
5846b06478
Reload Settings whenever the settings get saved in SettingsDialog
2017-05-22 17:08:05 -07:00
Micah Lee
e626a410f3
Merge branch 'fix_stay_open' of https://github.com/mig5/onionshare into mig5-fix_stay_open
2017-05-22 17:03:01 -07:00
Micah Lee
8745ff179b
Merge branch 'mig5-add_help_button'
2017-05-22 16:46:20 -07:00
Micah Lee
e97d1e6ce3
Merge branch 'add_help_button' of https://github.com/mig5/onionshare into mig5-add_help_button
2017-05-22 16:44:10 -07:00
Micah Lee
b170ec536e
Update desktop notification settings text
2017-05-22 16:38:46 -07:00
Micah Lee
2e8b9f39bf
Update desktop notification text
2017-05-22 16:35:59 -07:00
Micah Lee
63e491bddf
Add a grayscale OnionShare logo for the systray icon in macOS
2017-05-22 16:23:19 -07:00
Micah Lee
65894e2e44
Make systray exit action call OnionShareGui.close() instead of sys.exit(), to give OnionShare a chance to warn users of open servers, and to gracefully shut down
2017-05-22 16:19:44 -07:00
Miguel Jacq
13a2ad2147
get settings from self rather than instantiate a new Settings object
2017-05-23 09:15:52 +10:00
Micah Lee
02216f246b
Merge branch '285_systray_notifications' of https://github.com/mig5/onionshare into mig5-285_systray_notifications
2017-05-22 16:15:06 -07:00
Micah Lee
de4739e458
Merge branch 'mig5-select_multiple_folders'
2017-05-22 16:11:06 -07:00
Micah Lee
e828b2f9cd
Use non-native QFileDialog for file selection as well as directory selection, to have a consistent UI
2017-05-22 16:10:55 -07:00
Micah Lee
9385487c10
Merge branch 'select_multiple_folders' of https://github.com/mig5/onionshare into mig5-select_multiple_folders
2017-05-22 16:04:56 -07:00
Miguel Jacq
8bc280ff7a
Refactor help button to use QDesktopServices.openUrl()
2017-05-23 08:30:24 +10:00
Micah Lee
f01bd30263
Merge branch 'mig5-362-more-descriptive-html'
2017-05-22 15:22:41 -07:00
Micah Lee
a10f8d6de4
Merge branch '362-more-descriptive-html' of https://github.com/mig5/onionshare into mig5-362-more-descriptive-html
2017-05-22 15:20:27 -07:00
Micah Lee
a513c8b6df
Don't load strings directly in the web module. It isn't needed anymore, and it's preventing tests from passing in travis-ci
2017-05-22 15:02:22 -07:00
Micah Lee
174c03e892
Remove version string from http response headers, to avoid any information disclosure about the sender's server
2017-05-22 14:58:23 -07:00
Micah Lee
e01716bca9
Merge branch '253-security-headers' of https://github.com/mig5/onionshare into mig5-253-security-headers
2017-05-22 14:56:32 -07:00
Micah Lee
ae3038521c
Merge branch 'mig5-387-build-script-logic-fix'
2017-05-22 14:07:33 -07:00
Micah Lee
f1c783cf63
Merge branch '387-build-script-logic-fix' of https://github.com/mig5/onionshare into mig5-387-build-script-logic-fix
2017-05-22 14:07:25 -07:00
Micah Lee
d8af493ae0
Merge branch 'mig5-392-remove-symlink'
2017-05-22 14:03:42 -07:00
Micah Lee
54017d595c
Merge branch '392-remove-symlink' of https://github.com/mig5/onionshare into mig5-392-remove-symlink
2017-05-22 14:03:14 -07:00
Micah Lee
c056005696
Merge branch 'mig5-fix_double_slash_in_update_checker_url'
2017-05-22 14:01:38 -07:00
Micah Lee
0ab5b8b366
Merge branch 'fix_double_slash_in_update_checker_url' of https://github.com/mig5/onionshare into mig5-fix_double_slash_in_update_checker_url
2017-05-22 14:00:50 -07:00
Miguel Jacq
3766a6048d
Add desktop notification messages on download events (via systray)
2017-05-22 16:47:23 +10:00
Miguel Jacq
d6332c8f95
Adjust folder dialog caption to be plural
2017-05-21 16:25:15 +10:00
Miguel Jacq
041fed1923
Adjust French translation for the dialog caption to be plural
2017-05-21 16:23:48 +10:00
Miguel Jacq
b35e3b76d5
Make it possible to select multiple folders by using non-native QFileDialog
2017-05-21 16:14:32 +10:00
Miguel Jacq
16f4d5f3ca
use the actual OnionShare version as the Server header string
2017-05-21 10:30:37 +10:00
Miguel Jacq
38ee7fde21
Remove duplication of security headers
2017-05-21 10:03:18 +10:00
Miguel Jacq
3641f376b7
Reinstate the alternative method of shutting down the web server - necessary for clicking 'Stop sharing' from GUI
2017-05-20 17:37:12 +10:00
Miguel Jacq
f446f6630d
Send stay_open variable in the right place, so that it really does stay open if we said so
2017-05-20 16:59:13 +10:00
