Baccount
|
1fb2116efd
|
Update en.json
|
2018-01-18 22:36:34 -08:00 |
|
Micah Lee
|
95c8c0fb81
|
Merge branch 'mig5-fix_slug_cli_mode'
|
2018-01-18 12:40:55 -08:00 |
|
Micah Lee
|
c797dc93e1
|
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
|
206472cb78
|
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
|
849998226a
|
Updated changelog again
|
2018-01-17 19:47:24 -08:00 |
|
Micah Lee
|
1d1648bb90
|
Version bump to 1.2 and updated changelog
|
2018-01-17 19:36:56 -08:00 |
|
Micah Lee
|
f499b126cc
|
Temporary fix for #550
|
2018-01-17 18:53:45 -08:00 |
|
Micah Lee
|
3b013f379f
|
Force yes when extracting Tor Browser exe
|
2018-01-17 17:14:19 -08:00 |
|
Micah Lee
|
6629aec341
|
Typo in 7-Zip URL
|
2018-01-17 17:13:59 -08:00 |
|
Micah Lee
|
713e45084a
|
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
|
ec6adfdb8f
|
Merge branch 'mig5-fix_persistent_url'
|
2018-01-17 16:05:47 -08:00 |
|
Micah Lee
|
ae75624c0d
|
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
|
c34360de7a
|
Merge branch 'mig5-save_autoupdate_setting'
|
2018-01-17 16:02:29 -08:00 |
|
Micah Lee
|
53e15096e3
|
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
|
549a66dfdf
|
Merge branch 'mig5-updatethread_reload_settings_before_save'
|
2018-01-17 16:00:53 -08:00 |
|
Micah Lee
|
14bc4d4ccc
|
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
|
09f09c7d44
|
Merge branch 'master' of github.com:micahflee/onionshare into windows-1.2
|
2018-01-17 14:26:31 -08:00 |
|
Micah Lee
|
790d07a4e7
|
Fix issue with Windows codesigning
|
2018-01-17 14:26:15 -08:00 |
|
Miguel Jacq
|
bbb6c8ddf8
|
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
|
9ed748db86
|
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
|
4b5319bb4e
|
Save the use_autoupdate setting
|
2018-01-18 07:54:19 +11:00 |
|
Miguel Jacq
|
fc2dcafafc
|
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
|
8375520e10
|
Add missing items to the onionshare.nsi
|
2018-01-17 13:17:55 +11:00 |
|
Miguel Jacq
|
7237b65a32
|
resolve conflicts
|
2018-01-17 12:50:11 +11:00 |
|
Miguel Jacq
|
40ee114803
|
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
|
4261670b59
|
Merge branch 'mig5-update_build_docs'
|
2018-01-16 15:19:13 -08:00 |
|
Micah Lee
|
ffe56c5655
|
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
|
f0d68f7e28
|
Merge branch 'mig5-update_check_translation_script'
|
2018-01-16 15:18:26 -08:00 |
|
Micah Lee
|
7d5eda6fac
|
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
|
adee5f54ad
|
Merge branch 'windows-1.2'
|
2018-01-16 15:16:13 -08:00 |
|
Micah Lee
|
dc12523ed1
|
Merge branch 'master' into windows-1.2
|
2018-01-16 15:15:59 -08:00 |
|
Micah Lee
|
f0e23949c9
|
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
|
4cee88125d
|
Change another Windows python 3.5 reference to 3.6
|
2018-01-16 08:42:55 -08:00 |
|
Micah Lee
|
a6bc9b92c3
|
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
|
0333ec915c
|
Fix indentation...
|
2018-01-16 16:48:35 +11:00 |
|
Miguel Jacq
|
83e0d9f4de
|
Better match for lang code filter
|
2018-01-16 16:45:54 +11:00 |
|
Micah Lee
|
b7192f2764
|
Updating Windows build deps, and recreating the nsis installer script for new files
|
2018-01-15 21:32:55 -08:00 |
|
Miguel Jacq
|
c3bf8f0739
|
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
|
ce1b2bd513
|
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
|
76cf0ae107
|
Fix conflicts arising from the reuse_private_key branch
|
2018-01-16 15:30:36 +11:00 |
|
Miguel Jacq
|
cc9a08c07d
|
Add obfs4proxy as a dependency on Debian/Fedora-like distros, for obfs4 bridge support
|
2018-01-16 15:29:03 +11:00 |
|
Miguel Jacq
|
3d6309ba94
|
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
|
ea908c1841
|
Update pip requirements for Windows
|
2018-01-15 16:45:07 -08:00 |
|
Micah Lee
|
fa280036e6
|
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
|
c7dac6c40c
|
Merge branch 'b-meson-docs-readme'
|
2018-01-15 12:26:45 -08:00 |
|
Micah Lee
|
23f0ad54d8
|
Merge branch 'docs-readme' of https://github.com/b-meson/onionshare into b-meson-docs-readme
|
2018-01-15 12:26:34 -08:00 |
|
Micah Lee
|
21112fa433
|
Merge branch 'mig5-528_disable_check_for_updates_if_disconnected'
|
2018-01-14 19:13:54 -08:00 |
|
Freddy Martinez
|
97a077854a
|
this commit cleans up the README.md
|
2018-01-14 19:06:58 -08:00 |
|
Micah Lee
|
c29259cdea
|
Merge branch '528_disable_check_for_updates_if_disconnected' of https://github.com/mig5/onionshare into mig5-528_disable_check_for_updates_if_disconnected
|
2018-01-14 19:00:39 -08:00 |
|
Micah Lee
|
58f4e7e756
|
Merge branch 'mig5-check_is_valid_file'
|
2018-01-14 18:59:14 -08:00 |
|