Skip to content
Commit ed25eb67 authored by Tomáš Tomala's avatar Tomáš Tomala
Browse files

Merge from develop to conform to changes

commit a3c02c3f
Merge: 76fba1a3 5c83c50e
Author: Matěj Gorgol <xgorgol@fi.muni.cz>
Date:   Sun Apr 16 22:39:30 2023 +0200

    Merge branch 'query_fix' into 'develop'

    not deleted check added

    See merge request !49

commit 76fba1a3
Merge: ca2ec938 7b2f1da1
Author: Kryštof-Mikuláš Štys <xstys@fi.muni.cz>
Date:   Sun Apr 16 22:38:30 2023 +0200

    Merge branch 'flight-entity-check' into 'develop'

    Check of existence of UUID in flight facade

    See merge request !41

commit ca2ec938
Merge: bae690a5 c993c7f8
Author: Matěj Gorgol <xgorgol@fi.muni.cz>
Date:   Sun Apr 16 22:36:07 2023 +0200

    Merge branch 'continuation-of-flights-tests' into 'develop'

    [Refactor] Continuation of flights tests

    See merge request !47

commit 5c83c50e
Author: Matej Gorgol <56208414+Mateorid@users.noreply.github.com>
Date:   Sun Apr 16 22:35:07 2023 +0200

    not deleted check added

commit bae690a5
Merge: ec19fe7b e61f82e4
Author: Kryštof-Mikuláš Štys <xstys@fi.muni.cz>
Date:   Sun Apr 16 22:32:27 2023 +0200

    Merge branch 'flight-entity-tests' into 'develop'

    Flight entity tests

    See merge request !48

commit 7b2f1da1
Author: Tereza Vrabcová <xvrabcov@ACER-TRAVEL.localdomain>
Date:   Sun Apr 16 22:28:12 2023 +0200

    added null check for checkEntity

commit c993c7f8
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Sun Apr 16 22:05:53 2023 +0200

    [Fix] Conflicts driven development

commit e61f82e4
Author: Jan Sýkora <485598@muni.cz>
Date:   Sun Apr 16 21:44:55 2023 +0200

    extended functionality test

commit 0fdd70d2
Author: Jan Sýkora <485598@muni.cz>
Date:   Sun Apr 16 20:21:29 2023 +0200

    init integration tests

commit 87ec8184
Merge: c50a2f85 ec19fe7b
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Sun Apr 16 20:10:38 2023 +0200

    Merge branch 'develop' into continuation-of-flights-tests

commit c50a2f85
Author: Kryštof-Mikuláš Štys <493159@mail.muni.cz>
Date:   Sun Apr 16 20:09:10 2023 +0200

    [Enh] Steward unavailable message handling

commit 3902b14d
Author: Tereza Vrabcová <xvrabcov@ACER-TRAVEL.localdomain>
Date:   Sun Apr 16 19:27:19 2023 +0200

    change checkEntity to a void method

commit 6cb58cde
Author: Jan Sýkora <485598@muni.cz>
Date:   Sun Apr 16 17:34:13 2023 +0200

    flight service tests

commit aa2d25e8
Author: Jan Sýkora <485598@muni.cz>
Date:   Sun Apr 16 16:22:14 2023 +0200

    flight service add tests

commit 752b7c79
Author: Jan Sýkora <485598@muni.cz>
Date:   Sun Apr 16 14:53:30 2023 +0200

    flight service tests init

commit ab1e092d
Author: Tereza Vrabcová <xvrabcov@ACER-TRAVEL.localdomain>
Date:   Sun Apr 16 11:48:22 2023 +0200

    entityCheck as private method

commit fe5fd5a1
Author: Tereza Vrabcová <xvrabcov@ACER-TRAVEL.localdomain>
Date:   Sun Apr 16 11:41:54 2023 +0200

    entity check for airline in flight-module

commit 6f5ed5d2
Merge: 699e7681 28c2fcca
Author: Tereza Vrabcová <xvrabcov@ACER-TRAVEL.localdomain>
Date:   Sun Apr 16 11:34:08 2023 +0200

    Merge remote-tracking branch 'origin/develop' into flight-entity-check

commit 699e7681
Author: Tereza Vrabcová <xvrabcov@ACER-TRAVEL.localdomain>
Date:   Sun Apr 16 08:49:56 2023 +0200

    add check of entity existence in flight facade
parent 27c195b6
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment