Miguel Jacq
|
c3755389dd
|
Fix conflict
|
2018-09-18 10:26:16 +10:00 |
|
Miguel Jacq
|
4434e4c920
|
Fix test
|
2018-09-18 09:59:06 +10:00 |
|
Micah Lee
|
6efc281fbb
|
Merge branch 'develop' into receiver-mode-gui
|
2018-09-17 16:15:08 -07:00 |
|
Micah Lee
|
6d9d861083
|
Merge branch 'mig5-prop224_receiver_mode' into receiver-mode-gui
|
2018-09-17 16:12:06 -07:00 |
|
Micah Lee
|
359e470383
|
Make what's this links use the same string, and change their style
|
2018-09-17 16:11:52 -07:00 |
|
Micah Lee
|
cddc7f8c57
|
Merge branch 'prop224_receiver_mode' of https://github.com/mig5/onionshare into mig5-prop224_receiver_mode
|
2018-09-17 15:57:15 -07:00 |
|
Miguel Jacq
|
7e875e021a
|
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 |
|
Micah Lee
|
f0c6a225ad
|
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
|
6ca5f05d19
|
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
|
953727419c
|
Use the term 'upload' rather than 'download' in the Receive mode tooltip icons
|
2018-09-17 18:48:22 +10:00 |
|
Miguel Jacq
|
b06fd8af26
|
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 |
|
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 |
|
Micah Lee
|
4777c45ad8
|
Fix suppressing the shutdown_slug message
|
2018-09-16 13:50:30 -07:00 |
|
Micah Lee
|
94048c48c7
|
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
|
05a9e3b158
|
Bump windows versions of pip packages to match those of OS X
|
2018-09-16 15:41:50 +10:00 |
|
Miguel Jacq
|
7bd897d19e
|
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
|
70878e9dc6
|
Merge branch 'develop' of github.com:micahflee/onionshare into develop
|
2018-09-15 22:04:57 -07:00 |
|
Micah Lee
|
f90e96e21a
|
Monkeypatch flask to suppress output that isn't applicable to OnionShare
|
2018-09-15 22:04:08 -07:00 |
|
Miguel Jacq
|
806d670379
|
Merge pull request #745 from micahflee/740_pip_dependencies
Update all pip dependency versions
|
2018-09-16 14:54:58 +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
|
6269f16034
|
Update all pip dependency versions
|
2018-09-15 20:33:12 -07: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 |
|