Micah Lee
|
715e31b890
|
Merge branch 'mig5-dont_revert_on_invalid_bridges' into develop
|
2018-02-25 16:13:39 -08:00 |
|
Miguel Jacq
|
35aaf8c675
|
Alert wording change (we no longer 'ignore' invalid bridges, the user has to fix them)
|
2018-02-26 02:49:51 +11:00 |
|
Miguel Jacq
|
fce26c4286
|
Add ability to abort but not exit SettingsDialog/reconnect to Tor, on invalid settings. Do this for invalid bridges
|
2018-02-25 19:42:38 +11:00 |
|
Miguel Jacq
|
0dfbb38acf
|
Merge pull request #644 from micahflee/641_fix_images_windows
Fix the broken images in Windows
|
2018-02-25 14:58:39 +11:00 |
|
Micah Lee
|
79b461d071
|
Merge branch 'develop' into 641_fix_images_windows
|
2018-02-24 19:40:23 -08:00 |
|
Micah Lee
|
43930058fb
|
Put <img> src in quotes
|
2018-02-24 19:39:03 -08:00 |
|
Micah Lee
|
6ded178343
|
Add pytest cache to gitignore
|
2018-02-24 19:17:29 -08:00 |
|
Micah Lee
|
471ccef9d3
|
Remove test_frozen_windows test because it is verify difficult to test for on a non-Windows platform
|
2018-02-24 19:17:18 -08:00 |
|
Micah Lee
|
3797e9e203
|
When using <img>, put the src in quotes. Otherwise the filename is likely to have spaces in it, and the <img> src will break. Also, in Windows use backslashes for local resources instead of forward slashes
|
2018-02-24 18:38:40 -08:00 |
|
Micah Lee
|
f41ad976ea
|
Rename in_progress_download to in_progress_downloads (plural) everywhere, to be consistent with completed_downloads
|
2018-02-24 18:37:19 -08:00 |
|
Micah Lee
|
c0ba9ab278
|
Merge branch 'delirious-lettuce-remove_platform_re' into develop
|
2018-02-24 17:57:01 -08:00 |
|
Micah Lee
|
e76b1e0c28
|
Merge branch 'remove_platform_re' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-remove_platform_re
|
2018-02-24 17:56:35 -08:00 |
|
Micah Lee
|
9345f62ff0
|
Merge branch 'mig5-revert_cancel_feature' into develop
|
2018-02-24 17:47:07 -08:00 |
|
Miguel Jacq
|
782a4ddbb1
|
Remove cancel feature from the 1.3 CHANGELOG
|
2018-02-25 12:34:49 +11:00 |
|
Miguel Jacq
|
cff267c09c
|
Revert the cancel feature that causes issues at least on macOS (#637)
|
2018-02-25 12:31:32 +11:00 |
|
Miguel Jacq
|
9f0adc0fb9
|
Revert "Fix updating primary action and re-enabling drag-n-drop when a share is canceled"
This reverts commit 9da3e2d8b0.
|
2018-02-25 12:27:20 +11:00 |
|
Miguel Jacq
|
e6189494f3
|
Merge pull request #639 from delirious-lettuce/remove_duplicate_key
Remove duplicate key/value pair
|
2018-02-25 12:25:29 +11:00 |
|
delirious-lettuce
|
c2b13cc7ca
|
Remove duplicate key/value pair
|
2018-02-24 17:21:29 -07:00 |
|
Miguel Jacq
|
415cf3af98
|
Merge pull request #635 from micahflee/fix_meek_bug
Fix typo bug that is only triggered if obfs4proxy binary is not found
|
2018-02-25 10:25:33 +11:00 |
|
delirious-lettuce
|
641fec7c05
|
Remove use of re module by using str.endswith
|
2018-02-24 15:44:23 -07:00 |
|
Micah Lee
|
aafebff0c3
|
Merge branch 'mig5-version_1.3_bump' into develop
|
2018-02-24 14:39:22 -08:00 |
|
Micah Lee
|
ca754faa3b
|
Merge branch 'version_1.3_bump' of https://github.com/mig5/onionshare into mig5-version_1.3_bump
|
2018-02-24 14:39:15 -08:00 |
|
Micah Lee
|
b75237dcea
|
Fix typo bug that is only triggered if obfs4proxy binary is not found
|
2018-02-24 14:09:42 -08:00 |
|
Miguel Jacq
|
dface51dd0
|
Merge pull request #588 from micahflee/ux-update
Major user experience update
|
2018-02-25 08:27:46 +11:00 |
|
Miguel Jacq
|
606123db91
|
Version bump to 1.3
|
2018-02-25 08:27:39 +11:00 |
|
Miguel Jacq
|
560f27fc76
|
Merge pull request #631 from micahflee/626_squished_status_bar
Give settings button a fixed width to avoid it getting squished in macOS
|
2018-02-25 08:08:44 +11:00 |
|
Micah Lee
|
928de64171
|
Give settings button a fixed width to avoid it getting squished in macOS
|
2018-02-24 12:34:46 -08:00 |
|
Micah Lee
|
817a5746f9
|
Merge branch 'mig5-625_fix_size_of_app_for_mac_os' into ux-update
|
2018-02-24 12:03:40 -08:00 |
|
Miguel Jacq
|
7e175cb7e3
|
Re-work the UI widgets to make it smaller on Macbook Pro and other smaller screens
|
2018-02-24 15:38:45 +11:00 |
|
Miguel Jacq
|
3280e5428b
|
Merge pull request #628 from micahflee/624_deselecting_delete
Show and hide the delete button at the right times
|
2018-02-24 08:46:33 +10:00 |
|
Micah Lee
|
7bf9c5adfd
|
Change how FileSelection.update tells if items are selected to correctly show and hide the delete button
|
2018-02-23 14:18:57 -08:00 |
|
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 |
|