Commit Graph

1504 Commits

Author SHA1 Message Date
Miguel Jacq
45a5a2ae63
Use the distribution's PySocks module instead of our custom version 2018-09-04 14:26:47 +10:00
Micah Lee
0e9e729b6f
Merge branch 'mig5-693_fix_static_assets_macos' into develop 2018-09-02 13:36:30 -07:00
Micah Lee
d90c3c2490
Merge branch '693_fix_static_assets_macos' of https://github.com/mig5/onionshare into mig5-693_fix_static_assets_macos 2018-09-02 13:36:21 -07:00
Micah Lee
c037e32d8a
Merge branch 'mig5-lingering_object_naming_issues' into develop 2018-09-02 13:33:55 -07:00
Micah Lee
52c82f9b16
Merge branch 'lingering_object_naming_issues' of https://github.com/mig5/onionshare into mig5-lingering_object_naming_issues 2018-09-02 13:33:35 -07:00
Miguel Jacq
f6b031bc2c
Fix another two places where Alert was called without passing the common object 2018-07-21 15:50:37 +10:00
Micah Lee
1ad68c46d4
Merge branch 'license' into develop 2018-06-18 19:29:03 -07:00
Micah Lee
2ad1f77f91
Remove the /fd sha256 from signtool.exe command, because I'm having trouble generating signatures with the smart card setup with sha256 digests 2018-06-18 16:28:09 -07:00
Micah Lee
0626c2b6c3
LICENSE includes a note pointing to the 3rd party licenses 2018-06-18 16:26:53 -07:00
Micah Lee
1c552cc1e7
Version bump to 1.3.1 and updated changelog 2018-06-18 13:08:40 -07:00
Micah Lee
1cdd55cbe2
Oops, download 32-bit 7zip in build instructions 2018-06-18 12:55:59 -07:00
Micah Lee
7f9a27331e
Add requests build dependency, and use requests to download Tor Browser in get-tor-osx.py and get-tor-windows.py, because I was running into SSL certificate verification issues downloading using urllib 2018-06-18 12:53:27 -07:00
Micah Lee
53223bb52a
Upgrade get-tor scripts to download Tor Browser 7.5.5, which includes Tor 0.3.2.10 2018-06-18 12:10:28 -07:00
Micah Lee
3c8bc81b24
Update Windows build instructions to include newer versions of software 2018-06-18 12:00:50 -07:00
Micah Lee
13a5db2223
Renamed license files to be lowercase, use .txt extension 2018-06-18 10:34:06 -07:00
Micah Lee
4570db3786
Actually add licenses folder to PyInstaller spec 2018-06-17 16:55:04 -07:00
Micah Lee
9344fbd274
Update OnionShare copyright year to 2018 2018-06-17 16:53:44 -07:00
Micah Lee
a251dff670
Add onionshare license to licenses folder, and add licenses folder to PyInstaller spec, and to NSIS installer 2018-06-17 16:43:38 -07:00
Micah Lee
448bf2af4b
Added licenses for tor and obfs4 2018-06-17 16:19:09 -07:00
Miguel Jacq
41c10b1ea2
Fix installation of static assets on MacOS and probably Windows too 2018-05-28 16:14:44 +10:00
Miguel Jacq
7e7611bc34
Fix some lingering attribute/module references that had not been updated to use their new names/paths 2018-05-28 15:52:43 +10:00
Micah Lee
8658589b2d
Merge branch 'mig5-fix_python_setup' into develop 2018-05-21 23:00:10 -07:00
Miguel Jacq
97d42492e5
Fix python setup process for share/static dir contents 2018-05-02 14:41:15 +10:00
Miguel Jacq
7e777da27c
Merge pull request #683 from micahflee/receiver-mode
Refactoring, and receiver mode CLI
2018-04-29 09:20:42 +10:00
Micah Lee
0e9298794e
Typo 2018-04-24 17:18:33 -07:00
Micah Lee
aa8c07c434
In CLI recieve mode, tell the user where to look for uploaded files 2018-04-24 17:18:18 -07:00
Micah Lee
5e9465c807
Merge branch 'develop' into receiver-mode 2018-04-23 12:53:35 -07:00
Micah Lee
d5aaf559a5
Merge branch 'comradekingu-patch-1' into develop 2018-04-23 12:51:09 -07:00
Micah Lee
6f0daa789c
Merge branch 'patch-1' of https://github.com/comradekingu/onionshare into comradekingu-patch-1 2018-04-23 12:51:03 -07:00
Micah Lee
4af80de17b
Merge branch 'develop' into receiver-mode 2018-04-23 08:52:48 -07:00
Allan Nordhøy
97756ba8bc
Spellign: - not, expire 2018-04-23 04:21:37 +02:00
Miguel Jacq
c5741cd32b
Merge pull request #682 from micahflee/rearrange_settings
Rearrange settings
2018-04-23 10:55:00 +10:00
Micah Lee
91536ea571
Fix a few bugs that I missed when merging in develop 2018-04-22 17:46:14 -07:00
Micah Lee
8c89a05fd9
Merge branch 'develop' into receiver-mode 2018-04-22 17:38:28 -07:00
Micah Lee
a53d3188dd
Put test Tor button in a so it can be left-aligned 2018-04-22 17:20:58 -07:00
Micah Lee
87d29a9171
Rearrange some widgets in the settings dialog, specifically move the bridge options above the test Tor settings button 2018-04-22 17:15:15 -07:00
Micah Lee
1201205dee
Merge branch 'hide_primary_action_on_tor_disconnection' of https://github.com/mig5/onionshare into develop 2018-04-22 16:09:32 -07:00
Micah Lee
bb39ef9a34
Merge branch 'mig5-local_only_gui' into develop 2018-04-22 15:43:25 -07:00
Micah Lee
3584e57c5d
Merge branch 'local_only_gui' of https://github.com/mig5/onionshare into mig5-local_only_gui 2018-04-22 15:41:10 -07:00
Micah Lee
b4507149df
Merge branch 'mig5-657_meek_warning' into develop 2018-04-22 15:32:46 -07:00
Micah Lee
aaa860921a
Merge branch '657_meek_warning' of https://github.com/mig5/onionshare into mig5-657_meek_warning 2018-04-22 15:31:45 -07:00
Micah Lee
90e0e1b69b
Merge branch 'mig5-downloads_window' into develop 2018-04-22 15:28:31 -07:00
Micah Lee
16eab5e850
Add a stretch at the bottom of the downloads window, so that progess bars are always lined up at the top 2018-04-22 15:25:28 -07:00
Micah Lee
359bd59828
Merge branch 'downloads_window' of https://github.com/mig5/onionshare into mig5-downloads_window 2018-04-22 14:48:57 -07:00
Allan Nordhøy
f35061fa10
seem work → seem to work 2018-03-22 22:24:16 +01:00
Allan Nordhøy
3a5133ee7a
marked nouns, ellipsis, +, set up, addresses, could not 2018-03-22 22:06:08 +01:00
Micah Lee
bd7305ab16
Add new WSGI middleware just to attach the Web object to environ, and improve the UI of file upload progress 2018-03-21 18:27:42 -07:00
Micah Lee
f7640416eb
Remove the WSGI middleware, because I'm solving the problem in a different way 2018-03-21 17:51:42 -07:00
Micah Lee
facd441caf
For receive mode, use a custom flask Request, and a custom TemporaryFile, in order to keep track of file upload progress 2018-03-21 17:34:11 -07:00
Micah Lee
aafa9b1543
Add WSGI middleware in order to capture the progress of POST request uploads 2018-03-19 02:25:22 -07:00