1432 Commits

Author SHA1 Message Date
Micah Lee
37389f85ac Fix tests after refactoring Common 2018-03-13 02:22:26 -07:00
Micah Lee
c1ff40b5b3 Completely refactor common to make a Common class, and pass that class down into all parts of the program 2018-03-08 10:18:31 -08:00
Micah Lee
69a94c5852 Rename close_after_seconds class to ShutdownTimer 2018-03-08 05:50:23 -08:00
Micah Lee
d2a11e696e Move ZipWriter from common into web, because that's the only place it's used 2018-03-08 05:45:07 -08:00
Micah Lee
73e7e2285f Fix settings test because I moved the default downloads dir 2018-03-08 05:43:45 -08:00
Micah Lee
6cc350b4f6 Started designing HTML/CSS for receive mode 2018-03-07 10:12:10 -08:00
Micah Lee
ccc2d10604 In CLI, validate downloads_dir when starting in receive mode 2018-03-06 07:40:57 -08:00
Micah Lee
162a50b217 Change default receive mode download directory to ~/OnionShare 2018-03-06 05:25:49 -08:00
Micah Lee
9c6049c1ca Show different message for receive mode than for send mode 2018-03-06 03:24:17 -08:00
Micah Lee
5d280ec68f Move (optional) javascript into file, and use CSP to ban inline js 2018-03-06 03:17:54 -08:00
Micah Lee
f331ff06ae Stop using inline css, and reorganize static folder 2018-03-06 03:03:24 -08:00
Micah Lee
0b26950d5b 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
05a935e049 Make separate template for send and receive mode 2018-03-06 02:06:44 -08:00
Micah Lee
e1bbed7859 Make separate routes for send and receive modes 2018-03-06 01:50:43 -08:00
Micah Lee
dfe62ff707 Refactor OnionShareGui to use new Web class 2018-03-06 00:56:40 -08:00
Micah Lee
5b29101c34 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
e3a543f66d Fix settings test to account for new downloads_dir setting 2018-03-05 08:54:20 -08:00
Micah Lee
4ee3948908 Web needs to know about receive mode, not the OnionShare object 2018-03-05 08:48:04 -08:00
Micah Lee
10926f6cac Add downloads_dir to settings, make it default to ~/Downloads 2018-03-05 07:52:51 -08:00
Micah Lee
7aa8c7f995 Add command line flag for receive mode 2018-03-05 07:45:10 -08: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
Miguel Jacq
a6fe2a1c8a Revert the cancel feature that causes issues at least on macOS (#637) 2018-02-25 12:31:32 +11:00
Miguel Jacq
54cfe9b683 Revert "Fix updating primary action and re-enabling drag-n-drop when a share is canceled"
This reverts commit 7e32ea7a21cda6c1cfd585bc83854cf20e44bcc7.
2018-02-25 12:27:20 +11:00
Miguel Jacq
ac770ae71f 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
d1b3bab530 Remove duplicate key/value pair 2018-02-24 17:21:29 -07:00
Miguel Jacq
6144a373c2 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
f3ba1a697b Remove use of re module by using str.endswith 2018-02-24 15:44:23 -07:00
Micah Lee
a7f50898c8 Merge branch 'mig5-version_1.3_bump' into develop 2018-02-24 14:39:22 -08:00