734 Commits

Author SHA1 Message Date
Micah Lee
14d7921bb9 Move settings into the Common object, so the settings are available to all objects (including Web, which is required for receive mode) 2018-03-13 03:28:47 -07:00
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
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
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
87c530e754 Merge branch 'cancel_share' of https://github.com/mig5/onionshare into mig5-cancel_share 2018-02-25 16:14:59 -08:00
Miguel Jacq
a5219c0a77 Add ability to cancel a share 2018-02-25 17:44:27 +11:00
Micah Lee
052bc03d8d Merge branch 'develop' into 641_fix_images_windows 2018-02-24 19:40:23 -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
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
Miguel Jacq
a6fe2a1c8a Revert the cancel feature that causes issues at least on macOS (#637) 2018-02-25 12:31:32 +11:00
delirious-lettuce
f3ba1a697b Remove use of re module by using str.endswith 2018-02-24 15:44:23 -07:00
Miguel Jacq
6b91b90bc6 Merge pull request #588 from micahflee/ux-update
Major user experience update
2018-02-25 08:27:46 +11:00
Micah Lee
f86b398329 Merge branch 'develop' of https://github.com/irykoon/onionshare into irykoon-develop 2018-02-22 16:57:06 -08:00
Micah Lee
eacb4c9fb0 Merge branch 'develop' into mig5-info_widgets_download_info 2018-02-19 18:02:51 -08:00
Micah Lee
e32ec4fc76 Merge branch 'sortable_tables' of https://github.com/mig5/onionshare into mig5-sortable_tables 2018-02-19 16:45:58 -08:00
Miguel Jacq
609404d7fe merge ux-update in, and fix conflict 2018-02-20 07:47:21 +11:00
Miguel Jacq
b398d238d2 reset done to False if a download is still in progress 2018-02-19 12:47:21 +11:00
irykoon
25e3c7b24d Support meek_lite Pluggable Transport
Currently, meek/meek_lite is one of the few, if not only, mature pluggable transport that works in some heavily cenosored areas, for example, China. Therefore, this can be a nice feature to have.
2018-02-15 23:19:53 +00:00
Miguel Jacq
70a80e3db5 Make table sortable with javascript (if enabled) 2018-02-14 16:56:03 +11:00
Miguel Jacq
fd034f5cb1 Pass the correct parameter to remove_ephemeral_hidden_service()
Add debug logs to verify if an onion was successfully deleted or not
2018-02-12 13:43:36 +11:00
Miguel Jacq
575d445de8 Fix function name remove_ephemeral_onion_service 2018-02-12 13:17:31 +11:00
Micah Lee
066264d684 Redesigned HTML/CSS download page 2018-02-10 16:19:23 -08:00
Micah Lee
094041a4b6 Add onionshare favicon to all HTML pages 2018-02-10 12:50:23 -08:00
Miguel Jacq
b13fb41555 Allow the user to cancel a share that is still starting up 2018-02-09 18:43:57 +11:00
Micah Lee
d16021d34b Move auto-stop timer into settings, so its UI does not show up unless the user specifically enables that feature 2018-02-07 09:55:55 -08:00
Miguel Jacq
ffdbf8dec1 Merge pull request #585 from torbsd/openbsd-port-patches-2
Second attempt at patches for an OpenBSD port
2018-02-07 16:54:00 +11:00
attila
7a8376c1fc Update patch as per the suggestion by @mig5 on
https://github.com/micahflee/onionshare/pull/585
Tested on current snapshot, both gui and cli work
2018-02-06 16:39:04 -05:00
attila
76526b18a5 Second attempt at patches for an OpenBSD port, this time based off of 1.2
and after feedback from the upstream and other contributors at
https://github.com/micahflee/onionshare/pull/489
2018-02-05 18:06:37 -05:00
Miguel Jacq
8ff81721c7 Support for obfs4 in custom bridges 2018-01-19 15:31:11 +11:00
Miguel Jacq
393a63a5c7 load Settings in onionshare/__init__.py before we initiate the web thread, since it needs to send the saved slug to the web server 2018-01-18 22:42:43 +11:00
Micah Lee
7061ac3654 Temporary fix for #550 2018-01-17 18:53:45 -08:00
Micah Lee
e0e10c0531 Merge branch '435_support_bridges' of https://github.com/mig5/onionshare into mig5-435_support_bridges 2018-01-17 16:19:30 -08:00
Miguel Jacq
63581e250f load the Settings in onionshare/__init__.py later, so that when saving slug, the private_key/hidservauth string have already been saved by the Onion object 2018-01-18 08:14:36 +11:00
Miguel Jacq
e4eafd7aeb Extract tor and obfs4proxy executables from the main TorBrowser executable with 7-zip on Windows 2018-01-17 12:45:37 +11:00
Miguel Jacq
f14521af6a Fix conflicts arising from the reuse_private_key branch 2018-01-16 15:30:36 +11:00
Micah Lee
d0c07266bb Merge branch 'check_is_valid_file' of https://github.com/mig5/onionshare into mig5-check_is_valid_file 2018-01-14 18:54:48 -08:00