Micah Lee eacb4c9fb0 Merge branch 'develop' into mig5-info_widgets_download_info

2018-02-19 18:02:51 -08:00

..

__init__.py

load Settings in onionshare/__init__.py before we initiate the web thread, since it needs to send the saved slug to the web server

2018-01-18 22:42:43 +11:00

common.py

Second attempt at patches for an OpenBSD port, this time based off of 1.2

2018-02-05 18:06:37 -05:00

onion.py

Merge branch 'develop' into mig5-info_widgets_download_info

2018-02-19 18:02:51 -08:00

onionshare.py

Move the saving of private key into the SettingsDialog and Onion objects entirely (no QPushButton to save it)

2018-01-13 20:58:24 +11:00

settings.py

Move auto-stop timer into settings, so its UI does not show up unless the user specifically enables that feature

2018-02-07 09:55:55 -08:00

socks.py

Various fixes

2015-07-25 11:22:24 +02:00

strings.py

Reorder imports, remove p, use ext, use json.load(f)

2017-07-10 20:11:04 -06:00

web.py

Merge branch 'develop' into mig5-info_widgets_download_info

2018-02-19 18:02:51 -08:00