1479 Commits

Author SHA1 Message Date
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
Micah Lee
e8bb691705 Add WSGI middleware in order to capture the progress of POST request uploads 2018-03-19 02:25:22 -07:00
Micah Lee
2c3d66de44 Fix bug with validating filenames from args in GUI 2018-03-14 08:34:43 -07:00
Micah Lee
b6a3edd1db Fix bug with shutdown_slug 2018-03-14 08:33:25 -07:00
Micah Lee
0734de68ea Display a template after closing the server, and standardize the style of other simple templates 2018-03-14 08:30:14 -07:00
Micah Lee
5665b3c313 In receive mode, allow uploader to close the server when they are done 2018-03-14 08:16:09 -07:00
Micah Lee
1410b445fa Add receive mode warning, and print notification for each upload, in CLI mode 2018-03-14 07:35:04 -07:00
Micah Lee
15ff966986 Uploading files works in CLI 2018-03-14 04:03:50 -07:00
Miguel Jacq
34cd040e46 Hide the primary_action when Tor gets disconnected 2018-03-14 18:31:07 +11:00
Micah Lee
aeaada0a5c Add flash messages to receive template, and begin implementing upload POST 2018-03-13 05:50:26 -07:00
Micah Lee
89544694cc Fixed bug in validating downloads dir related to moving settings into common 2018-03-13 03:59:52 -07:00
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
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
Miguel Jacq
e137b9673f #662 Allow local-only mode in GUI 2018-03-07 16:13:22 +11: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