Micah Lee
052bc03d8d
Merge branch 'develop' into 641_fix_images_windows
2018-02-24 19:40:23 -08:00
Micah Lee
c13021e15b
When using <img>, put the src in quotes. Otherwise the filename is likely to have spaces in it, and the <img> src will break. Also, in Windows use backslashes for local resources instead of forward slashes
2018-02-24 18:38:40 -08:00
Micah Lee
50a79666a1
Merge branch 'remove_platform_re' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-remove_platform_re
2018-02-24 17:56:35 -08:00
Miguel Jacq
a6fe2a1c8a
Revert the cancel feature that causes issues at least on macOS ( #637 )
2018-02-25 12:31:32 +11:00
delirious-lettuce
f3ba1a697b
Remove use of re module by using str.endswith
2018-02-24 15:44:23 -07:00
Miguel Jacq
6b91b90bc6
Merge pull request #588 from micahflee/ux-update
...
Major user experience update
2018-02-25 08:27:46 +11:00
Micah Lee
f86b398329
Merge branch 'develop' of https://github.com/irykoon/onionshare into irykoon-develop
2018-02-22 16:57:06 -08:00
Micah Lee
eacb4c9fb0
Merge branch 'develop' into mig5-info_widgets_download_info
2018-02-19 18:02:51 -08:00
Micah Lee
e32ec4fc76
Merge branch 'sortable_tables' of https://github.com/mig5/onionshare into mig5-sortable_tables
2018-02-19 16:45:58 -08:00
Miguel Jacq
609404d7fe
merge ux-update in, and fix conflict
2018-02-20 07:47:21 +11:00
Miguel Jacq
b398d238d2
reset done to False if a download is still in progress
2018-02-19 12:47:21 +11:00
irykoon
25e3c7b24d
Support meek_lite Pluggable Transport
...
Currently, meek/meek_lite is one of the few, if not only, mature pluggable transport that works in some heavily cenosored areas, for example, China. Therefore, this can be a nice feature to have.
2018-02-15 23:19:53 +00:00
Miguel Jacq
70a80e3db5
Make table sortable with javascript (if enabled)
2018-02-14 16:56:03 +11:00
Miguel Jacq
fd034f5cb1
Pass the correct parameter to remove_ephemeral_hidden_service()
...
Add debug logs to verify if an onion was successfully deleted or not
2018-02-12 13:43:36 +11:00
Miguel Jacq
575d445de8
Fix function name remove_ephemeral_onion_service
2018-02-12 13:17:31 +11:00
Micah Lee
066264d684
Redesigned HTML/CSS download page
2018-02-10 16:19:23 -08:00
Micah Lee
094041a4b6
Add onionshare favicon to all HTML pages
2018-02-10 12:50:23 -08:00
Miguel Jacq
b13fb41555
Allow the user to cancel a share that is still starting up
2018-02-09 18:43:57 +11:00
Micah Lee
d16021d34b
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
Miguel Jacq
ffdbf8dec1
Merge pull request #585 from torbsd/openbsd-port-patches-2
...
Second attempt at patches for an OpenBSD port
2018-02-07 16:54:00 +11:00
attila
7a8376c1fc
Update patch as per the suggestion by @mig5 on
...
https://github.com/micahflee/onionshare/pull/585
Tested on current snapshot, both gui and cli work
2018-02-06 16:39:04 -05:00
attila
76526b18a5
Second attempt at patches for an OpenBSD port, this time based off of 1.2
...
and after feedback from the upstream and other contributors at
https://github.com/micahflee/onionshare/pull/489
2018-02-05 18:06:37 -05:00
Miguel Jacq
8ff81721c7
Support for obfs4 in custom bridges
2018-01-19 15:31:11 +11:00
Miguel Jacq
393a63a5c7
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
Micah Lee
7061ac3654
Temporary fix for #550
2018-01-17 18:53:45 -08:00
Micah Lee
e0e10c0531
Merge branch '435_support_bridges' of https://github.com/mig5/onionshare into mig5-435_support_bridges
2018-01-17 16:19:30 -08:00
Miguel Jacq
63581e250f
load the Settings in onionshare/__init__.py later, so that when saving slug, the private_key/hidservauth string have already been saved by the Onion object
2018-01-18 08:14:36 +11:00
Miguel Jacq
e4eafd7aeb
Extract tor and obfs4proxy executables from the main TorBrowser executable with 7-zip on Windows
2018-01-17 12:45:37 +11:00
Miguel Jacq
f14521af6a
Fix conflicts arising from the reuse_private_key branch
2018-01-16 15:30:36 +11:00
Micah Lee
d0c07266bb
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
Miguel Jacq
1754f53883
support obfs4 via obfs4proxy on macOS
2018-01-15 12:49:29 +11:00
Miguel Jacq
e8a4d513b4
Save the slug when using a persistent private key
2018-01-15 10:01:34 +11:00
Miguel Jacq
2c22fcc2e0
Catch the OSError in CLI mode when a file/folder can't be zipped up, and error out more gracefully
2018-01-14 20:36:43 +11:00
Miguel Jacq
a7edf810c8
Merge branch 'master' into check_is_valid_file
2018-01-14 20:24:02 +11:00
Miguel Jacq
293c17cf00
Resolve conflict with upstream's onion.py
2018-01-14 18:53:46 +11:00
Miguel Jacq
e97bee96fe
Resolve conflict with upstream's onion.py
2018-01-14 18:49:49 +11:00
Miguel Jacq
3d6ccac376
Resolve conflict with upstream's onion.py
2018-01-14 18:45:10 +11:00
Micah Lee
8664b98b1a
Merge branch 'mig5-493_500_detect_broken_tor_connection'
2018-01-13 22:50:57 -08:00
Micah Lee
ac29bdb5df
Better way to get the onion service_id
2018-01-13 19:18:33 -08:00
Micah Lee
861c4a7244
Merge branch '525_catch_failure_to_obtain_service_id' of https://github.com/mig5/onionshare into mig5-525_catch_failure_to_obtain_service_id
2018-01-13 19:09:03 -08:00
Micah Lee
7c653b6a8d
Merge branch '493_500_detect_broken_tor_connection' of https://github.com/mig5/onionshare into mig5-493_500_detect_broken_tor_connection
2018-01-13 16:32:56 -08:00
Micah Lee
46eccb53f2
Merge branch 'Increasing-the-timeout' of https://github.com/Baccount/onionshare into Baccount-Increasing-the-timeout
2018-01-13 13:46:51 -08:00
Miguel Jacq
eff94d7bfd
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
Micah Lee
0ba357eb73
Merge branch 'master' of https://github.com/wondratsch/onionshare
2018-01-12 18:58:41 -08:00
Miguel Jacq
ffa7f97905
catch error in start_onion_service in case we somehow failed to parse a service_id in Stem controller response
2018-01-02 16:35:48 +11:00
Miguel Jacq
d6677060af
4096 byte dir check is not consistent across platforms, remove it for now
2018-01-02 09:46:00 +11:00
Miguel Jacq
4079704be5
Check the file is a valid file or dir (not just that it exists)
2018-01-02 09:36:57 +11:00
Baccount
f96ff3328f
Update onion.py
2017-12-26 22:53:44 -08:00
Miguel Jacq
c3c50c0955
Fixes for the edge case where Tor connection dialog is canceled, but the Tor process remains open in the background, which was causing onion.is_authenticated() to True. Remove excessive alerts
2017-12-21 14:08:13 +11:00
Miguel Jacq
2b36938d53
Ensure we don't consider the Tor connection 'lost' if we're still in the connection dialog process (wait for that thread to finish).
...
Also various implementations of onion.is_authenticated() for a more robust check than onion.connected_to_tor,
which seemed to help some corner cases
2017-12-21 12:15:23 +11:00
