1993 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
scootergrisen	bc8d1d3f49	Translated using Weblate (Danish) ... Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/da/	2018-12-05 18:14:18 +01:00
Allan Nordhøy	f1d0c66768	Translated using Weblate (Norwegian Bokmål) ... Translate-URL: https://hosted.weblate.org/projects/onionshare/translations/nb_NO/	2018-12-05 18:14:18 +01:00
Micah Lee	c7ef1bba39	Merge pull request #752 from mig5/receiver-mode-gui-hold-timeout-share-open-til-upload-finished ... Hold a share open if its timer has expired but a file is still uploading.	2018-12-05 09:13:54 -08:00
Miguel Jacq	d15e00061a	Keep the upload running in the GUI if the timer has run out	2018-12-05 18:19:35 +11:00
Miguel Jacq	ad7a858ab0	Merge pull request #826 from micahflee/update_deps ... Update pip dependencies	2018-11-27 14:32:05 +11:00
Micah Lee	6bfe9d4476	Merge pull request #763 from mig5/open_folder_uploads_macos_windows ... Open folder containing uploads with the file selected, in macOS and Windows	2018-11-26 18:03:52 -08:00
Micah Lee	f32af3ca7e	Update pip dependencies	2018-11-26 17:14:44 -08:00
Micah Lee	4a765e0768	Merge pull request #825 from mig5/download_upload_cruft ... Remove obsolete Download/Upload code that crept back in via an earlier merge	2018-11-26 16:56:36 -08:00
Miguel Jacq	8182d24d55	Remove obsolete Download/Upload code that crept back in via an earlier merge	2018-11-27 10:50:11 +11:00
Miguel Jacq	2ca4f56de1	Merge pull request #822 from micahflee/819_update_readme ... Include repology badge, and new screenshots	2018-11-26 10:37:04 +11:00
Micah Lee	87d10e1963	Merge branch 'develop' into 819_update_readme	2018-11-25 13:51:41 -08:00
Micah Lee	24a4e1567a	Update readme to include repology badge and better install instructions, and also new screenshots	2018-11-25 13:48:50 -08:00
Miguel Jacq	b2a98fb5e7	Merge pull request #806 from micahflee/v3-revisited ... Change how v3 onion services work to support Debian Stretch	2018-11-26 08:26:33 +11:00
Micah Lee	1690d76601	Merge pull request #821 from coogor/develop ... onionshare.desktop	2018-11-25 13:21:54 -08:00
Miguel Jacq	b1245dbba0	Run tests on multiple python versions in CircleCI	2018-11-26 08:20:05 +11:00
Micah Lee	5f011e9ed6	Fix bug related to persistent addresses when using v2 onion services	2018-11-25 13:14:56 -08:00
coogor	395bc37af2	onionshare.desktop ... Fixed categories and generic comment, added german translation	2018-11-25 15:37:50 +01:00
Micah Lee	e29c0e7b69	Merge branch 'develop' into v3-revisited	2018-11-18 17:04:20 -08:00
Miguel Jacq	17aa34edd9	remove debug log	2018-11-13 15:06:28 +11:00
Miguel Jacq	0997635393	remove obsolete settings in test that related to allowing receiver to shutdown service	2018-11-13 14:59:29 +11:00
Miguel Jacq	d3b5e1e256	Merge develop branch and fix conflicts	2018-11-13 14:45:40 +11:00
Miguel Jacq	db8548c35b	Try and fix closing the request for a valid upload post-timer expiry, whilst still rejecting subsequent uploads	2018-11-13 14:42:26 +11:00
Miguel Jacq	a39cd08083	Merge pull request #818 from comradekingu/patch-4 ... Spelling: Recipient	2018-11-12 11:45:16 +11:00
Allan Nordhøy	8016010a22	Spelling: Recipient	2018-11-12 01:35:18 +01:00
Miguel Jacq	7956b33a46	Merge pull request #814 from micahflee/743_receive_mode_organize ... Receive mode organizes files for you	2018-10-27 17:51:20 +11:00
Micah Lee	f5e0e9dd62	Fix tests so they recognize the new receive mode location	2018-10-26 15:08:55 -07:00
Micah Lee	65b4afeba3	Communicate the receive mode dir to the GUI, so clicking the open folder button opens the file manager to the correct directory	2018-10-25 21:38:20 -07:00
Micah Lee	6233487ecd	Receive mode puts files in a directory based on the timestamp of the upload	2018-10-25 21:13:16 -07:00
Micah Lee	23a1ed9165	Merge pull request #811 from au5ton/patch-1 ... Update README.md	2018-10-25 19:46:06 -07:00
Micah Lee	a16d56239a	Update CI build status image in readme to use CircleCI instead of Travis	2018-10-25 13:20:46 -07:00
Micah Lee	354604dbdb	Remove .travis.yml because we're switching to CircleCI	2018-10-25 13:16:30 -07:00
Micah Lee	07057d6b0b	Delete obsolete dev_scripts/run_all_tests.sh script, and add xvfb-run info to the build instructions	2018-10-25 11:01:09 -07:00
Miguel Jacq	60e52aad3b	Revert "Tweak travis yml to run the same commands as circle just for curiosity" ... This reverts commit ecd837fc3c.	2018-10-18 17:55:26 +11:00
Miguel Jacq	e1d0d10019	Remove problematic test again	2018-10-18 17:55:11 +11:00
Miguel Jacq	ecea986f14	Revert "Travis and CircleCI hate this simple test" ... This reverts commit a68a0dbabf.	2018-10-18 17:42:57 +11:00
Miguel Jacq	ecd837fc3c	Tweak travis yml to run the same commands as circle just for curiosity	2018-10-18 17:42:27 +11:00
Miguel Jacq	95ece1aac0	back to installing main requirements.txt	2018-10-18 17:38:15 +11:00
Miguel Jacq	e0da92cc82	more sudo	2018-10-18 17:36:12 +11:00
Miguel Jacq	d50adaa52c	Back to sudo	2018-10-18 17:35:30 +11:00
Miguel Jacq	7f06b7d267	Back to python container	2018-10-18 17:34:34 +11:00
Miguel Jacq	5485b89761	Add the other python dependencies from the BUILD.md	2018-10-18 17:17:57 +11:00
Miguel Jacq	ceb665972b	Other dependencies	2018-10-18 17:15:00 +11:00
Miguel Jacq	638651ceec	don't install main requirements.txt	2018-10-18 17:11:39 +11:00
Miguel Jacq	0c328b8c55	xvfb should be installed	2018-10-18 17:01:33 +11:00
Miguel Jacq	5972665fc3	avoid prompt	2018-10-18 17:00:46 +11:00
Miguel Jacq	eb63a045f3	see if we can avoid sudo	2018-10-18 16:59:49 +11:00
Miguel Jacq	d5881286be	buster is a tag	2018-10-18 16:57:59 +11:00
Miguel Jacq	72e684c166	try and build off buster	2018-10-18 16:57:05 +11:00
Austin Jackson	ced8948eb8	Update README.md	2018-10-17 13:19:35 -05:00
Miguel Jacq	f1bf8966a0	pytest-qt is 3.2.1 on my machine	2018-10-17 18:04:38 +11:00