Micah Lee 808c4cfac2

Merge branch 'check_is_valid_file' of https://github.com/mig5/onionshare into mig5-check_is_valid_file

2018-01-14 18:54:48 -08:00

..

__init__.py

Merge branch 'check_is_valid_file' of https://github.com/mig5/onionshare into mig5-check_is_valid_file

2018-01-14 18:54:48 -08:00

common.py

Merge branch 'master' of https://github.com/wondratsch/onionshare

2018-01-12 18:58:41 -08:00

onion.py

Resolve conflict with upstream's onion.py

2018-01-14 18:49:49 +11: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

Save the slug when using a persistent private key

2018-01-15 10:01:34 +11: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

Save the slug when using a persistent private key

2018-01-15 10:01:34 +11:00