Micah Lee
6b7a6a9ec4
Merge branch 'mig5-523_try_update_check_via_v3_onion' into develop
2018-02-23 11:54:02 -08:00
Micah Lee
a83a920051
Merge branch '523_try_update_check_via_v3_onion' of https://github.com/mig5/onionshare into mig5-523_try_update_check_via_v3_onion
2018-02-23 11:53:55 -08:00
Micah Lee
a53ab8a459
Merge branch 'mig5-fix_get_num_files' into ux-update
2018-02-22 17:55:19 -08:00
Micah Lee
42be0599ee
Merge branch 'irykoon-develop' into develop
2018-02-22 17:48:47 -08:00
Miguel Jacq
161e7e380b
Fix get_num_files() to count the items in the QListWidget, not in the FileSelection QVBoxLayout widget
2018-02-23 12:46:18 +11:00
Micah Lee
bb3f18ee00
Merge branch 'develop' of https://github.com/irykoon/onionshare into irykoon-develop
2018-02-22 16:57:06 -08:00
Micah Lee
93f6661801
Merge branch 'mig5-604_fix_file_list_widgets_and_ordering' into ux-update
2018-02-22 16:52:23 -08:00
Miguel Jacq
ade9a452a3
Remove our custom stylesheeting, and just trim long names, allowing them to untrim as the window resizes
2018-02-23 10:49:43 +11:00
Micah Lee
1967d50707
Make the item-info boxes have an obvious style
2018-02-22 10:02:52 -08:00
Micah Lee
22c301fd9c
Stop trimming filenames, and instead create item info with a white background
2018-02-22 09:55:04 -08:00
Miguel Jacq
6998aec50a
Force a scrollbar on the file list widget. Not pretty but avoids weird text disappearance on resize when scrollbar otherwise activates
2018-02-22 14:44:00 +11:00
Miguel Jacq
9215651582
Remove the item_name QLabel widget and just let the QListWidgetItem text() display as title. Trim super-long filenames
2018-02-22 14:37:31 +11:00
Miguel Jacq
6815665f1d
Instantiate empty filenames list
2018-02-21 15:47:21 +11:00
Miguel Jacq
fd4bc51ec2
fix appending of filenames when checking that a file hasn't already been added to the list
2018-02-21 15:29:56 +11:00
Miguel Jacq
21b08252d3
Use the QListWidgetItems for building lists of filenames. Set, but avoid displaying, the QString from Qt.DisplayRole which is necessary for correct sorting in the list
2018-02-21 15:19:18 +11:00
Micah Lee
4002bb5547
Merge branch 'mig5-info_widget_visibility_fixes' into ux-update
2018-02-20 17:49:55 -08:00
Micah Lee
6ac4584d2a
Merge branch 'info_widget_visibility_fixes' of https://github.com/mig5/onionshare into mig5-info_widget_visibility_fixes
2018-02-20 17:48:50 -08:00
Micah Lee
8e7515c454
Merge branch 'mig5-fix_cancel_and_primary_action' into ux-update
2018-02-20 17:45:44 -08:00
irykoon
61384e6768
Fix typo
...
Again, many thanks to the careful review by @mig5 !
2018-02-20 05:45:15 +00:00
Miguel Jacq
2dd1d13957
Make the appearance of the download status icons occur consistently with the file info label
2018-02-20 15:30:55 +11:00
Miguel Jacq
9da3e2d8b0
Fix updating primary action and re-enabling drag-n-drop when a share is canceled
2018-02-20 14:49:17 +11:00
irykoon
53510bf43e
Take care of custom vanilla bridges
...
Thank you @mig5 for pointing this out.
2018-02-20 03:25:43 +00:00
Micah Lee
4457663ffe
Merge branch 'mig5-info_widgets_download_info' into ux-update
2018-02-19 18:14:40 -08:00
Micah Lee
3d1c0eabc4
Merge branch 'develop' into mig5-info_widgets_download_info
2018-02-19 18:02:51 -08:00
Micah Lee
cb69ae89fc
Merge branch 'info_widgets_download_info' of https://github.com/mig5/onionshare into mig5-info_widgets_download_info
2018-02-19 17:55:03 -08:00
Micah Lee
760661c9c1
Merge branch 'mig5-fix_simultaneous_downloads' into develop
2018-02-19 17:51:45 -08:00
Micah Lee
97c41c637e
Merge branch 'fix_simultaneous_downloads' of https://github.com/mig5/onionshare into mig5-fix_simultaneous_downloads
2018-02-19 17:44:53 -08:00
Micah Lee
d9be9a4441
Merge branch 'mig5-increase_file_list_minimum_height' into ux-update
2018-02-19 17:41:02 -08:00
Micah Lee
0eef5cdba0
Merge branch 'increase_file_list_minimum_height' of https://github.com/mig5/onionshare into mig5-increase_file_list_minimum_height
2018-02-19 17:39:47 -08:00
irykoon
d03ad0ab30
Adopt a more robust RE for custom obfs4 IPV6 bridges
2018-02-20 01:33:58 +00:00
irykoon
2cdfcea241
Adopt a more robust RE for custom obfs4 bridges
2018-02-20 01:26:02 +00:00
irykoon
02c16ce179
Add meek_lite support for custom bridges
2018-02-20 01:24:44 +00:00
Micah Lee
fa367abf6a
Merge branch 'develop' of github.com:micahflee/onionshare into develop
2018-02-19 17:02:33 -08:00
Micah Lee
c0e0aca782
Merge branch 'cclauss-patch-1' into develop
2018-02-19 17:02:05 -08:00
Micah Lee
64b5b4d81f
Merge pull request #586 from scootergrisen/patch-4
...
Add [da] translations
2018-02-19 16:59:16 -08:00
Micah Lee
eea529c54f
Merge branch 'mig5-sortable_tables' into ux-update
2018-02-19 16:48:59 -08:00
Micah Lee
5ac6bb783f
Merge branch 'sortable_tables' of https://github.com/mig5/onionshare into mig5-sortable_tables
2018-02-19 16:45:58 -08:00
Micah Lee
49ab6d48c8
Merge branch 'mig5-ux_update_cancel_option' into ux-update
2018-02-19 16:44:27 -08:00
Miguel Jacq
b7df7f8dc9
merge ux-update in, and fix conflict
2018-02-20 07:47:21 +11:00
irykoon
85afd85587
Adopt more user-friendly wording
...
Thank you @mig5 for the great suggestion.
2018-02-19 07:34:09 +00:00
Miguel Jacq
6791e59aa5
reset done to False if a download is still in progress
2018-02-19 12:47:21 +11:00
Miguel Jacq
20c0ca02d3
Add download status widgets to info bar
2018-02-19 08:33:47 +11:00
Miguel Jacq
f0b3c25ce4
Increase the MinimumHeight of the FileList widget to avoid disappearing icons
2018-02-18 16:22:04 +11:00
irykoon
b2c310f2e0
Support meek_lite Pluggable Transport
...
Currently, meek/meek_lite is one of the few, if not only, mature pluggable transport that works in some heavily cenosored areas, for example, China. Therefore, this can be a nice feature to have.
2018-02-15 23:19:53 +00:00
cclauss
e31b4a688b
Add flake8 to the testing
2018-02-14 08:00:21 +01:00
Miguel Jacq
5172294dfa
Account for files that are in bytes
2018-02-14 17:20:00 +11:00
Miguel Jacq
7a8e828cd5
Fix indentation
2018-02-14 17:04:08 +11:00
Miguel Jacq
062101fcbf
Make table sortable with javascript (if enabled)
2018-02-14 16:56:03 +11:00
Micah Lee
090a023db0
Merge branch 'mig5-602_fix_taberror' into develop
2018-02-13 18:00:19 -08:00
Micah Lee
41b1abdfaa
Merge branch 'mig5-url_label_tooltips' into ux-update
2018-02-13 17:59:15 -08:00
