Micah Lee
4b324be60d
Merge branch 'delete_multiple_items' of https://github.com/mig5/onionshare into mig5-delete_multiple_items
2017-05-30 12:05:35 -07:00
Micah Lee
3868f20a20
Merge branch 'mig5-extra_systray_buttons'
2017-05-30 12:04:38 -07:00
Micah Lee
9c2be13c25
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
6014e9c3ae
Merge branch 'mig5-1.1changelog'
2017-05-30 11:59:56 -07:00
Micah Lee
7928f787c0
Merge branch '1.1changelog' of https://github.com/mig5/onionshare into mig5-1.1changelog
2017-05-30 11:59:41 -07:00
Micah Lee
eb9ff30c1e
Merge branch 'delirious-lettuce-format_seconds'
2017-05-30 11:47:58 -07:00
Micah Lee
294f093f9b
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
284f1ba978
Merge branch 'delirious-lettuce-socket_context_manager'
2017-05-30 11:41:07 -07:00
Miguel Jacq
a4fec7b181
Revert "Make the tor connection progressBar similarly style as the others"
...
This reverts commit 538476ca0cba05d6014d2e86750770bb2eb61978.
2017-05-29 15:46:28 +10:00
Miguel Jacq
538476ca0c
Make the tor connection progressBar similarly style as the others
2017-05-29 15:44:04 +10:00
Miguel Jacq
192fe7057f
reinstate the caption call
2017-05-29 13:50:46 +10:00
Miguel Jacq
d0216e0310
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
18bec095d3
Make adding of files/folders a single button
2017-05-29 10:22:16 +10:00
Miguel Jacq
09550ad50b
Improve the Zip progressbar style a little bit
2017-05-29 09:14:23 +10:00
Delirious Lettuce
a50d1207c3
Remove constant_time_compare to use hmac.compare_digest
2017-05-28 13:38:33 -06:00
Miguel Jacq
8d82c01e2a
Remove border around items in the QStatusBar
2017-05-27 20:38:46 +10:00
Miguel Jacq
10a546edf9
Style a prettier progress bar
2017-05-27 19:53:30 +10:00
Miguel Jacq
2a8f47ef2a
minor reword in changelog
2017-05-27 17:38:05 +10:00
Miguel Jacq
8087cebb10
Make it possible to delete multiple items from the list with a shift-select
2017-05-27 17:27:57 +10:00
Miguel Jacq
88bd86a5c9
Adds Settings and Help menu items to the systray
2017-05-27 17:14:59 +10:00
Delirious Lettuce
20f1f352a0
Fix issue mentioned by @mig5
2017-05-26 10:12:11 -06:00
Miguel Jacq
1c8f8b8b91
Updated CHANGELOG for v1.1
2017-05-26 16:57:41 +10:00
Delirious Lettuce
882ac942fe
Use divmod to simplify the calculations, seconds==0 -> '0s'
2017-05-24 22:20:50 -06:00
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
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
