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

1415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Micah Lee
95dac4f22f Merge branch 'mig5-update_build_docs' 2018-01-16 15:19:13 -08:00
Micah Lee
5a438ad86e Merge branch 'update_build_docs' of https://github.com/mig5/onionshare into mig5-update_build_docs 2018-01-16 15:19:06 -08:00
Micah Lee
d7fe301f03 Merge branch 'mig5-update_check_translation_script' 2018-01-16 15:18:26 -08:00
Micah Lee
dfc4db1436 Merge branch 'update_check_translation_script' of https://github.com/mig5/onionshare into mig5-update_check_translation_script 2018-01-16 15:17:23 -08:00
Micah Lee
b3f080b6fc Merge branch 'windows-1.2' 2018-01-16 15:16:13 -08:00
Micah Lee
2047eba610 Merge branch 'master' into windows-1.2 2018-01-16 15:15:59 -08:00
Micah Lee
2ca24d2c6a Update macOS build instructions and pip dependency versions, and also update stem for Windows as well 2018-01-16 14:47:50 -08:00
Micah Lee
20e5394a8f Change another Windows python 3.5 reference to 3.6 2018-01-16 08:42:55 -08:00
Micah Lee
ba0736e1c6 Change Windows build instructions reference from python 3.5 to 3.6, and remove the pyinstaller-script.py hack instructions becase they are not needed anymore 2018-01-16 08:41:43 -08:00
Miguel Jacq
57ef436536 Fix indentation... 2018-01-16 16:48:35 +11:00
Miguel Jacq
5483aac129 Better match for lang code filter 2018-01-16 16:45:54 +11:00
Micah Lee
366ec6724e Updating Windows build deps, and recreating the nsis installer script for new files 2018-01-15 21:32:55 -08:00
Miguel Jacq
ed9ed1770d Add -l arg to check_lacked_trans.py, to filter on a specific language code 2018-01-16 16:32:26 +11:00
Miguel Jacq
5a36f945b1 Update the check_lacked_trans.py script to work with latest codebase and use python 3 2018-01-16 16:17:23 +11:00
Miguel Jacq
f14521af6a Fix conflicts arising from the reuse_private_key branch 2018-01-16 15:30:36 +11:00
Miguel Jacq
51ced125b1 Add obfs4proxy as a dependency on Debian/Fedora-like distros, for obfs4 bridge support 2018-01-16 15:29:03 +11:00
Miguel Jacq
5c64a9c7f8 Link to the Linux Distribution Support wiki doc for help building from source, due to various differences in Tor, Stem, Stdeb versions 2018-01-16 14:50:00 +11:00
Micah Lee
f0f2243c4e Update pip requirements for Windows 2018-01-15 16:45:07 -08:00
Micah Lee
ca50d997df Update build instructions for Windows, using newer software. And rename installer to onionshare-setup.exe 2018-01-15 15:53:02 -08:00
Micah Lee
c1d9f5c1b4 Merge branch 'b-meson-docs-readme' 2018-01-15 12:26:45 -08:00
Micah Lee
4498919700 Merge branch 'docs-readme' of https://github.com/b-meson/onionshare into b-meson-docs-readme 2018-01-15 12:26:34 -08:00