2085 Commits

Author SHA1 Message Date
Miguel Jacq
9a3e2df7aa Remove obsolete Download/Upload code that crept back in via an earlier merge 2018-11-27 10:50:11 +11:00
Miguel Jacq
c006d90336 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
3b15705d46 Merge branch 'develop' into 819_update_readme 2018-11-25 13:51:41 -08:00
Micah Lee
192792ecc2 Update readme to include repology badge and better install instructions, and also new screenshots 2018-11-25 13:48:50 -08:00
Miguel Jacq
716f2c401d 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
f7d9660a0c Merge pull request #821 from coogor/develop
onionshare.desktop
2018-11-25 13:21:54 -08:00
Miguel Jacq
6f61e5ad4b Run tests on multiple python versions in CircleCI 2018-11-26 08:20:05 +11:00
Micah Lee
91b4c3cc00 Fix bug related to persistent addresses when using v2 onion services 2018-11-25 13:14:56 -08:00
coogor
28953417a2 onionshare.desktop
Fixed categories and generic comment, added german translation
2018-11-25 15:37:50 +01:00
Micah Lee
eca1f9cc8d Merge branch 'develop' into v3-revisited 2018-11-18 17:04:20 -08:00
Miguel Jacq
7151874dad remove debug log 2018-11-13 15:06:28 +11:00
Miguel Jacq
3a879fb22f remove obsolete settings in test that related to allowing receiver to shutdown service 2018-11-13 14:59:29 +11:00
Miguel Jacq
1b670898a0 Merge develop branch and fix conflicts 2018-11-13 14:45:40 +11:00
Miguel Jacq
005d2d0af7 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
a3aef1190f Merge pull request #818 from comradekingu/patch-4
Spelling: Recipient
2018-11-12 11:45:16 +11:00
Allan Nordhøy
05aeaf02cb Spelling: Recipient 2018-11-12 01:35:18 +01:00
Miguel Jacq
666873c6c5 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
a8dae82ac3 Fix tests so they recognize the new receive mode location 2018-10-26 15:08:55 -07:00
Micah Lee
0bab7be444 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
2c45f6851e Receive mode puts files in a directory based on the timestamp of the upload 2018-10-25 21:13:16 -07:00
Micah Lee
8f40553e09 Merge pull request #811 from au5ton/patch-1
Update README.md
2018-10-25 19:46:06 -07:00
Micah Lee
6067e60349 Update CI build status image in readme to use CircleCI instead of Travis 2018-10-25 13:20:46 -07:00
Micah Lee
1b8821fc38 Remove .travis.yml because we're switching to CircleCI 2018-10-25 13:16:30 -07:00
Micah Lee
6ee47cec6f 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
a19a4bc6cf Revert "Tweak travis yml to run the same commands as circle just for curiosity"
This reverts commit 23b2f93f83c86012c5054d5179a2384769572af9.
2018-10-18 17:55:26 +11:00
Miguel Jacq
a63f6bc019 Remove problematic test again 2018-10-18 17:55:11 +11:00
Miguel Jacq
351f3f0d82 Revert "Travis and CircleCI hate this simple test"
This reverts commit 0e95749e33a3d26731552798cbd70f1c810fa969.
2018-10-18 17:42:57 +11:00
Miguel Jacq
23b2f93f83 Tweak travis yml to run the same commands as circle just for curiosity 2018-10-18 17:42:27 +11:00
Miguel Jacq
be71b23399 back to installing main requirements.txt 2018-10-18 17:38:15 +11:00
Miguel Jacq
5d4dc1b4f5 more sudo 2018-10-18 17:36:12 +11:00
Miguel Jacq
fc7dd52c62 Back to sudo 2018-10-18 17:35:30 +11:00
Miguel Jacq
59312bddbc Back to python container 2018-10-18 17:34:34 +11:00
Miguel Jacq
45edb9b991 Add the other python dependencies from the BUILD.md 2018-10-18 17:17:57 +11:00
Miguel Jacq
8095f0c9f8 Other dependencies 2018-10-18 17:15:00 +11:00
Miguel Jacq
9d986e41e1 don't install main requirements.txt 2018-10-18 17:11:39 +11:00
Miguel Jacq
4b6b7f68fb xvfb should be installed 2018-10-18 17:01:33 +11:00
Miguel Jacq
6afe7354c9 avoid prompt 2018-10-18 17:00:46 +11:00
Miguel Jacq
e4e42849d6 see if we can avoid sudo 2018-10-18 16:59:49 +11:00
Miguel Jacq
fbc16f4d7b buster is a tag 2018-10-18 16:57:59 +11:00
Miguel Jacq
25d6bd12ea try and build off buster 2018-10-18 16:57:05 +11:00
Austin Jackson
3b3e79fdf0 Update README.md 2018-10-17 13:19:35 -05:00
Miguel Jacq
7d9f2f1458 pytest-qt is 3.2.1 on my machine 2018-10-17 18:04:38 +11:00
Miguel Jacq
8a9b6ac633 Tweaks to SettingsGuiBaseTest object 2018-10-17 17:59:16 +11:00
Miguel Jacq
fab25aca11 Revert "The only other version difference I can find is PyQt itself"
This reverts commit 95f30f9a4241feb7de17b6f20a082e531d63349a.
2018-10-17 17:51:45 +11:00
Miguel Jacq
95f30f9a42 The only other version difference I can find is PyQt itself 2018-10-17 17:50:16 +11:00
Miguel Jacq
29f987a903 see if it's a version issue 2018-10-17 17:38:28 +11:00
Miguel Jacq
7a7d992cb7 more cleanup in teardown class 2018-10-17 17:29:44 +11:00
Miguel Jacq
4ae5c9bcd9 run on same version of python as me 2018-10-17 17:28:13 +11:00
Miguel Jacq
8e4c70e7fb Fix path to large_file in teardown class 2018-10-17 17:23:25 +11:00
Miguel Jacq
0e95749e33 Travis and CircleCI hate this simple test 2018-10-17 17:17:43 +11:00