597 Commits

Author SHA1 Message Date
Micah Lee
271d712774 Use os.path.expanduser when creating data dir, and no need to try creating data dir in Settings.save because it's created in Config.build_data_dir 2018-12-21 10:46:09 -08:00
Micah Lee
66b824ccec Merge branch 'develop' of https://github.com/ageis/onionshare into ageis-develop 2018-12-21 10:40:49 -08:00
Micah Lee
3707664089 Make settings dialog checkboxes line up in macOS 2018-12-20 14:02:52 -08:00
Kevin Gallagher
f7e35deb78 Make sure the OnionShare data directory is created
Fixes #850
2018-12-19 16:07:16 -08:00
Micah Lee
3edad12e89 pwd module doesn't exist in Windows 2018-12-19 11:45:31 -08:00
Micah Lee
66b0b4a028 Merge branch '846_mac_packaging' into 406_osx_sandbox 2018-12-18 19:21:50 -08:00
Micah Lee
6856ae7e87 When discovering default locale, default to english if locale.getdefaultlocale() returns None. Also, make locales that include country codes (pt_PT and pt_BR) actually work as default locales 2018-12-18 18:53:40 -08:00
Micah Lee
e99666f458 When enabling debug mode in Web, use common.build_data_dir() to get data dir path 2018-12-16 17:20:28 -08:00
Micah Lee
f316b6ef3b Merge branch 'develop' into 406_osx_sandbox 2018-12-16 17:11:18 -08:00
Micah Lee
a26c457b3c Merge pull request #831 from micahflee/812_fix_v3_onions
[WIP] Fix v3 onion services
2018-12-16 17:01:40 -08:00
Micah Lee
8e900ace5c If a locale file includes a blank string, fallback to English instead of using the blank string 2018-12-16 10:55:13 -08:00
Micah Lee
f85c68c504 Change filename of flask debug log file, store it in the OnionShare data dir instead of /tmp 2018-12-11 08:06:14 -08:00
Micah Lee
29f0570e4b When debug mode is enabled, don't log flask errors to disk 2018-12-11 07:16:44 -08:00
Micah Lee
86598ca094 Fixed typo in comment 2018-12-10 07:18:25 -08:00
Micah Lee
d3298f8e7c Split pt locale into pt_BR and pt_PT 2018-12-08 11:25:06 -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
04171a7ca6 Only allow starting v3 onion services if the tor that we're connected to supports it 2018-12-05 20:46:01 -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
Micah Lee
63a02f4e81 Merge branch 'develop' into 406_osx_sandbox 2018-11-26 18:07:12 -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
Micah Lee
794573ec5e Build downloads_dir a different way in macOS, so it's correct despite the sandbox 2018-11-25 17:48:11 -08:00
Micah Lee
507cb837ab Make sure downloads_dir exists after loading settings 2018-11-25 17:34:06 -08:00
Micah Lee
ef6de7eb3a Make tor data dir always be a tempdir inside OnionShare's data dir 2018-11-25 17:17:56 -08:00
Micah Lee
dd67de5563 Make macOS use Tor control ports instead of unix sockets to connect to the Tor controller 2018-11-25 16:50:20 -08:00
Micah Lee
d5538e715d Display tor_data_directory as debug log 2018-11-25 16:26:54 -08:00
Micah Lee
267c4013f5 Create a group container for macOS sandbox, and on Mac put the Tor data dir in it 2018-11-25 16:15:27 -08:00
Micah Lee
91b4c3cc00 Fix bug related to persistent addresses when using v2 onion services 2018-11-25 13:14:56 -08:00
Micah Lee
eca1f9cc8d Merge branch 'develop' into v3-revisited 2018-11-18 17:04:20 -08:00
Miguel Jacq
7151874dad remove debug log 2018-11-13 15:06:28 +11:00
Miguel Jacq
1b670898a0 Merge develop branch and fix conflicts 2018-11-13 14:45:40 +11:00
Miguel Jacq
005d2d0af7 Try and fix closing the request for a valid upload post-timer expiry, whilst still rejecting subsequent uploads 2018-11-13 14:42:26 +11:00
Micah Lee
a8dae82ac3 Fix tests so they recognize the new receive mode location 2018-10-26 15:08:55 -07: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
36a785f617 Remove the whole onionkey module, and generate onion keys using stem 1.7.0 2018-10-11 19:38:05 -07:00
Miguel Jacq
826e1c2d51 Fix conflicts 2018-10-11 13:04:48 +11:00
Micah Lee
5db8bd36b9 Merge branch '780_improved_ui' into 690_language_dropdown 2018-10-10 18:32:01 -07:00
Micah Lee
84cafcbd3d Make the history indicator label circular again 2018-10-09 21:49:05 -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
Miguel Jacq
b27007b20d Make auto-stop timer work on CLI when an upload is still in progress on expiry 2018-10-02 15:41:29 +10:00
Miguel Jacq
509d313464 Try to fix logic handling last upload after timer expiry 2018-10-02 08:22:08 +10:00
Miguel Jacq
80a70a6fc6 remove unused variable 2018-10-02 07:33:13 +10:00
Miguel Jacq
7fc4f97b2a remove uploads_in_progress list from web side 2018-10-01 19:18:50 +10:00
Miguel Jacq
c8fc6d7f85 Another unused variable 2018-10-01 19:17:50 +10:00
Miguel Jacq
eeedd32793 remove unused variable, whitespace 2018-10-01 19:15:58 +10: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