Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-03-16 02:46:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,647 Commits 36 Branches 46 Tags
Commit Graph

1647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miguel Jacq
551e7e97ca Remove unnecessary loop. Remove the Close route/setting which can DoS another running upload. Fix detecting whether any uploads are still in progress before terminating the service after timer expires. Don't register 404s for uploads after expiry has finished (throw a 403 instead)" 2018-09-18 08:36:07 +10:00
Miguel Jacq
2e6bd74fa8 Hold a share open if its timer hsa expired but a file is still uploading. Don't allow other uploads during this time 2018-09-17 17:42:04 +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
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
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
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
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
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
0c50f4ea93 Add explicit dependency on rpm-build in the BUILD.md. Add a link to community-provided OpenSuSE instructions 2018-08-15 09:09:52 +10:00
Miguel Jacq
f6f469db59 remove obsolete strings 2018-07-22 17:13:23 +10:00
Miguel Jacq
f6dbc55c0c Also include test dir for strings 2018-07-22 17:13:04 +10:00