Commit Graph

1664 Commits

Author SHA1 Message Date
Miguel Jacq
adf4b02980
Update stdeb.cfg to depend on bionic and Python 3.6 2018-09-17 09:16:11 +10:00
Miguel Jacq
6ed5c94df7
Hide the legacy settings if legacy mode is not enabled. Fix unrelated bug regarding displaying the HidServAuth copy button/label 2018-09-17 09:12:13 +10:00
Miguel Jacq
ff8b7df5a5
reduce verbosity of persistent mode label 2018-09-17 09:02:35 +10:00
Miguel Jacq
6c01d7a2da
Add 'what's this' labels to each General Setting 2018-09-17 09:01:30 +10:00
Miguel Jacq
7c55f0adae
Reorder the general settings 2018-09-17 08:44:56 +10:00
Miguel Jacq
8c3c0eb02b
Use 'settings' rather than 'options' in the SettingsDialog labels 2018-09-17 08:43:19 +10:00
Miguel Jacq
c49db9072a
Merge branch 'receiver-mode-gui' into prop224_receiver_mode 2018-09-16 14:53:49 +10:00
Micah Lee
7a90378f80
Merge pull request #746 from mig5/fix_public_mode_test
Fix public mode tests for 404
2018-09-15 21:50:59 -07:00
Miguel Jacq
6efa5f15b7
Fix public mode tests for 404 2018-09-16 14:18:44 +10:00
Miguel Jacq
026322b458
Fix margins on HBoxLayouts in settings 2018-09-16 14:06:55 +10:00
Miguel Jacq
95f097eae3
Move the hyperlink labels into HBox layouts with the checkboxes 2018-09-16 14:00:41 +10:00
Miguel Jacq
d8566c2d78
Move stealth to general options, and add hyperlinks for more info for this and legacy addresses 2018-09-16 13:54:47 +10:00
Miguel Jacq
3a7ae401af
Fix conflicts 2018-09-16 13:37:22 +10:00
Micah Lee
13652e3bde
Merge branch 'mig5-713_optional_slugs' into receiver-mode-gui 2018-09-15 19:59:57 -07:00
Micah Lee
73f09f14c4
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
9815c612eb
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
52981b6f98
Fix bad merge in license comment 2018-09-15 19:05:40 -07:00
Miguel Jacq
30ee2290d7
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
8bb75cc530
Fix conflict in tests 2018-09-15 12:07:01 +10:00
Micah Lee
8312058fcc
Merge branch 'develop' into receiver-mode-gui 2018-09-14 18:59:36 -07:00
Micah Lee
6839ec43d4
Merge branch 'mig5-fix_help_systray_slot' into develop 2018-09-14 18:43:34 -07:00
Micah Lee
db63b4c9c3
Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into develop 2018-09-14 18:43:25 -07:00
Micah Lee
96b59c49e0
Merge branch 'mig5-685_use_dist_socks' into develop 2018-09-14 18:41:52 -07:00
Micah Lee
2605967011
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
4a51f09c53
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
b58ffc3196
Merge branch 'mig5-upload_widget_overlap' into receiver-mode-gui 2018-09-14 18:36:41 -07:00
Miguel Jacq
e54a1473ce
Don't check slug candidate in public mode 2018-09-15 11:36:34 +10:00
Micah Lee
fbb55e36dc
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
23415a43f2
Merge branch 'mig5-fix_invalid_version_alert' into develop 2018-09-14 18:33:10 -07:00
Micah Lee
4c87393550
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
1da30cb12d
Merge branch 'mig5-opensuse_build_instructions' into develop 2018-09-14 17:04:00 -07:00
Micah Lee
04984aa420
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
51bfee31bf
Merge branch 'mig5-681_remove_obsolete_strings' into receiver-mode-gui 2018-09-14 16:59:43 -07:00
Micah Lee
d2ef9872a4
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
1d67c4d25b
Merge branch 'mig5-692_appstream_file_location' into develop 2018-09-14 16:55:27 -07:00
Micah Lee
8cbac4e671
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
8861b9f716
Merge branch 'mig5-691_remove_meek_lite_amazon' into develop 2018-09-14 16:29:53 -07:00
Miguel Jacq
25eed81b00
Fixing a future check for persistent v3 onions (still disabled for now) 2018-09-13 16:35:24 +10:00
Miguel Jacq
0b0eef7245
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
8955ce0699
Refactor the onionkey stuff to be more like @maqp's revised version (thanks) 2018-09-13 12:21:38 +10:00
Miguel Jacq
f9e614eba1
Update cryptography dependency to 2.3.1 2018-09-13 11:35:28 +10:00
Miguel Jacq
85fa44a01f
Pass self to help_clicked function in systray, so we can use self.common 2018-09-04 14:49:56 +10:00
Miguel Jacq
45a5a2ae63
Use the distribution's PySocks module instead of our custom version 2018-09-04 14:26:47 +10:00
Miguel Jacq
11bf059015
Fix conflict from receiver-mode-gui branch 2018-09-04 11:48:39 +10:00
Miguel Jacq
45d6a94d38
Fix conflict from develop branch 2018-09-04 11:43:35 +10:00
Micah Lee
b3d5af9d4c
Merge branch 'mig5-receive_mode_styling' into receiver-mode-gui 2018-09-02 23:04:04 -07:00
Micah Lee
f83aa3cffb
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
62c443f2fd
Merge branch 'mig5-fix_spelling_grammar_receiver_mode' into receiver-mode-gui 2018-09-02 22:59:13 -07:00
Micah Lee
eb0419f2d9
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
936a90c62c
Merge branch 'mig5-707_fix_receive_mode_on_tor_disconnect' into receiver-mode-gui 2018-09-02 22:57:43 -07:00