1527 Commits

Author SHA1 Message Date
Miguel Jacq
244696afc9 Bump windows versions of pip packages to match those of OS X 2018-09-16 15:41:50 +10:00
Micah Lee
a77f75fc84 Merge branch 'develop' of github.com:micahflee/onionshare into develop 2018-09-15 22:04:57 -07:00
Micah Lee
e4d5a74cca Monkeypatch flask to suppress output that isn't applicable to OnionShare 2018-09-15 22:04:08 -07:00
Miguel Jacq
dd1231061f Merge pull request #745 from micahflee/740_pip_dependencies
Update all pip dependency versions
2018-09-16 14:54:58 +10:00
Micah Lee
1af531eab2 Update all pip dependency versions 2018-09-15 20:33:12 -07:00
Micah Lee
0881f7f6d9 Merge branch 'mig5-fix_help_systray_slot' into develop 2018-09-14 18:43:34 -07:00
Micah Lee
9765b62443 Merge branch 'fix_help_systray_slot' of https://github.com/mig5/onionshare into develop 2018-09-14 18:43:25 -07:00
Micah Lee
989efb3606 Merge branch 'mig5-685_use_dist_socks' into develop 2018-09-14 18:41:52 -07:00
Micah Lee
5661015acb 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
95285c5580 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
406a53d643 Merge branch 'mig5-fix_invalid_version_alert' into develop 2018-09-14 18:33:10 -07:00
Micah Lee
7eb1300430 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
95e2e5753e Merge branch 'mig5-opensuse_build_instructions' into develop 2018-09-14 17:04:00 -07:00
Micah Lee
421d4087ff 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
935a25d33e Merge branch 'mig5-692_appstream_file_location' into develop 2018-09-14 16:55:27 -07:00
Micah Lee
c1b30d9620 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
53736b42bc Merge branch 'mig5-691_remove_meek_lite_amazon' into develop 2018-09-14 16:29:53 -07:00
Miguel Jacq
3eace71261 Pass self to help_clicked function in systray, so we can use self.common 2018-09-04 14:49:56 +10:00
Miguel Jacq
1e29a12221 Use the distribution's PySocks module instead of our custom version 2018-09-04 14:26:47 +10:00
Miguel Jacq
32f0e39a46 Fix conflict from develop branch 2018-09-04 11:43:35 +10:00
Micah Lee
69f2cc212d Merge branch 'mig5-693_fix_static_assets_macos' into develop 2018-09-02 13:36:30 -07:00
Micah Lee
f2f77389e4 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
92b7c5f062 Merge branch 'mig5-lingering_object_naming_issues' into develop 2018-09-02 13:33:55 -07:00
Micah Lee
8b7aa3b321 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
fee1a1eba2 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
0c50f4ea93 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
2d3c686383 #692 move appstream file to /usr/share/metainfo 2018-07-22 15:50:37 +10:00
Miguel Jacq
a6bc01533b #691 remove meek_lite Amazon 2018-07-21 15:52:11 +10:00
Miguel Jacq
4bdbf3f152 Fix another two places where Alert was called without passing the common object 2018-07-21 15:50:37 +10:00
Micah Lee
48e9beb1bb Merge branch 'license' into develop 2018-06-18 19:29:03 -07:00
Micah Lee
85609e6841 Remove the /fd sha256 from signtool.exe command, because I'm having trouble generating signatures with the smart card setup with sha256 digests v1.3.1 2018-06-18 16:28:09 -07:00
Micah Lee
688e1d4777 LICENSE includes a note pointing to the 3rd party licenses 2018-06-18 16:26:53 -07:00
Micah Lee
662c2b05e6 Version bump to 1.3.1 and updated changelog 2018-06-18 13:08:40 -07:00
Micah Lee
d53303a84c Oops, download 32-bit 7zip in build instructions 2018-06-18 12:55:59 -07:00
Micah Lee
19c2193a49 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
97acfccf09 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
3be94afbcf Update Windows build instructions to include newer versions of software 2018-06-18 12:00:50 -07:00
Micah Lee
f1ba17fc7b Renamed license files to be lowercase, use .txt extension 2018-06-18 10:34:06 -07:00
Micah Lee
089c8201f1 Actually add licenses folder to PyInstaller spec 2018-06-17 16:55:04 -07:00
Micah Lee
e05cee19bc Update OnionShare copyright year to 2018 2018-06-17 16:53:44 -07:00
Micah Lee
5b27f952e4 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
536ea0ffc9 Added licenses for tor and obfs4 2018-06-17 16:19:09 -07:00
Miguel Jacq
348bf16cef Fix installation of static assets on MacOS and probably Windows too 2018-05-28 16:14:44 +10:00
Miguel Jacq
445a8423d5 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
be36aeb277 Merge branch 'mig5-fix_python_setup' into develop 2018-05-21 23:00:10 -07:00
Miguel Jacq
bb6af18855 Fix python setup process for share/static dir contents 2018-05-02 14:41:15 +10:00
Miguel Jacq
1df8e4c3f9 Merge pull request #683 from micahflee/receiver-mode
Refactoring, and receiver mode CLI
2018-04-29 09:20:42 +10:00
Micah Lee
0e41eff4a6 Typo 2018-04-24 17:18:33 -07:00
Micah Lee
86247b7456 In CLI recieve mode, tell the user where to look for uploaded files 2018-04-24 17:18:18 -07:00
Micah Lee
6e3b1496ab Merge branch 'develop' into receiver-mode 2018-04-23 12:53:35 -07:00