600 Commits

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
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
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
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
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
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
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
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
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
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
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
e89a74729b Expand 'public mode' (optional slugs) to be possible for sharing too, not just receiving, with no rate-limiting/self-destruct on invalid routes. 2018-07-21 17:06:11 +10:00
Miguel Jacq
a6bc01533b #691 remove meek_lite Amazon 2018-07-21 15:52:11 +10:00
Miguel Jacq
4bdbf3f152 Fix another two places where Alert was called without passing the common object 2018-07-21 15:50:37 +10:00
Miguel Jacq
cb47c34942 Fix minor spelling/grammar issues 2018-07-14 16:43:21 +10:00
Miguel Jacq
757a6bac59 #707 Hide/show the primary action in Receive Mode when tor connection is lost/regained 2018-07-14 16:19:16 +10:00
Miguel Jacq
bc36b73b6f Remove duplicate line 2018-07-13 15:50:17 +10:00
Micah Lee
48e9beb1bb Merge branch 'license' into develop 2018-06-18 19:29:03 -07:00
Micah Lee
e05cee19bc Update OnionShare copyright year to 2018 2018-06-17 16:53:44 -07:00
Miguel Jacq
445a8423d5 Fix some lingering attribute/module references that had not been updated to use their new names/paths 2018-05-28 15:52:43 +10:00
Micah Lee
cf2a2076fe Remove TODO comment 2018-05-20 15:33:13 -07:00
Micah Lee
5bce32fc7d Make it so the open folder button works in Linux, with nautilus 2018-05-20 14:40:27 -07:00
Micah Lee
880a21086c Rename uploaded files 2018-05-20 14:12:53 -07:00
Micah Lee
06693bded2 Fixed "RuntimeError: dictionary changed size during iteration" exception while updating upload progress 2018-05-20 14:05:34 -07:00
Micah Lee
9f4e287b4b Remove REQUEST_UPLOAD_NEW_FILE_STARTED event, because it's not actually needed 2018-05-20 12:07:15 -07:00
Micah Lee
5178f49718 Only show other_page_loaded message on actual 404s 2018-05-20 11:04:45 -07:00
Micah Lee
d8d1dc800d Allow file uploads to finish, and improve uploads styling 2018-05-19 22:58:55 -07:00
Micah Lee
28fe7a4cf5 Refactor uploads GUI so that each upload POST has one progess bar, and a list of files, with partial styling 2018-05-19 22:36:08 -07:00
Micah Lee
0b5a5d08dd Move downloads_dir validation into the /upload request in Web, and display an error in both CLI and GUI 2018-05-19 21:11:57 -07:00
Micah Lee
b8aa26d72e Start building File/Upload/Uploads GUI 2018-05-08 14:28:02 -07:00
Micah Lee
1db37e13f5 Start making Web events actually put Upload objects into Uploads 2018-05-07 23:07:11 -07:00
Micah Lee
9d91e07d20 Renamed Mode.handle_request_download to handle_request_started 2018-05-07 22:16:45 -07:00
Micah Lee
26a94fa161 Make receive mode events just like share mode, and rename REQUEST_DOWNLOAD to REQUEST_SHARE 2018-05-07 22:15:29 -07:00
Micah Lee
de43cd22fa Create an Upload class within Uploads, and add methods to Uploads to add, update, cancel, and reset 2018-05-07 16:38:29 -07:00
Micah Lee
613c3dfbd6 Move all stylesheets definitions into Common, so now we no longer have blocks of css spread across the GUI code, and it's easier to re-use stylesheets 2018-05-07 16:21:22 -07:00
Micah Lee
4f52b4fc86 Make ReceiveMode start using Uploads 2018-05-07 15:44:04 -07:00
Micah Lee
2a9f60ccee Rename Downloads method names to remove the word "download" 2018-05-04 18:08:23 -07:00
Micah Lee
925f96ad0a Rename some images to reuse in ReceiveMode, and make new upload window button images 2018-05-04 17:57:30 -07:00
Micah Lee
e7c3db3b57 Refactor ShareMode and Downloads to remove the Downloads container widget, and make Downloads itself the QScrollArea 2018-05-04 16:57:17 -07:00
Micah Lee
7a71c4376a Remove --shutdown-timeout as an option for onionshare_gui, since GUI options are set in the settings dialog. Also fixed a bug where --local-only and --shutdown-timeout were not compatible in onionshare CLI 2018-05-04 16:43:30 -07:00
Micah Lee
87e8652c18 Fix stay_open regression bug. Before, it was closing automatically even when the setting wasn't set. Also, remove the --stay-open option from the GUI, since GUI settings are set in the settings dialog not cli args 2018-05-04 16:35:32 -07:00
Micah Lee
bc5f299ecd Start building Uploads widget 2018-05-04 16:26:54 -07:00