Micah Lee
9066dfe2f0
Merge branch 'mig5-extra_systray_buttons'
2017-05-30 12:04:38 -07:00
Micah Lee
f835703b92
Merge branch 'extra_systray_buttons' of https://github.com/mig5/onionshare into mig5-extra_systray_buttons
2017-05-30 12:01:04 -07:00
Micah Lee
d806337515
Merge branch 'mig5-1.1changelog'
2017-05-30 11:59:56 -07:00
Micah Lee
bb9fd46c35
Merge branch '1.1changelog' of https://github.com/mig5/onionshare into mig5-1.1changelog
2017-05-30 11:59:41 -07:00
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
Miguel Jacq
506cb55bc1
Revert "Make the tor connection progressBar similarly style as the others"
...
This reverts commit 6ad8b88832
2017-05-29 15:46:28 +10:00
Miguel Jacq
6ad8b88832
Make the tor connection progressBar similarly style as the others
2017-05-29 15:44:04 +10:00
Miguel Jacq
63745f4d8e
reinstate the caption call
2017-05-29 13:50:46 +10:00
Miguel Jacq
8f79fc392d
Fix file dialog by subclassing/overriding it, which allows for single selection of a file or folder, as well as multiple
2017-05-29 13:47:05 +10:00
Miguel Jacq
68089a9850
Make adding of files/folders a single button
2017-05-29 10:22:16 +10:00
Miguel Jacq
84e167333e
Improve the Zip progressbar style a little bit
2017-05-29 09:14:23 +10:00
Delirious Lettuce
dfd40798fe
Remove constant_time_compare to use hmac.compare_digest
2017-05-28 13:38:33 -06:00
Miguel Jacq
0da4c87e5a
Remove border around items in the QStatusBar
2017-05-27 20:38:46 +10:00
Miguel Jacq
acf453e094
Style a prettier progress bar
2017-05-27 19:53:30 +10:00
Miguel Jacq
cb3f1060fb
minor reword in changelog
2017-05-27 17:38:05 +10:00
Miguel Jacq
91cf9084aa
Make it possible to delete multiple items from the list with a shift-select
2017-05-27 17:27:57 +10:00
Miguel Jacq
cc73c92e4b
Adds Settings and Help menu items to the systray
2017-05-27 17:14:59 +10:00
Delirious Lettuce
5880741c9d
Fix issue mentioned by @mig5
2017-05-26 10:12:11 -06:00
Miguel Jacq
752548a822
Updated CHANGELOG for v1.1
2017-05-26 16:57:41 +10: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
