Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-14 13:41:25 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,505 Commits 17 Branches 45 Tags
Commit Graph

1505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Micah Lee
95d93111d0 Merge branch 'comradekingu-patch-1' into develop 2018-04-23 12:51:09 -07:00
Micah Lee
1808b45ca7 Merge branch 'patch-1' of https://github.com/comradekingu/onionshare into comradekingu-patch-1 2018-04-23 12:51:03 -07:00
Micah Lee
cf98fc2e13 Merge branch 'develop' into receiver-mode 2018-04-23 08:52:48 -07:00
Allan Nordhøy
0634edb57b Spellign: - not, expire 2018-04-23 04:21:37 +02:00
Miguel Jacq
7932c345f6 Merge pull request #682 from micahflee/rearrange_settings 
Rearrange settings
 2018-04-23 10:55:00 +10:00
Micah Lee
a930d7828d Fix a few bugs that I missed when merging in develop 2018-04-22 17:46:14 -07:00
Micah Lee
1600fd8d3d Merge branch 'develop' into receiver-mode 2018-04-22 17:38:28 -07:00
Micah Lee
ec08349a18 Put test Tor button in a so it can be left-aligned 2018-04-22 17:20:58 -07:00
Micah Lee
a1fd22e255 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
ede9c696d3 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
fc0beb50b6 Merge branch 'mig5-local_only_gui' into develop 2018-04-22 15:43:25 -07:00
Micah Lee
0cff5e4229 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
142c0aee60 Merge branch 'mig5-657_meek_warning' into develop 2018-04-22 15:32:46 -07:00
Micah Lee
f4bb2b193a 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
24a1c04a7a Merge branch 'mig5-downloads_window' into develop 2018-04-22 15:28:31 -07:00
Micah Lee
c39e47fa9c 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
506eb42ee1 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
ddf125d09d seem work → seem to work 2018-03-22 22:24:16 +01:00
Allan Nordhøy
ec599681ad marked nouns, ellipsis, +, set up, addresses, could not 2018-03-22 22:06:08 +01:00
Micah Lee
5068fe8eda 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
4153c11b5d Remove the WSGI middleware, because I'm solving the problem in a different way 2018-03-21 17:51:42 -07:00
Micah Lee
08247c005f 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