Commit Graph

301 Commits

Author SHA1 Message Date
Micah Lee
1ad68c46d4
Merge branch 'license' into develop 2018-06-18 19:29:03 -07:00
Micah Lee
1c552cc1e7
Version bump to 1.3.1 and updated changelog 2018-06-18 13:08:40 -07:00
Micah Lee
a251dff670
Add onionshare license to licenses folder, and add licenses folder to PyInstaller spec, and to NSIS installer 2018-06-17 16:43:38 -07:00
Micah Lee
96a680e05d
Improve the CLI output for receive mode 2018-05-20 15:20:21 -07:00
Micah Lee
f5ce069031
Make it so the open folder button works in Linux, with nautilus 2018-05-20 14:40:27 -07:00
Micah Lee
9857d9fce8
Make the receive.html template not use slugs if receive_public_mode is True, and fix some bugs with receive routes 2018-05-20 11:16:09 -07:00
Micah Lee
7a571764ef
Allow file uploads to finish, and improve uploads styling 2018-05-19 22:58:55 -07:00
Micah Lee
ee9c0d0abb
Refactor uploads GUI so that each upload POST has one progess bar, and a list of files, with partial styling 2018-05-19 22:36:08 -07:00
Micah Lee
eb3d6f2171
Start making Web events actually put Upload objects into Uploads 2018-05-07 23:07:11 -07:00
Micah Lee
996f6c0725
Create an Upload class within Uploads, and add methods to Uploads to add, update, cancel, and reset 2018-05-07 16:38:29 -07:00
Micah Lee
be36f3a4b6
Rename some images to reuse in ReceiveMode, and make new upload window button images 2018-05-04 17:57:30 -07:00
Micah Lee
c77eba7f23
Tweak language of receive mode options 2018-05-04 17:33:18 -07:00
Micah Lee
9a076635c5
Make the "download page loaded" and "upload page loaded" messages displayed as systray notifications instead of in the status bar, and make it work for Receive Mode 2018-04-29 16:41:05 -07:00
Micah Lee
6cfb7026da
Display desktop notification to the user when the receiver closes the server, and finish up closing the server 2018-04-29 15:49:18 -07:00
Micah Lee
996df24646
Make receive_allow_receiver_shutdown setting work 2018-04-29 15:34:11 -07:00
Micah Lee
6632a4b426
Add two new receive mode settings: receive_allow_receiver_shutdown and receive_public_mode 2018-04-28 21:08:53 -07:00
Micah Lee
2a7f6e0d5a
Make the quit warning work in receive mode, and use a different warning string 2018-04-28 15:23:57 -07:00
Micah Lee
0996e8c064
Change the URL description in receive mode 2018-04-27 23:02:04 -07:00
Micah Lee
df346ad0ab
Add receive mode warning 2018-04-25 20:50:56 -07:00
Micah Lee
996f1d3a81
Make different strings for start server button for different modes 2018-04-25 20:14:27 -07:00
Micah Lee
2fc4330ee4
Add ServerStatus to ReceiveMode, and update the server status indicator to have receive statuses too 2018-04-25 09:46:49 -07:00
Micah Lee
dd7d97dbbb
Allow changing downloads_dir from SettingsDialog 2018-04-25 08:43:40 -07:00
Micah Lee
4b957f3271
Merge branch 'receiver-mode' into receiver-mode-gui 2018-04-24 17:22:06 -07:00
Micah Lee
0e9298794e
Typo 2018-04-24 17:18:33 -07:00
Micah Lee
aa8c07c434
In CLI recieve mode, tell the user where to look for uploaded files 2018-04-24 17:18:18 -07:00
Micah Lee
b6b61f753d
Update GPL copyright year 2018-04-24 10:07:59 -07:00
Micah Lee
2ee7e74236
Remove the desktop notification setting -- everyone gets them now 2018-04-24 09:26:06 -07:00
Micah Lee
6c91d8977a
Begin to add the mode switcher (between "Share Files" and "Receive Files", with the settings button) 2018-04-23 19:51:51 -07:00
Micah Lee
5e9465c807
Merge branch 'develop' into receiver-mode 2018-04-23 12:53:35 -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
Allan Nordhøy
97756ba8bc
Spellign: - not, expire 2018-04-23 04:21:37 +02:00
Micah Lee
8c89a05fd9
Merge branch 'develop' into receiver-mode 2018-04-22 17:38:28 -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
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
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
Micah Lee
000d9620c1
Add flash messages to receive template, and begin implementing upload POST 2018-03-13 05:50:26 -07:00
Micah Lee
9a800d90b2
Started designing HTML/CSS for receive mode 2018-03-07 10:12:10 -08:00
Micah Lee
878dd4f880
In CLI, validate downloads_dir when starting in receive mode 2018-03-06 07:40:57 -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
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
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
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
49fa2805e7
Merge branch 'cancel_share' of https://github.com/mig5/onionshare into mig5-cancel_share 2018-02-25 16:14:59 -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
096c202362
Add ability to cancel a share 2018-02-25 17:44:27 +11:00
Micah Lee
43930058fb
Put <img> src in quotes 2018-02-24 19:39:03 -08:00
Miguel Jacq
cff267c09c Revert the cancel feature that causes issues at least on macOS (#637) 2018-02-25 12:31:32 +11:00
delirious-lettuce
c2b13cc7ca Remove duplicate key/value pair 2018-02-24 17:21:29 -07: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
Miguel Jacq
dface51dd0
Merge pull request #588 from micahflee/ux-update
Major user experience update
2018-02-25 08:27:46 +11:00
Miguel Jacq
606123db91
Version bump to 1.3 2018-02-25 08:27:39 +11:00
Miguel Jacq
7e175cb7e3
Re-work the UI widgets to make it smaller on Macbook Pro and other smaller screens 2018-02-24 15:38:45 +11:00
irykoon
61384e6768
Fix typo
Again, many thanks to the careful review by @mig5 !
2018-02-20 05:45:15 +00:00
Micah Lee
cb69ae89fc
Merge branch 'info_widgets_download_info' of https://github.com/mig5/onionshare into mig5-info_widgets_download_info 2018-02-19 17:55:03 -08:00
Micah Lee
5ac6bb783f
Merge branch 'sortable_tables' of https://github.com/mig5/onionshare into mig5-sortable_tables 2018-02-19 16:45:58 -08:00
Miguel Jacq
b7df7f8dc9
merge ux-update in, and fix conflict 2018-02-20 07:47:21 +11:00
irykoon
85afd85587
Adopt more user-friendly wording
Thank you @mig5 for the great suggestion.
2018-02-19 07:34:09 +00:00
Miguel Jacq
20c0ca02d3
Add download status widgets to info bar 2018-02-19 08:33:47 +11:00
irykoon
b2c310f2e0
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
5172294dfa
Account for files that are in bytes 2018-02-14 17:20:00 +11:00
Miguel Jacq
7a8e828cd5
Fix indentation 2018-02-14 17:04:08 +11:00
Miguel Jacq
062101fcbf
Make table sortable with javascript (if enabled) 2018-02-14 16:56:03 +11:00
Micah Lee
8db921dfc2
Update tooltip strings, and also copy to clipboard strings 2018-02-13 17:58:51 -08:00
Micah Lee
a32778397a
Merge branch 'url_label_tooltips' of https://github.com/mig5/onionshare into mig5-url_label_tooltips 2018-02-13 17:31:25 -08:00
Micah Lee
6903e9bad6
Merge branch 'copy_urls_moved_to_desktop_notifications' of https://github.com/mig5/onionshare into mig5-copy_urls_moved_to_desktop_notifications 2018-02-13 17:21:40 -08:00
Miguel Jacq
779ca76553
Set URL label tooltips 2018-02-11 18:32:18 +11:00
Miguel Jacq
b8cf692cd8
actually show those messages in the system tray, not still in the statusbar, and with the mandatory titles 2018-02-11 17:52:14 +11:00
Miguel Jacq
afc9568f30
Adjust width of window to fit status bar messages, unwrapped, to avoid squishing widgets.
Add pluralisation of filemanager total file(s)

Use 'timer expired' rather than 'timeout reached'
2018-02-11 17:16:59 +11:00
Miguel Jacq
ed179922d4
Merge branch 'ux-update' of https://github.com/micahflee/onionshare into ux_update_fix_shutdown_timer 2018-02-11 17:15:52 +11:00
Micah Lee
2fb8d1f836
Tweak css 2018-02-10 21:27:45 -08:00
Micah Lee
feeb1d7575
Left-align the client-side file list 2018-02-10 18:25:31 -08:00
Micah Lee
d3848a25ec
Redesigned HTML/CSS download page 2018-02-10 16:19:23 -08:00
Micah Lee
a7ab1d7e6e
Add onionshare favicon to all HTML pages 2018-02-10 12:50:23 -08:00
Micah Lee
0d40d7c3b2
Add onionshare favicon to index page 2018-02-10 12:19:55 -08:00
Micah Lee
fe24c543cc
Added an info label to file selection, to show the total count and size 2018-02-10 11:48:14 -08:00
Micah Lee
532d5d5cf0
Instead of disabling the settings button when share is active, hide it, and show it again when the share stops 2018-02-10 10:59:01 -08:00
Miguel Jacq
39954c6ee8
Allow the user to cancel a share that is still starting up 2018-02-09 18:43:57 +11:00
Miguel Jacq
bc2417c65e
Set the URL label to explicitly mention when persistent. Remove older Persistence warning to save clutter. Add ToolTip to explain what Persistence means 2018-02-09 07:55:22 +11:00
Miguel Jacq
4751334ab1
Reduce the size of the closing messages so they only wrap 2 lines 2018-02-08 12:03:40 +11:00
Miguel Jacq
749ca6312d
Fix shutdown timer and insert larger messages as word-wrapped widgets into the Status Bar 2018-02-08 11:32:34 +11:00
Micah Lee
05633673fc
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
Micah Lee
37657ca453
Merge branch 'develop' into ux-update 2018-02-06 19:55:30 -08:00
Micah Lee
0fc250fc55
Update the status indicator strings 2018-02-06 19:47:04 -08:00
Micah Lee
f93ed86283
Move server status indicator to the status bar at the bottom 2018-02-06 19:31:02 -08:00
Micah Lee
6fa095a650
Update server status images to have less harsh colors 2018-02-06 18:35:55 -08:00
Micah Lee
8f77603182
Improve the UI of the quit warning 2018-02-06 17:47:05 -08:00
Micah Lee
24a672dac9
Make the server button and URL display much nicer, and replace string "URL" with "address" for usability 2018-02-06 16:01:59 -08:00
scootergrisen
3da58604ed
Add da.json (danish translation) 2018-02-05 23:59:40 +01:00
scootergrisen
ec33c9eddc
Remove "at least" 2018-02-05 21:38:38 +01:00
scootergrisen
0d8e842e48
Remove a space 2018-02-05 19:52:14 +01:00
Micah Lee
0bb9bf649d
Remove delete button, use delete X's instead 2018-02-04 21:18:41 -08:00
Micah Lee
ae2140ceb8
Update drag and drop look and instructions 2018-02-04 13:13:38 -08:00
Micah Lee
5aed6f96a1
Merge branch 'Update-URL' of https://github.com/Baccount/onionshare into Baccount-Update-URL 2018-01-30 21:02:21 -08:00
Micah Lee
a996d2d86a
Merge branch '556_obfs4_in_custom_bridges' of https://github.com/mig5/onionshare into mig5-556_obfs4_in_custom_bridges 2018-01-30 20:47:29 -08:00
pierwill
c8215f9670 French string translations 2018-01-20 15:41:52 -06:00
Baccount
1fb2116efd
Update en.json 2018-01-18 22:36:34 -08:00
Miguel Jacq
16bd3291e3
Support for obfs4 in custom bridges 2018-01-19 15:31:11 +11:00
Micah Lee
1d1648bb90
Version bump to 1.2 and updated changelog 2018-01-17 19:36:56 -08:00
Miguel Jacq
fc2dcafafc
Clarify that obfs4 bridges can't be used as custom bridges, and that obfs4proxy is needed for obfs4 bridges 2018-01-17 16:30:12 +11:00
Miguel Jacq
76cf0ae107
Fix conflicts arising from the reuse_private_key branch 2018-01-16 15:30:36 +11:00
Micah Lee
808c4cfac2
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
Miguel Jacq
d9e6650a19 Merge branch 'master' into check_is_valid_file 2018-01-14 20:24:02 +11:00
Miguel Jacq
bf01fcaa6e
Validate syntax of custom bridges 2018-01-14 20:12:24 +11:00
Miguel Jacq
bdb10b7eeb
Resolve conflict with upstream's onion.py 2018-01-14 18:53:46 +11:00
Miguel Jacq
448f6af796
Resolve conflict with upstream's onion.py 2018-01-14 18:49:49 +11:00
Miguel Jacq
9aef3cdbb3
Add a 'persistent URL' label when re-using a private key 2018-01-14 18:41:54 +11:00
Micah Lee
ebbe490a65
Merge branch '493_500_detect_broken_tor_connection' of https://github.com/mig5/onionshare into mig5-493_500_detect_broken_tor_connection 2018-01-13 16:32:56 -08:00
Miguel Jacq
e90908c5b0
Move the saving of private key into the SettingsDialog and Onion objects entirely (no QPushButton to save it) 2018-01-13 20:58:24 +11:00
Miguel Jacq
9154faf351
Check the file is a valid file or dir (not just that it exists) 2018-01-02 09:36:57 +11:00
Miguel Jacq
5c84c277da
Don't show alert dialogs when Tor disconnects - just display in statusbar and stop any active share. 2017-12-23 16:43:58 +11:00
Miguel Jacq
6f4d7f7f44
Fixes for the edge case where Tor connection dialog is canceled, but the Tor process remains open in the background, which was causing onion.is_authenticated() to True. Remove excessive alerts 2017-12-21 14:08:13 +11:00
Miguel Jacq
661cf7f129
Fix the Bridges widgets so that they only appear when bundled Tor is chosen. Fixes all the other widget cramming issues. 2017-12-12 08:43:12 +11:00
Miguel Jacq
3f27b80154
experimenting with adjustSize() which seems to help the widget issue. Also adjust the custom Bridge parsing so that it injects the Bridge prefix automatically (means we can copy/pasta from https://bridges.torproject.org/bridges) 2017-12-11 17:58:53 +11:00
Miguel Jacq
4674f7d97b
Add bridge support (obfs4 or user-supplied) 2017-12-11 14:53:13 +11:00
Lazlo Westerhof
d93e6245ac Add missing comma. 2017-12-08 21:56:09 +01:00
Lazlo Westerhof
a9a935c437 Update Dutch translation. 2017-12-08 21:53:51 +01:00
Miguel Jacq
08c2e106f8
Save the HidServAuth string to settings when private key is also saved. Allow to copy it to clipboard from the SettingsDialog too. 2017-12-09 06:49:34 +11:00
Miguel Jacq
bd5ee8b082
remove question mark from QPushButton 2017-12-08 11:15:12 +11:00
Miguel Jacq
d69e93a5ba
emit to the status bar when the private key is saved to disk 2017-12-07 13:02:56 +11:00
Miguel Jacq
3a056803a9
Optionally save the private key of a running share to settings for reuse 2017-12-07 12:45:34 +11:00
Miguel Jacq
235abd6042
Better wording for no_available_port error 2017-12-07 08:59:34 +11:00
Miguel Jacq
0aacfae925
Raise an error if we were unable to obtain a random port 2017-12-07 08:49:10 +11:00
Micah Lee
58ec047a53
Merge branch '447_reload_tor_if_not_connected_and_settings_cancelled' of https://github.com/mig5/onionshare into mig5-447_reload_tor_if_not_connected_and_settings_cancelled 2017-12-05 14:05:16 -08:00
Miguel Jacq
ba1f535dcb
Better wording when OnionShare can't connect to Tor and the attempt to configure settings is canceled 2017-12-05 11:27:16 +11:00
Miguel Jacq
fe311f591f
#447 show alert and exit if the Settings dialog is canceled yet Tor is still not connected 2017-12-04 18:43:40 +11:00
Miguel Jacq
2eb7bca242
Merge master branch and fix conflicts 2017-12-03 17:06:33 +11:00
Miguel Jacq
3b52f584a1
Don't auto-stop the share if a download is still in progress 2017-12-03 13:21:25 +11:00
Micah Lee
9910ea5c72
Allow for localization for "Share via OnionShare" string in the nautilus extension 2017-12-01 12:57:18 -08:00
Miguel Jacq
af2bef632d
Better wording for shutdown timer 2017-11-12 11:48:06 +11:00
Miguel Jacq
f220058c63
No longer treating shutdown_timeout as a float, but an int of seconds 2017-11-09 19:50:50 +11:00
Miguel Jacq
ac0e375a4b
Various safety checks to prevent a share from starting after the timeout has expired. Also enforce that a timeout lands right on the minute and not precisely when the user clicks start (e.g mid-minute), to avoid confusion that a share might be lingering longer than desired 2017-11-09 17:26:32 +11:00
Miguel Jacq
481f33c822
use QDateTimeEdit instead of a spinbox for selecting a future date/time to auto-stop share 2017-11-09 11:29:55 +11:00
Miguel Jacq
32108dcca2
Implements a shutdown timer to stop a share automatically (downloaded or not) after N hours 2017-11-08 20:25:59 +11:00
Micah Lee
5435a4b046
Merge branch 'mig5-438_settings_icon_inactive' 2017-07-09 14:16:29 -07:00
Miguel Jacq
6626e7d67e
#438 Make settings icon lighter grey when inactive 2017-06-02 11:34:19 +10:00
Miguel Jacq
b19f8fce52
Make it possible to supply a custom json settings file from somewhere else 2017-06-01 17:35:27 +10:00
Micah Lee
baae8fada6
Updated changelog even more, and version bump to 1.1 2017-05-30 12:54:37 -07:00