939 Commits

Author SHA1 Message Date
Micah Lee
1a1a247db9 Fix bug in HistoryItem.get_finished_label_text 2019-01-19 19:33:36 -08:00
Micah Lee
1f32ea6148 Rename images to remove upload/download references, and update more strings 2019-01-19 19:00:41 -08:00
Micah Lee
38732c5bb7 Updated language on key share/receive mode strings to remove the confusing upload and download words 2019-01-19 18:30:13 -08:00
Micah Lee
f883700c92 Merge pull request #853 from micahflee/847_fix_mac_css
Make settings dialog checkboxes line up in macOS
2018-12-21 10:38:38 -08:00
Micah Lee
a68329ffdb Merge branch 'develop' of https://github.com/irykoon/onionshare into irykoon-develop 2018-12-20 14:07:47 -08:00
Micah Lee
3707664089 Make settings dialog checkboxes line up in macOS 2018-12-20 14:02:52 -08:00
Micah Lee
f316b6ef3b Merge branch 'develop' into 406_osx_sandbox 2018-12-16 17:11:18 -08:00
Micah Lee
5655bb9017 Update settings dialog tests to use an OnionStub instead of an Onion, and test different states of tor (authenticate and not, supports v3 and not) 2018-12-05 23:05:25 -08:00
Micah Lee
f1962cf647 Don't actually check the 'Use legacy addresses' checkbox when it's hidden 2018-12-05 20:53:03 -08:00
Micah Lee
16f6742a71 Require tor 0.4.0.0 for v3 onion services (will change in the future). And update settings dialog so if the connected version of tor doesn't support v3 onions, then always show legacy options. If it does support v3 onions, allow 'Use legacy addresses' 2018-12-05 20:33:45 -08:00
Micah Lee
00cbc2ff4b Only show onion settings if there is a Tor connection 2018-12-05 20:14:52 -08:00
Micah Lee
73fdc0ffc4 Merge pull request #752 from mig5/receiver-mode-gui-hold-timeout-share-open-til-upload-finished
Hold a share open if its timer has expired but a file is still uploading.
2018-12-05 09:13:54 -08:00
Miguel Jacq
195df0499d Keep the upload running in the GUI if the timer has run out 2018-12-05 18:19:35 +11:00
Micah Lee
1ebb2dc796 In macOS, split "Add" button into "Add Files" and "Add Folder" buttons 2018-11-27 12:10:16 -08:00
Micah Lee
9e7c83cf6a Merge pull request #763 from mig5/open_folder_uploads_macos_windows
Open folder containing uploads with the file selected, in macOS and Windows
2018-11-26 18:03:52 -08:00
Miguel Jacq
9a3e2df7aa Remove obsolete Download/Upload code that crept back in via an earlier merge 2018-11-27 10:50:11 +11:00
Miguel Jacq
1b670898a0 Merge develop branch and fix conflicts 2018-11-13 14:45:40 +11:00
Micah Lee
0bab7be444 Communicate the receive mode dir to the GUI, so clicking the open folder button opens the file manager to the correct directory 2018-10-25 21:38:20 -07:00
Micah Lee
2c45f6851e Receive mode puts files in a directory based on the timestamp of the upload 2018-10-25 21:13:16 -07:00
Micah Lee
8c0ded83a3 Merge pull request #810 from mig5/fix_timer_alert
Fix call to Alert() when an autostop timer has run out before starting the share
2018-10-16 22:16:35 -07:00
Miguel Jacq
c9ce040e4b Fix call to Alert() when an autostop timer has run out before starting the share 2018-10-17 10:47:55 +11:00
Miguel Jacq
57b105b631 Remove second arg from two calls to strings() 2018-10-15 17:33:21 +11:00
Miguel Jacq
826e1c2d51 Fix conflicts 2018-10-11 13:04:48 +11:00
Micah Lee
186a174e62 Fix various bugs so local GUI tests pass again after merges 2018-10-10 18:45:55 -07:00
Micah Lee
5db8bd36b9 Merge branch '780_improved_ui' into 690_language_dropdown 2018-10-10 18:32:01 -07:00
Micah Lee
74c3a4d75c Merge branch 'develop' into 690_language_dropdown 2018-10-10 18:25:28 -07:00
Micah Lee
6d448b7cde Final few tweaks to make this look perfect in macOS 2018-10-10 18:16:08 -07:00
Miguel Jacq
c02f6a9306 Remove commented out obsolete code 2018-10-10 18:09:43 +11:00
Miguel Jacq
ff00007db3 Raise minimumHeight again to account for overlap issues on MacOS caused by Mac's Qt widget padding 2018-10-10 16:49:42 +11:00
Micah Lee
3cf36c4531 Add "download started" date/time to download history progress bars 2018-10-09 22:21:03 -07:00
Micah Lee
31ed23459b Merge in develop 2018-10-09 21:32:28 -07:00
Micah Lee
0f6ef3797f Stop hiding the share mode info label when tor breaks 2018-10-09 21:18:26 -07:00
Micah Lee
acf40c4c26 Actually, the window needs to be taller 2018-10-09 21:15:42 -07:00
Micah Lee
93d21c6041 Set min width and height so everything always looks good, and change onion address to monospace font 2018-10-09 20:51:10 -07:00
Micah Lee
9eec5f82f4 Remove one more reference to resize_window 2018-10-07 22:09:57 -07:00
Micah Lee
d73acb1258 Rip out all of the adjust size logic and let Qt just handle it 2018-10-07 22:07:19 -07:00
Micah Lee
8067662685 Missing imports 2018-10-07 21:57:45 -07:00
Miguel Jacq
331d7bf9c7 adjust widget sizes when switching mode 2018-10-07 21:47:28 -07:00
Micah Lee
bf56548e7e Properly close items inside the item list, instead of just hiding them 2018-10-07 21:46:16 -07:00
Micah Lee
1cdbe4538c Remove obsolete ReceiveModeInfo file 2018-10-07 21:28:10 -07:00
Micah Lee
38e7738543 Update ReceiveMode to use History directly, and now all GUI tests pass 2018-10-07 21:14:20 -07:00
Micah Lee
c10d56e011 The History header is now only shown if there are items again, and the clear history button resets everything. Also, reset hides individual items because, for some reason, they still show up otherwise. 2018-10-07 18:20:32 -07:00
Micah Lee
d047f1261a Delete Info widget, and move completed and in progress widgets into the header of history 2018-10-07 18:09:02 -07:00
Micah Lee
63b095086b Make ShareMode just use a History object directly, instead of defining its own Downloads class 2018-10-07 17:35:15 -07:00
Micah Lee
cedb8f53c0 In ShareMode, remove the ShareModeInfo widget and replace with a customized ToggleHistory widget 2018-10-07 15:20:22 -07:00
Micah Lee
b0b5b6c79e Move ShareMode and ReceiveMode into Mode module 2018-10-07 14:54:51 -07:00
Micah Lee
62718d1c8b Move Mode module into its own folder 2018-10-07 14:48:15 -07:00
Miguel Jacq
d267cc597d Fix logic for handling an upload still in progress when timer runs out. Show thankyou page for last uploader post-timer expiry 2018-10-01 18:42:53 +10:00
Miguel Jacq
d69bba4c9d Merge develop in and fix upload/timer functionality so that it works as described. Still needs fixing to not throw a connection error to the lucky last uploader after their upload completes and server stops due to expiry having passed 2018-10-01 16:42:54 +10:00
Miguel Jacq
1e3b32ebbb Load default settings before parsing for any alternate config. Reload strings if an alternate config was passed in after 2018-10-01 15:32:53 +10:00