212 Commits

Author	SHA1	Message	Date
Miguel Jacq	8bb75cc530	Fix conflict in tests	2018-09-15 12:07:01 +10:00
Micah Lee	8312058fcc	Merge branch 'develop' into receiver-mode-gui	2018-09-14 18:59:36 -07:00
Micah Lee	d2ef9872a4	Merge branch '681_remove_obsolete_strings' of https://github.com/mig5/onionshare into mig5-681_remove_obsolete_strings	2018-09-14 16:57:33 -07:00
Miguel Jacq	11bf059015	Fix conflict from receiver-mode-gui branch	2018-09-04 11:48:39 +10:00
Miguel Jacq	1a273e772b	remove obsolete strings	2018-07-22 17:13:23 +10:00
Miguel Jacq	e343aa194e	Revert "#681 remove obsolete strings" ... This reverts commit e4d1f8b8f6.	2018-07-22 16:26:10 +10:00
Miguel Jacq	e4d1f8b8f6	#681 remove obsolete strings	2018-07-22 16:20:19 +10:00
Miguel Jacq	3b45f93dbe	Expand 'public mode' (optional slugs) to be possible for sharing too, not just receiving, with no rate-limiting/self-destruct on invalid routes.	2018-07-21 17:06:11 +10:00
Miguel Jacq	a830eb57fe	#691 remove meek_lite Amazon	2018-07-21 15:52:11 +10:00
Miguel Jacq	e37dbb3efb	Only show the 'I'm Finished Sending' button if the user actually already sent (or tried to send) anything	2018-07-17 11:53:55 +10:00
Miguel Jacq	4092a65e0c	Improve styling of flash() messages by using categories, and style the closed.html. Replace references to 'Uploading' with 'Sending' for consistency	2018-07-17 11:45:14 +10:00
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