Commit Graph

1480 Commits

Author SHA1 Message Date
Micah Lee
ce852fc60a
Create separate templates and static folder, and make the web app use both of these. Yay, now we have real static resources 2018-03-06 02:54:12 -08:00
Micah Lee
baede53632
Make separate template for send and receive mode 2018-03-06 02:06:44 -08:00
Micah Lee
fa9f714651
Make separate routes for send and receive modes 2018-03-06 01:50:43 -08:00
Micah Lee
4a0c6e8dcd
Refactor OnionShareGui to use new Web class 2018-03-06 00:56:40 -08:00
Micah Lee
0cec696055
Refactor web.py to move all the web logic into the Web class, and refactor onionshare (cli) to work with it -- but onionshare_gui is currently broken 2018-03-05 11:06:59 -08:00
Micah Lee
08957c5145
Fix settings test to account for new downloads_dir setting 2018-03-05 08:54:20 -08:00
Micah Lee
cd1a1d9638
Web needs to know about receive mode, not the OnionShare object 2018-03-05 08:48:04 -08:00
Micah Lee
383ccb94fc
Add downloads_dir to settings, make it default to ~/Downloads 2018-03-05 07:52:51 -08:00
Micah Lee
18ac830a9e
Add command line flag for receive mode 2018-03-05 07:45:10 -08:00
Miguel Jacq
a71786d024
Warn about the costs of using meek_lite bridges 2018-03-05 13:52:50 +11:00
Micah Lee
b16c654e77
Merge branch 'Baccount-rename-crunching-to-compressing' into develop 2018-03-04 07:55:59 -08:00
Baccount
9da1b82e5a
Update onionshare_gui.py 2018-03-02 18:45:36 -08:00
Baccount
947bfe3d89
Update eo.json 2018-03-02 18:44:52 -08:00
Baccount
c5384316d9
Update en.json 2018-03-02 18:43:30 -08:00
Miguel Jacq
fa9e5748a3
Make downloads window scrollable again. Reset to original size when starting a fresh share 2018-02-28 09:48:23 +11:00
Miguel Jacq
fffc420cb1
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
8961bd1ed0
Add missing images for the downloads toggle button 2018-02-27 18:08:52 +11:00
Miguel Jacq
ee5c35d502
Move downloads into their own window that can be toggled on/off 2018-02-27 17:59:46 +11:00
Micah Lee
8299aad90b
Merge branch 'mig5-disable_meek_lite_on_macos_and_windows' into develop 2018-02-26 10:05:30 -08:00
Miguel Jacq
022ed03287
Uninstantiated system variable 2018-02-26 14:02:15 +11:00
Miguel Jacq
56d3090fa6
Update changelog to note that meek_lite not supported on MacOS or Windows 2018-02-26 13:52:30 +11:00
Miguel Jacq
b513c59542
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
88a765b7e1
Updated screenshots 2018-02-25 17:35:12 -08:00
Micah Lee
84fe68b04c
Merge branch 'mig5-cancel_share' into develop 2018-02-25 16:26:40 -08:00
Micah Lee
49fa2805e7
Merge branch 'cancel_share' of https://github.com/mig5/onionshare into mig5-cancel_share 2018-02-25 16:14:59 -08:00
Micah Lee
715e31b890
Merge branch 'mig5-dont_revert_on_invalid_bridges' into develop 2018-02-25 16:13:39 -08:00
Miguel Jacq
35aaf8c675
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
fce26c4286
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
096c202362
Add ability to cancel a share 2018-02-25 17:44:27 +11:00
Miguel Jacq
1a7b5b6f7d Revert "Remove cancel feature from the 1.3 CHANGELOG"
This reverts commit 782a4ddbb1.
2018-02-25 16:43:45 +11:00
Miguel Jacq
0dfbb38acf
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
79b461d071
Merge branch 'develop' into 641_fix_images_windows 2018-02-24 19:40:23 -08:00
Micah Lee
43930058fb
Put <img> src in quotes 2018-02-24 19:39:03 -08:00
Micah Lee
6ded178343
Add pytest cache to gitignore 2018-02-24 19:17:29 -08:00
Micah Lee
471ccef9d3
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
3797e9e203
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
f41ad976ea
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
c0ba9ab278
Merge branch 'delirious-lettuce-remove_platform_re' into develop 2018-02-24 17:57:01 -08:00
Micah Lee
e76b1e0c28
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
9345f62ff0
Merge branch 'mig5-revert_cancel_feature' into develop 2018-02-24 17:47:07 -08:00
Miguel Jacq
782a4ddbb1 Remove cancel feature from the 1.3 CHANGELOG 2018-02-25 12:34:49 +11:00
Miguel Jacq
cff267c09c Revert the cancel feature that causes issues at least on macOS (#637) 2018-02-25 12:31:32 +11:00
Miguel Jacq
9f0adc0fb9 Revert "Fix updating primary action and re-enabling drag-n-drop when a share is canceled"
This reverts commit 9da3e2d8b0.
2018-02-25 12:27:20 +11:00
Miguel Jacq
e6189494f3
Merge pull request #639 from delirious-lettuce/remove_duplicate_key
Remove duplicate key/value pair
2018-02-25 12:25:29 +11:00
delirious-lettuce
c2b13cc7ca Remove duplicate key/value pair 2018-02-24 17:21:29 -07:00
Miguel Jacq
415cf3af98
Merge pull request #635 from micahflee/fix_meek_bug
Fix typo bug that is only triggered if obfs4proxy binary is not found
2018-02-25 10:25:33 +11:00
delirious-lettuce
641fec7c05 Remove use of re module by using str.endswith 2018-02-24 15:44:23 -07:00
Micah Lee
aafebff0c3
Merge branch 'mig5-version_1.3_bump' into develop 2018-02-24 14:39:22 -08:00
Micah Lee
ca754faa3b
Merge branch 'version_1.3_bump' of https://github.com/mig5/onionshare into mig5-version_1.3_bump 2018-02-24 14:39:15 -08:00
Micah Lee
b75237dcea
Fix typo bug that is only triggered if obfs4proxy binary is not found 2018-02-24 14:09:42 -08:00