Commit Graph

18 Commits

Author SHA1 Message Date
Tim
bb0ad4c36d
Fix 2020-06-26 15:26:48 +01:00
Tim Bentley
c74aaeda91 Merge branch 'resolve' into 'master'
Resolve - issues

See merge request openlp/openlp_api_tester!4
2020-06-26 14:25:03 +00:00
Tim Bentley
7bd7d9eafd Merge branch 'master' of gitlab.com:openlp/openlp_api_tester
# Conflicts:
#	test_api/apitest/runner.py
2020-06-26 14:25:03 +00:00
Tim
81a1f87366
Fixes 2020-06-26 15:19:30 +01:00
Tim Bentley
ddb8d1ac73 Merge branch 'queues' into 'master'
Queues

See merge request openlp/openlp_api_tester!3
2020-06-26 13:57:22 +00:00
Tim Bentley
49a94bf3dd Queues 2020-06-26 13:57:22 +00:00
Tim
149a189bfe
help 2020-06-26 14:40:45 +01:00
Tim Bentley
de2f630de0 Merge branch 'fixes2' into 'master'
Fixes2

See merge request openlp/openlp_api_tester!2
2020-06-21 08:57:12 +00:00
Tim Bentley
26cbcb96b1 Fixes2 2020-06-21 08:57:12 +00:00
Tim Bentley
c6cd3aa837 Update .gitlab-ci.yml 2020-06-21 07:31:12 +00:00
Tim Bentley
a2dee2650b Update .gitlab-ci.yml 2020-06-21 07:28:23 +00:00
Tim Bentley
13061e46a9 Add .gitlab-ci.yml 2020-06-21 07:25:52 +00:00
Tim Bentley
34a22984ff Merge branch 'fixes_01' into 'master'
Fixes 01

See merge request openlp/openlp_api_tester!1
2020-06-20 10:27:43 +00:00
Tim Bentley
d5bcc35175 Fixes 01 2020-06-20 10:27:43 +00:00
Tim
3281f241fa
Update WebSocket code to run on Thread and test from Thread. 2020-06-20 11:18:05 +01:00
Tim
b616f41b4e
Remove .idea tracking 2020-06-20 09:07:08 +01:00
Tim Bentley
f2f07faf60 Add README.md 2020-06-20 07:56:29 +00:00
Tim
4cfa890c7c
Initial Commit 2020-06-20 08:53:44 +01:00