932 Commits

Author SHA1 Message Date
Delirious Lettuce
9f35ebc287 * 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
47b58a7565 Merge branch 'delirious-lettuce-build_slug' 2017-05-24 14:04:49 -07:00
Micah Lee
bfd7352781 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
7246b9015f Merge branch 'mig5-fix_shutdown_from_gui' 2017-05-24 14:02:45 -07:00
Micah Lee
47a53f2d36 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
7df189dd24 Removing '\n' arg negates the need for wordlist.remove(), renamed unused variable 'x' to '_' 2017-05-24 13:22:41 -06:00
Micah Lee
5de542234d Version bump to 1.1.dev2 v1.1.dev2 2017-05-23 15:24:05 -07:00
Micah Lee
48ddd09c6f Updated changelog 2017-05-23 15:21:54 -07:00
Micah Lee
bcfcb27443 Merge branch 'mig5-remove_resource_warnings_on_unclosed_files' 2017-05-23 15:20:23 -07:00
Micah Lee
36a27b3b7d Fix indenting 2017-05-23 15:16:27 -07:00
Miguel Jacq
b97db1339d open files via the 'with' statement, to avoid ResourceWarnings on unclosed files 2017-05-23 21:22:14 +10:00
Micah Lee
2f5fbe2d3f Remove the extra instances of the Settings object, and only use OnionShareGui.settings 2017-05-22 17:11:41 -07:00
Micah Lee
83b2b9a025 Reload Settings whenever the settings get saved in SettingsDialog 2017-05-22 17:08:05 -07:00
Micah Lee
19e9cfbd2c 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
81edfa75af Merge branch 'mig5-add_help_button' 2017-05-22 16:46:20 -07:00
Micah Lee
4460c4e414 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
caed1d5336 Update desktop notification settings text 2017-05-22 16:38:46 -07:00
Micah Lee
c26ccd48fa Update desktop notification text 2017-05-22 16:35:59 -07:00
Micah Lee
c0daea953f Add a grayscale OnionShare logo for the systray icon in macOS 2017-05-22 16:23:19 -07:00
Micah Lee
552c9eeb50 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
38107404ee get settings from self rather than instantiate a new Settings object 2017-05-23 09:15:52 +10:00
Micah Lee
d1512dcd9c 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
559e193d49 Merge branch 'mig5-select_multiple_folders' 2017-05-22 16:11:06 -07:00
Micah Lee
06f08ab51b 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
d4e6fbb584 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
57e7bae86c Refactor help button to use QDesktopServices.openUrl() 2017-05-23 08:30:24 +10:00
Micah Lee
c076ed44da Merge branch 'mig5-362-more-descriptive-html' 2017-05-22 15:22:41 -07:00
Micah Lee
409b9778bf 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
e5e7add40f 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
91bb0eefa5 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
36d3fac5c9 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
f593008fc9 Merge branch 'mig5-387-build-script-logic-fix' 2017-05-22 14:07:33 -07:00
Micah Lee
33a5065f41 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
a5b0fb2ebd Merge branch 'mig5-392-remove-symlink' 2017-05-22 14:03:42 -07:00
Micah Lee
44824e8064 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
74af384a99 Merge branch 'mig5-fix_double_slash_in_update_checker_url' 2017-05-22 14:01:38 -07:00
Micah Lee
5d0a651cb8 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
5a166e9fc1 Add desktop notification messages on download events (via systray) 2017-05-22 16:47:23 +10:00
Miguel Jacq
4b4de9add3 Adjust folder dialog caption to be plural 2017-05-21 16:25:15 +10:00
Miguel Jacq
9d20749610 Adjust French translation for the dialog caption to be plural 2017-05-21 16:23:48 +10:00
Miguel Jacq
d9e882cbdc Make it possible to select multiple folders by using non-native QFileDialog 2017-05-21 16:14:32 +10:00
Miguel Jacq
8539adb343 use the actual OnionShare version as the Server header string 2017-05-21 10:30:37 +10:00
Miguel Jacq
fdf6b46e58 Remove duplication of security headers 2017-05-21 10:03:18 +10:00
Miguel Jacq
eeb463b0c8 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
c5dfeffd4e 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
Miguel Jacq
b29b9949f3 move the help button to the left 2017-05-20 14:04:52 +10:00
Miguel Jacq
b3bde7083f Add help button to settings dialog, which takes user to the wiki 2017-05-20 13:56:20 +10:00
Miguel Jacq
33c690b22c Harden some response headers 2017-05-20 12:34:00 +10:00
Miguel Jacq
fc863e2532 Be explicit that the the first filesize is that of the compressed zip file and that it contains the files beneath. Use the headers in the table that we've styled for 2017-05-19 15:44:03 +10:00
Miguel Jacq
ed3048c3db exit 1 on failure for completeness 2017-05-19 14:42:23 +10:00