Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-03-19 04:16:19 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,439 Commits 36 Branches 46 Tags
Commit Graph

1439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Miguel Jacq
34cd040e46 Hide the primary_action when Tor gets disconnected 2018-03-14 18:31:07 +11:00
Miguel Jacq
e137b9673f #662 Allow local-only mode in GUI 2018-03-07 16:13:22 +11:00
Miguel Jacq
02482fe417 Warn about the costs of using meek_lite bridges 2018-03-05 13:52:50 +11:00
Micah Lee
52d5defdb1 Merge branch 'Baccount-rename-crunching-to-compressing' into develop 2018-03-04 07:55:59 -08:00
Baccount
340d375d2b Update onionshare_gui.py 2018-03-02 18:45:36 -08:00
Baccount
a9090cc225 Update eo.json 2018-03-02 18:44:52 -08:00
Baccount
78a9bd92d2 Update en.json 2018-03-02 18:43:30 -08:00
Miguel Jacq
0495bad3c5 Make downloads window scrollable again. Reset to original size when starting a fresh share 2018-02-28 09:48:23 +11:00
Miguel Jacq
13f1d48391 re-show the 'No downloads yet' label when resetting the counters (e.g starting a new share) 2018-02-27 18:20:05 +11:00
Miguel Jacq
2e1fe47eff Add missing images for the downloads toggle button 2018-02-27 18:08:52 +11:00
Miguel Jacq
fcd84bcb8a Move downloads into their own window that can be toggled on/off 2018-02-27 17:59:46 +11:00
Micah Lee
0f6f6611eb Merge branch 'mig5-disable_meek_lite_on_macos_and_windows' into develop 2018-02-26 10:05:30 -08:00
Miguel Jacq
4cf9d81c35 Uninstantiated system variable 2018-02-26 14:02:15 +11:00
Miguel Jacq
bac9849556 Update changelog to note that meek_lite not supported on MacOS or Windows 2018-02-26 13:52:30 +11:00
Miguel Jacq
bb8629541a Hide the meek_lite options on macOS and Windows, as the obfs4proxy binary in TorBrowser is too old to support it 2018-02-26 13:48:28 +11:00
Micah Lee
38b30bff26 Updated screenshots 2018-02-25 17:35:12 -08:00
Micah Lee
08275a3c35 Merge branch 'mig5-cancel_share' into develop 2018-02-25 16:26:40 -08:00
Micah Lee
87c530e754 Merge branch 'cancel_share' of https://github.com/mig5/onionshare into mig5-cancel_share 2018-02-25 16:14:59 -08:00
Micah Lee
4e03d95576 Merge branch 'mig5-dont_revert_on_invalid_bridges' into develop 2018-02-25 16:13:39 -08:00
Miguel Jacq
adb10dc1e0 Alert wording change (we no longer 'ignore' invalid bridges, the user has to fix them) 2018-02-26 02:49:51 +11:00
Miguel Jacq
56d27ef0dc Add ability to abort but not exit SettingsDialog/reconnect to Tor, on invalid settings. Do this for invalid bridges 2018-02-25 19:42:38 +11:00
Miguel Jacq
a5219c0a77 Add ability to cancel a share 2018-02-25 17:44:27 +11:00
Miguel Jacq
f1a39ab069 Revert "Remove cancel feature from the 1.3 CHANGELOG" 
This reverts commit 096d935bae3d100ba5434bb92786e76cfe94e5e5.
 2018-02-25 16:43:45 +11:00
Miguel Jacq
e5110e7907 Merge pull request #644 from micahflee/641_fix_images_windows 
Fix the broken images in Windows
 2018-02-25 14:58:39 +11:00
Micah Lee
052bc03d8d Merge branch 'develop' into 641_fix_images_windows 2018-02-24 19:40:23 -08:00
Micah Lee
4d58c1978a Put <img> src in quotes 2018-02-24 19:39:03 -08:00
Micah Lee
a239d67c39 Add pytest cache to gitignore 2018-02-24 19:17:29 -08:00
Micah Lee
c7728e739f Remove test_frozen_windows test because it is verify difficult to test for on a non-Windows platform 2018-02-24 19:17:18 -08:00
Micah Lee
c13021e15b When using <img>, put the src in quotes. Otherwise the filename is likely to have spaces in it, and the <img> src will break. Also, in Windows use backslashes for local resources instead of forward slashes 2018-02-24 18:38:40 -08:00
Micah Lee
acf2341d58 Rename in_progress_download to in_progress_downloads (plural) everywhere, to be consistent with completed_downloads 2018-02-24 18:37:19 -08:00
Micah Lee
4be526d983 Merge branch 'delirious-lettuce-remove_platform_re' into develop 2018-02-24 17:57:01 -08:00
Micah Lee
50a79666a1 Merge branch 'remove_platform_re' of https://github.com/delirious-lettuce/onionshare into delirious-lettuce-remove_platform_re 2018-02-24 17:56:35 -08:00
Micah Lee
652ef98913 Merge branch 'mig5-revert_cancel_feature' into develop 2018-02-24 17:47:07 -08:00
Miguel Jacq
096d935bae Remove cancel feature from the 1.3 CHANGELOG 2018-02-25 12:34:49 +11:00