Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-11 20:29:15 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,236 Commits 9 Branches 45 Tags
Commit Graph

1236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Micah Lee
9ec38b49fa Update drag and drop look and instructions 2018-02-04 13:13:38 -08:00
Miguel Jacq
7099dee9d7 Merge pull request #579 from b-meson/dev/master 
link to our mailing list
 2018-02-01 08:27:39 +11:00
Freddy Martinez
08ef15abc5 link to our mailing list 2018-01-31 10:59:46 -08:00
Micah Lee
d962fd2268 Merge branch 'Baccount-bump-Tor-to-0.2.3.9' into develop 2018-01-30 22:15:46 -08:00
Micah Lee
9fe4f26f2a Merge branch 'bump-Tor-to-0.2.3.9' of https://github.com/Baccount/onionshare into Baccount-bump-Tor-to-0.2.3.9 2018-01-30 21:57:09 -08:00
Micah Lee
7cc1e801a0 Merge branch 'mig5-535_force_update_check_via_qthread' into develop 2018-01-30 21:49:57 -08:00
Micah Lee
605d709200 Merge branch '535_force_update_check_via_qthread' of https://github.com/mig5/onionshare into mig5-535_force_update_check_via_qthread 2018-01-30 21:28:25 -08:00
Micah Lee
e4f5218596 Merge branch 'mig5-mac-python36-update-certs' into develop 2018-01-30 21:05:19 -08:00
Micah Lee
c8f878d2ae Merge branch 'mac-python36-update-certs' of https://github.com/mig5/onionshare into mig5-mac-python36-update-certs 2018-01-30 21:05:11 -08:00
Micah Lee
0745363c9d Merge branch 'Baccount-Update-URL' into develop 2018-01-30 21:03:16 -08:00
Micah Lee
4f5d87abe5 Merge branch 'Update-URL' of https://github.com/Baccount/onionshare into Baccount-Update-URL 2018-01-30 21:02:21 -08:00
Micah Lee
b4ad5fc877 Merge branch 'mig5-556_obfs4_in_custom_bridges' into develop 2018-01-30 20:54:59 -08:00
Micah Lee
cf9fd5c99d Merge branch '556_obfs4_in_custom_bridges' of https://github.com/mig5/onionshare into mig5-556_obfs4_in_custom_bridges 2018-01-30 20:47:29 -08:00
Micah Lee
e09a2e5250 Create github code owners file, make myself the owner 2018-01-30 14:59:43 -08:00
Baccount
8a47515905 Update get-tor-windows.py 2018-01-23 09:24:27 -08:00
Baccount
182b5a3981 Update macOS version tor to 0.2.3.9 2018-01-23 09:19:53 -08:00
Miguel Jacq
7038404075 reinstate the emitted signals for invalid version/error checking for updates 2018-01-23 16:51:13 +11:00
Miguel Jacq
49d5a3f34a #535 do the forced update check via a (non-blocking) QThread 2018-01-23 16:32:14 +11:00
Miguel Jacq
4f4741138d stricter regex of IPv4 as well as IPv6 IPs in custom bridges 2018-01-22 16:24:26 +11:00
Miguel Jacq
baec6e0d3a Add instruction to update Python 3.6's internal certificate store, to avoid validation error on archive.torproject.org 2018-01-21 13:42:46 +11:00
Miguel Jacq
e1f871a454 Merge pull request #560 from Baccount/eject-DMG 
Eject dmg
 2018-01-21 13:37:03 +11:00
Miguel Jacq
a75697ffc7 Merge pull request #563 from pierwill/french-translations 
French string translations
 2018-01-21 13:31:41 +11:00
pierwill
9cd8f8db35 French string translations 2018-01-20 15:41:52 -06:00
Baccount
76c4e890ce Update en.json 2018-01-18 22:36:34 -08:00
Baccount
908f84d250 Update get-tor-osx.py 2018-01-18 22:29:35 -08:00
Miguel Jacq
8ff81721c7 Support for obfs4 in custom bridges 2018-01-19 15:31:11 +11:00
Micah Lee
d84052228c Merge branch 'mig5-fix_slug_cli_mode' v1.2 2018-01-18 12:40:55 -08:00
Micah Lee
5fd547e4cd Merge branch 'fix_slug_cli_mode' of https://github.com/mig5/onionshare into mig5-fix_slug_cli_mode 2018-01-18 12:15:57 -08: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
69e4cf34d8 Updated changelog again 2018-01-17 19:47:24 -08:00
Micah Lee
2fc65b4eb0 Version bump to 1.2 and updated changelog 2018-01-17 19:36:56 -08:00
Micah Lee
7061ac3654 Temporary fix for #550 2018-01-17 18:53:45 -08:00
Micah Lee
ac1915a40f Force yes when extracting Tor Browser exe 2018-01-17 17:14:19 -08:00
Micah Lee
1eb8414bed Typo in 7-Zip URL 2018-01-17 17:13:59 -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
Micah Lee
b23b0ddb30 Merge branch 'mig5-fix_persistent_url' 2018-01-17 16:05:47 -08:00
Micah Lee
5afe30a6d3 Merge branch 'fix_persistent_url' of https://github.com/mig5/onionshare into mig5-fix_persistent_url 2018-01-17 16:05:38 -08:00
Micah Lee
e96265d719 Merge branch 'mig5-save_autoupdate_setting' 2018-01-17 16:02:29 -08:00
Micah Lee
eb3204d45b Merge branch 'save_autoupdate_setting' of https://github.com/mig5/onionshare into mig5-save_autoupdate_setting 2018-01-17 16:02:03 -08:00
Micah Lee
af5d4a77a4 Merge branch 'mig5-updatethread_reload_settings_before_save' 2018-01-17 16:00:53 -08:00
Micah Lee
084381c36b Merge branch 'updatethread_reload_settings_before_save' of https://github.com/mig5/onionshare into mig5-updatethread_reload_settings_before_save 2018-01-17 16:00:30 -08:00
Micah Lee
1575b074fd Merge branch 'master' of github.com:micahflee/onionshare into windows-1.2 2018-01-17 14:26:31 -08:00
Micah Lee
49b532bc1b Fix issue with Windows codesigning 2018-01-17 14:26:15 -08:00
Miguel Jacq
04e8c3b15d Re-load the settings in the UpdateCheck thread before saving, in case settings have changed in between starting thread and saving, so we don't clobber them 2018-01-18 08:43:14 +11: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
87b0b317d4 Save the use_autoupdate setting 2018-01-18 07:54:19 +11:00
Miguel Jacq
b07e299b0c Clarify that obfs4 bridges can't be used as custom bridges, and that obfs4proxy is needed for obfs4 bridges 2018-01-17 16:30:12 +11:00
Miguel Jacq
3ae3132690 Add missing items to the onionshare.nsi 2018-01-17 13:17:55 +11:00
Miguel Jacq
12b1921374 resolve conflicts 2018-01-17 12:50:11 +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