Micah Lee
|
a01a87a76e
|
Merge branch 'mig5-713_optional_slugs' into receiver-mode-gui
|
2018-09-15 19:59:57 -07:00 |
|
Micah Lee
|
4bf69445a0
|
Make 404 error page look better, and remove the text that it's probably a typo, because in public mode that isn't necessarily true
|
2018-09-15 19:52:53 -07:00 |
|
Micah Lee
|
8769cf7c97
|
Check for public_mode in the check_slug_candidate function, to make 404 errors work again during public mode
|
2018-09-15 19:47:42 -07:00 |
|
Micah Lee
|
61179a0860
|
Fix bad merge in license comment
|
2018-09-15 19:05:40 -07:00 |
|
Miguel Jacq
|
dfe18d10fa
|
Fix bug where lack of stealth mode re-enabled v2 legacy checkbox even if persistence was still enabled
|
2018-09-15 16:07:08 +10:00 |
|
Miguel Jacq
|
3a9c4fa165
|
Fix conflict in tests
|
2018-09-15 12:07:01 +10:00 |
|
Micah Lee
|
905a444099
|
Merge branch 'develop' into receiver-mode-gui
|
2018-09-14 18:59:36 -07:00 |
|
Micah Lee
|
0881f7f6d9
|
Merge branch 'mig5-fix_help_systray_slot' into develop
|
2018-09-14 18:43:34 -07:00 |
|
Micah Lee
|
9765b62443
|
Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into develop
|
2018-09-14 18:43:25 -07:00 |
|
Micah Lee
|
989efb3606
|
Merge branch 'mig5-685_use_dist_socks' into develop
|
2018-09-14 18:41:52 -07:00 |
|
Micah Lee
|
5661015acb
|
Merge branch '685_use_dist_socks' of https://github.com/mig5/onionshare into mig5-685_use_dist_socks
|
2018-09-14 18:40:26 -07:00 |
|
Micah Lee
|
95285c5580
|
Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into mig5-fix_help_systray_slot
|
2018-09-14 18:38:32 -07:00 |
|
Micah Lee
|
f6e623d67d
|
Merge branch 'mig5-upload_widget_overlap' into receiver-mode-gui
|
2018-09-14 18:36:41 -07:00 |
|
Miguel Jacq
|
6586cf6df9
|
Don't check slug candidate in public mode
|
2018-09-15 11:36:34 +10:00 |
|
Micah Lee
|
e6c4c672ea
|
Merge branch 'upload_widget_overlap' of https://github.com/mig5/onionshare into mig5-upload_widget_overlap
|
2018-09-14 18:33:51 -07:00 |
|
Micah Lee
|
406a53d643
|
Merge branch 'mig5-fix_invalid_version_alert' into develop
|
2018-09-14 18:33:10 -07:00 |
|
Micah Lee
|
7eb1300430
|
Merge branch 'fix_invalid_version_alert' of https://github.com/mig5/onionshare into mig5-fix_invalid_version_alert
|
2018-09-14 18:32:32 -07:00 |
|
Micah Lee
|
95e2e5753e
|
Merge branch 'mig5-opensuse_build_instructions' into develop
|
2018-09-14 17:04:00 -07:00 |
|
Micah Lee
|
421d4087ff
|
Merge branch 'opensuse_build_instructions' of https://github.com/mig5/onionshare into mig5-opensuse_build_instructions
|
2018-09-14 17:03:50 -07:00 |
|
Micah Lee
|
f3607fe9aa
|
Merge branch 'mig5-681_remove_obsolete_strings' into receiver-mode-gui
|
2018-09-14 16:59:43 -07:00 |
|
Micah Lee
|
d63b6e9262
|
Merge branch '681_remove_obsolete_strings' of https://github.com/mig5/onionshare into mig5-681_remove_obsolete_strings
|
2018-09-14 16:57:33 -07:00 |
|
Micah Lee
|
935a25d33e
|
Merge branch 'mig5-692_appstream_file_location' into develop
|
2018-09-14 16:55:27 -07:00 |
|
Micah Lee
|
c1b30d9620
|
Merge branch '692_appstream_file_location' of https://github.com/mig5/onionshare into mig5-692_appstream_file_location
|
2018-09-14 16:55:11 -07:00 |
|
Micah Lee
|
53736b42bc
|
Merge branch 'mig5-691_remove_meek_lite_amazon' into develop
|
2018-09-14 16:29:53 -07:00 |
|
Miguel Jacq
|
ab80440a3c
|
Fixing a future check for persistent v3 onions (still disabled for now)
|
2018-09-13 16:35:24 +10:00 |
|
Miguel Jacq
|
81db9d3264
|
More clarity for the returned values in generate_v3_private_key(), also more consistent with generate_v2_private_key()
|
2018-09-13 12:29:48 +10:00 |
|
Miguel Jacq
|
4a55b7a13b
|
Refactor the onionkey stuff to be more like @maqp's revised version (thanks)
|
2018-09-13 12:21:38 +10:00 |
|
Miguel Jacq
|
15835f1c38
|
Update cryptography dependency to 2.3.1
|
2018-09-13 11:35:28 +10:00 |
|
Miguel Jacq
|
3eace71261
|
Pass self to help_clicked function in systray, so we can use self.common
|
2018-09-04 14:49:56 +10:00 |
|
Miguel Jacq
|
1e29a12221
|
Use the distribution's PySocks module instead of our custom version
|
2018-09-04 14:26:47 +10:00 |
|
Miguel Jacq
|
b0d2183a3e
|
Fix conflict from receiver-mode-gui branch
|
2018-09-04 11:48:39 +10:00 |
|
Miguel Jacq
|
32f0e39a46
|
Fix conflict from develop branch
|
2018-09-04 11:43:35 +10:00 |
|
Micah Lee
|
7abf63c4f6
|
Merge branch 'mig5-receive_mode_styling' into receiver-mode-gui
|
2018-09-02 23:04:04 -07:00 |
|
Micah Lee
|
b37f9272c7
|
Merge branch 'receive_mode_styling' of https://github.com/mig5/onionshare into mig5-receive_mode_styling
|
2018-09-02 23:01:06 -07:00 |
|
Micah Lee
|
40ae3c8193
|
Merge branch 'mig5-fix_spelling_grammar_receiver_mode' into receiver-mode-gui
|
2018-09-02 22:59:13 -07:00 |
|
Micah Lee
|
54c98f0b57
|
Merge branch 'fix_spelling_grammar_receiver_mode' of https://github.com/mig5/onionshare into mig5-fix_spelling_grammar_receiver_mode
|
2018-09-02 22:59:06 -07:00 |
|
Micah Lee
|
2101fe3068
|
Merge branch 'mig5-707_fix_receive_mode_on_tor_disconnect' into receiver-mode-gui
|
2018-09-02 22:57:43 -07:00 |
|
Micah Lee
|
fc5af35b33
|
Merge branch '707_fix_receive_mode_on_tor_disconnect' of https://github.com/mig5/onionshare into mig5-707_fix_receive_mode_on_tor_disconnect
|
2018-09-02 22:56:39 -07:00 |
|
Micah Lee
|
21c16857ed
|
Merge branch 'mig5-receiver-mode-gui' into receiver-mode-gui
|
2018-09-02 22:51:26 -07:00 |
|
Micah Lee
|
69f2cc212d
|
Merge branch 'mig5-693_fix_static_assets_macos' into develop
|
2018-09-02 13:36:30 -07:00 |
|
Micah Lee
|
f2f77389e4
|
Merge branch '693_fix_static_assets_macos' of https://github.com/mig5/onionshare into mig5-693_fix_static_assets_macos
|
2018-09-02 13:36:21 -07:00 |
|
Micah Lee
|
92b7c5f062
|
Merge branch 'mig5-lingering_object_naming_issues' into develop
|
2018-09-02 13:33:55 -07:00 |
|
Micah Lee
|
8b7aa3b321
|
Merge branch 'lingering_object_naming_issues' of https://github.com/mig5/onionshare into mig5-lingering_object_naming_issues
|
2018-09-02 13:33:35 -07:00 |
|
Miguel Jacq
|
b53469fc7d
|
Truncate the length of the uploaded file name if it is longer than the width of the Upload window
|
2018-09-01 09:20:50 +10:00 |
|
Miguel Jacq
|
fee1a1eba2
|
Fix the passing of the latest version returned to the UI if it is an invalid version
|
2018-08-30 15:18:29 +10:00 |
|
Miguel Jacq
|
2aa6a72ba4
|
Only wrap the v3 onion if the window is too small to show it unwrapped
|
2018-08-28 09:33:49 +10:00 |
|
Miguel Jacq
|
1e70df4f22
|
Don't try and parse Tor version in order whether or not to show v2-only features. Just note in the QLabel what is v2-only. Still force v2 legacy mode on when using persistence or stealth.
|
2018-08-23 11:02:28 +10:00 |
|
Miguel Jacq
|
a5cb8385af
|
Add missing locale key for legacy v2 onions
|
2018-08-22 17:03:15 +10:00 |
|
Miguel Jacq
|
a3c89bdf67
|
Fix tests
|
2018-08-22 11:50:16 +10:00 |
|
Miguel Jacq
|
8c31505b90
|
Rather than hide persistence/stealth mode altogether if the Tor version is high enough for v3, give the user the option to 'use legacy v2 onions' in Settings dialog, so that they may continue to use persistence etc
|
2018-08-22 11:45:08 +10:00 |
|