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 |
|
Miguel Jacq
|
c47f974dad
|
Tweaks to SettingsGuiBaseTest object
|
2018-10-17 17:59:16 +11:00 |
|
Miguel Jacq
|
cfbfc4a666
|
Revert "The only other version difference I can find is PyQt itself"
This reverts commit f608b79aaf .
|
2018-10-17 17:51:45 +11:00 |
|
Miguel Jacq
|
f608b79aaf
|
The only other version difference I can find is PyQt itself
|
2018-10-17 17:50:16 +11:00 |
|
Miguel Jacq
|
cddfd5b0a4
|
see if it's a version issue
|
2018-10-17 17:38:28 +11:00 |
|
Miguel Jacq
|
59667b2d1d
|
more cleanup in teardown class
|
2018-10-17 17:29:44 +11:00 |
|
Miguel Jacq
|
3538e9d19e
|
run on same version of python as me
|
2018-10-17 17:28:13 +11:00 |
|
Miguel Jacq
|
bbff749862
|
Fix path to large_file in teardown class
|
2018-10-17 17:23:25 +11:00 |
|
Miguel Jacq
|
a68a0dbabf
|
Travis and CircleCI hate this simple test
|
2018-10-17 17:17:43 +11:00 |
|
Miguel Jacq
|
bc85d1a9af
|
remove branch specific config
|
2018-10-17 17:15:34 +11:00 |
|
Miguel Jacq
|
0d48d2a354
|
sudo
|
2018-10-17 17:15:13 +11:00 |
|
Miguel Jacq
|
68bff3fd50
|
circleci tweaks
|
2018-10-17 17:04:24 +11:00 |
|
Miguel Jacq
|
67d75826ae
|
circleci tweaks
|
2018-10-17 16:59:13 +11:00 |
|
Miguel Jacq
|
d40351e0af
|
circleci tweaks
|
2018-10-17 16:58:05 +11:00 |
|
Miguel Jacq
|
ce5d978a8f
|
try to get circleci to build just this branch for now
|
2018-10-17 16:55:15 +11:00 |
|
Miguel Jacq
|
7820c13a42
|
Add initial .circleci config
|
2018-10-17 16:51:49 +11:00 |
|
Miguel Jacq
|
497cd4fbdd
|
Revert "raise timer seuqnce on open settings dialog test (in case that's why it's segfaulting in Travis)"
This reverts commit 22e5667842 .
|
2018-10-17 16:45:52 +11:00 |
|
Miguel Jacq
|
22e5667842
|
raise timer seuqnce on open settings dialog test (in case that's why it's segfaulting in Travis)
|
2018-10-17 16:36:58 +11:00 |
|
Miguel Jacq
|
b749fc8d12
|
Remove unique settings file per test, because they don't run concurrently anymore
|
2018-10-17 16:31:51 +11:00 |
|
Miguel Jacq
|
0176535e50
|
Merge branch 'develop' into fix_tor_tests
|
2018-10-17 16:19:03 +11:00 |
|
Micah Lee
|
9812e75495
|
Merge pull request #810 from mig5/fix_timer_alert
Fix call to Alert() when an autostop timer has run out before starting the share
|
2018-10-16 22:16:35 -07:00 |
|