Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-12 04:31:41 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,682 Commits 9 Branches 45 Tags
Commit Graph

1682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miguel Jacq
bc097c738e Increment/decrement the upload counters 2018-09-18 11:19:20 +10:00
Miguel Jacq
f0bf9fb727 Merge pull request #695 from micahflee/receiver-mode-gui 
Receiver mode GUI
 2018-09-18 10:48:56 +10:00
Micah Lee
06463bab7b Make separate function for comparing the slug and comparing the shutdown_slug, to prevent 404 errors on the shutdown request 2018-09-17 17:42:21 -07:00
Micah Lee
6f93000724 Merge branch 'develop' into receiver-mode-gui 2018-09-17 16:15:08 -07:00
Micah Lee
8bb4ec2a18 Merge branch 'mig5-prop224_receiver_mode' into receiver-mode-gui 2018-09-17 16:12:06 -07:00
Micah Lee
2c80a74467 Make what's this links use the same string, and change their style 2018-09-17 16:11:52 -07:00
Micah Lee
245716c726 Merge branch 'prop224_receiver_mode' of https://github.com/mig5/onionshare into mig5-prop224_receiver_mode 2018-09-17 15:57:15 -07:00
Micah Lee
268bab5233 Merge pull request #750 from mig5/740_pip_dependencies_round_2 
Bump windows versions of pip packages to match those of OS X
 2018-09-17 15:01:51 -07:00
Micah Lee
4db1943ae0 Merge pull request #753 from mig5/uploads_tooltips 
[receiver-mode-gui] Use the term 'upload' rather than 'download' in the Receive mode tooltip icons
 2018-09-17 12:20:35 -07:00
Miguel Jacq
2896f1e3a8 Use the term 'upload' rather than 'download' in the Receive mode tooltip icons 2018-09-17 18:48:22 +10:00
Miguel Jacq
94cc76729c Update stdeb.cfg to depend on bionic and Python 3.6 2018-09-17 09:16:11 +10:00
Miguel Jacq
73508f380f 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
47a6d94ef3 reduce verbosity of persistent mode label 2018-09-17 09:02:35 +10:00
Miguel Jacq
e9721aa243 Add 'what's this' labels to each General Setting 2018-09-17 09:01:30 +10:00
Miguel Jacq
5f31767a7b Reorder the general settings 2018-09-17 08:44:56 +10:00
Miguel Jacq
5a8f3b4f5c Use 'settings' rather than 'options' in the SettingsDialog labels 2018-09-17 08:43:19 +10:00
Micah Lee
868d1ac2f8 Fix suppressing the shutdown_slug message 2018-09-16 13:50:30 -07:00
Micah Lee
38dd9ce4cb Merge pull request #749 from mig5/shutdown_slug_systray_message 
Don't show the Flask shutdown slug route in the status bar as if it w…
 2018-09-16 12:38:17 -07:00
Miguel Jacq
244696afc9 Bump windows versions of pip packages to match those of OS X 2018-09-16 15:41:50 +10:00
Miguel Jacq
1a3d2b88d1 Don't show the Flash shutdown slug route in the status bar as if it were an unexpected 404 route 2018-09-16 15:15:40 +10:00
Micah Lee
a77f75fc84 Merge branch 'develop' of github.com:micahflee/onionshare into develop 2018-09-15 22:04:57 -07:00
Micah Lee
e4d5a74cca Monkeypatch flask to suppress output that isn't applicable to OnionShare 2018-09-15 22:04:08 -07:00
Miguel Jacq
dd1231061f Merge pull request #745 from micahflee/740_pip_dependencies 
Update all pip dependency versions
 2018-09-16 14:54:58 +10:00
Miguel Jacq
d4ac357a87 Merge branch 'receiver-mode-gui' into prop224_receiver_mode 2018-09-16 14:53:49 +10:00
Micah Lee
053cd42ff1 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
f2cfe42b9d Fix public mode tests for 404 2018-09-16 14:18:44 +10:00
Miguel Jacq
57f1d3b2ec Fix margins on HBoxLayouts in settings 2018-09-16 14:06:55 +10:00
Miguel Jacq
3b16b15b4c Move the hyperlink labels into HBox layouts with the checkboxes 2018-09-16 14:00:41 +10:00
Miguel Jacq
5443b6e63d 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
10771de2f8 Fix conflicts 2018-09-16 13:37:22 +10:00
Micah Lee
1af531eab2 Update all pip dependency versions 2018-09-15 20:33:12 -07:00
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