Commit Graph

1526 Commits

Author SHA1 Message Date
Micah Lee
5e9465c807
Merge branch 'develop' into receiver-mode 2018-04-23 12:53:35 -07:00
Micah Lee
d5aaf559a5
Merge branch 'comradekingu-patch-1' into develop 2018-04-23 12:51:09 -07:00
Micah Lee
6f0daa789c
Merge branch 'patch-1' of https://github.com/comradekingu/onionshare into comradekingu-patch-1 2018-04-23 12:51:03 -07:00
Micah Lee
4af80de17b
Merge branch 'develop' into receiver-mode 2018-04-23 08:52:48 -07:00
Allan Nordhøy
97756ba8bc
Spellign: - not, expire 2018-04-23 04:21:37 +02:00
Miguel Jacq
c5741cd32b
Merge pull request #682 from micahflee/rearrange_settings
Rearrange settings
2018-04-23 10:55:00 +10:00
Micah Lee
91536ea571
Fix a few bugs that I missed when merging in develop 2018-04-22 17:46:14 -07:00
Micah Lee
8c89a05fd9
Merge branch 'develop' into receiver-mode 2018-04-22 17:38:28 -07:00
Micah Lee
a53d3188dd
Put test Tor button in a so it can be left-aligned 2018-04-22 17:20:58 -07:00
Micah Lee
87d29a9171
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
1201205dee
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
bb39ef9a34
Merge branch 'mig5-local_only_gui' into develop 2018-04-22 15:43:25 -07:00
Micah Lee
3584e57c5d
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
b4507149df
Merge branch 'mig5-657_meek_warning' into develop 2018-04-22 15:32:46 -07:00
Micah Lee
aaa860921a
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
90e0e1b69b
Merge branch 'mig5-downloads_window' into develop 2018-04-22 15:28:31 -07:00
Micah Lee
16eab5e850
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
359bd59828
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
f35061fa10
seem work → seem to work 2018-03-22 22:24:16 +01:00
Allan Nordhøy
3a5133ee7a
marked nouns, ellipsis, +, set up, addresses, could not 2018-03-22 22:06:08 +01:00
Micah Lee
bd7305ab16
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
f7640416eb
Remove the WSGI middleware, because I'm solving the problem in a different way 2018-03-21 17:51:42 -07:00
Micah Lee
facd441caf
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
aafa9b1543
Add WSGI middleware in order to capture the progress of POST request uploads 2018-03-19 02:25:22 -07:00
Micah Lee
929ad58ebd
Fix bug with validating filenames from args in GUI 2018-03-14 08:34:43 -07:00
Micah Lee
fee1d49563
Fix bug with shutdown_slug 2018-03-14 08:33:25 -07:00
Micah Lee
72698a7247
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
01f86daf8f
In receive mode, allow uploader to close the server when they are done 2018-03-14 08:16:09 -07:00
Micah Lee
0b10e71547
Add receive mode warning, and print notification for each upload, in CLI mode 2018-03-14 07:35:04 -07:00
Micah Lee
01dd16d92f
Uploading files works in CLI 2018-03-14 04:03:50 -07:00
Miguel Jacq
b1b28f4fa5
Hide the primary_action when Tor gets disconnected 2018-03-14 18:31:07 +11:00
Micah Lee
000d9620c1
Add flash messages to receive template, and begin implementing upload POST 2018-03-13 05:50:26 -07:00
Micah Lee
8e82c07039
Fixed bug in validating downloads dir related to moving settings into common 2018-03-13 03:59:52 -07:00
Micah Lee
76d299a6c9
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
c2fecf8aa4
Fix tests after refactoring Common 2018-03-13 02:22:26 -07:00
Micah Lee
50409167d4
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
49e352d131
Rename close_after_seconds class to ShutdownTimer 2018-03-08 05:50:23 -08:00
Micah Lee
2e6538b7f8
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
2e31db8543
Fix settings test because I moved the default downloads dir 2018-03-08 05:43:45 -08:00
Micah Lee
9a800d90b2
Started designing HTML/CSS for receive mode 2018-03-07 10:12:10 -08:00
Miguel Jacq
46a9a2a0a1
#662 Allow local-only mode in GUI 2018-03-07 16:13:22 +11:00
Micah Lee
878dd4f880
In CLI, validate downloads_dir when starting in receive mode 2018-03-06 07:40:57 -08:00
Micah Lee
e980bc153b
Change default receive mode download directory to ~/OnionShare 2018-03-06 05:25:49 -08:00
Micah Lee
5d42e76eb8
Show different message for receive mode than for send mode 2018-03-06 03:24:17 -08:00
Micah Lee
649afa2fad
Move (optional) javascript into file, and use CSP to ban inline js 2018-03-06 03:17:54 -08:00
Micah Lee
4606a3ad3a
Stop using inline css, and reorganize static folder 2018-03-06 03:03:24 -08:00
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