Commit Graph

1523 Commits

Author SHA1 Message Date
Micah Lee
6269f16034
Update all pip dependency versions 2018-09-15 20:33:12 -07:00
Micah Lee
6839ec43d4
Merge branch 'mig5-fix_help_systray_slot' into develop 2018-09-14 18:43:34 -07:00
Micah Lee
db63b4c9c3
Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into develop 2018-09-14 18:43:25 -07:00
Micah Lee
96b59c49e0
Merge branch 'mig5-685_use_dist_socks' into develop 2018-09-14 18:41:52 -07:00
Micah Lee
2605967011
Merge branch '685_use_dist_socks' of https://github.com/mig5/onionshare into mig5-685_use_dist_socks 2018-09-14 18:40:26 -07:00
Micah Lee
4a51f09c53
Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into mig5-fix_help_systray_slot 2018-09-14 18:38:32 -07:00
Micah Lee
23415a43f2
Merge branch 'mig5-fix_invalid_version_alert' into develop 2018-09-14 18:33:10 -07:00
Micah Lee
4c87393550
Merge branch 'fix_invalid_version_alert' of https://github.com/mig5/onionshare into mig5-fix_invalid_version_alert 2018-09-14 18:32:32 -07:00
Micah Lee
1da30cb12d
Merge branch 'mig5-opensuse_build_instructions' into develop 2018-09-14 17:04:00 -07:00
Micah Lee
04984aa420
Merge branch 'opensuse_build_instructions' of https://github.com/mig5/onionshare into mig5-opensuse_build_instructions 2018-09-14 17:03:50 -07:00
Micah Lee
1d67c4d25b
Merge branch 'mig5-692_appstream_file_location' into develop 2018-09-14 16:55:27 -07:00
Micah Lee
8cbac4e671
Merge branch '692_appstream_file_location' of https://github.com/mig5/onionshare into mig5-692_appstream_file_location 2018-09-14 16:55:11 -07:00
Micah Lee
8861b9f716
Merge branch 'mig5-691_remove_meek_lite_amazon' into develop 2018-09-14 16:29:53 -07:00
Miguel Jacq
85fa44a01f
Pass self to help_clicked function in systray, so we can use self.common 2018-09-04 14:49:56 +10:00
Miguel Jacq
45a5a2ae63
Use the distribution's PySocks module instead of our custom version 2018-09-04 14:26:47 +10:00
Miguel Jacq
45d6a94d38
Fix conflict from develop branch 2018-09-04 11:43:35 +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
2fd2cf3e2e
Fix the passing of the latest version returned to the UI if it is an invalid version 2018-08-30 15:18:29 +10:00
Miguel Jacq
1b4c989f06
Add explicit dependency on rpm-build in the BUILD.md. Add a link to community-provided OpenSuSE instructions 2018-08-15 09:09:52 +10:00
Miguel Jacq
d2934e74ec
#692 move appstream file to /usr/share/metainfo 2018-07-22 15:50:37 +10:00
Miguel Jacq
a830eb57fe
#691 remove meek_lite Amazon 2018-07-21 15:52:11 +10: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