Squashed commit of the following:

commit 3c67748
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 25 15:50:19 2021 +0100

    - changed version number to 0.9.68

commit db446c2
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 25 15:47:00 2021 +0100

    - integrated solution with new version of backend

commit 42a74b8
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 23 10:50:10 2021 +0100

    - support for data structure

commit 8d8a70a
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 18 09:44:29 2021 +0100

    - updated version number to 0.9.67

commit 98d0be7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 18 09:43:46 2021 +0100

    - fixed shifting columns in csv file

commit d46c222
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 17 10:23:12 2021 +0100

    - tweaks added to csv generation

commit e4b2117
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 16 09:32:01 2021 +0100

    - updated version number to 0.9.66

commit dbe3766
Merge: 16ed9bf 3788875
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 16 09:25:26 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#538' into allfunctionality

commit 3788875
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Feb 16 09:20:22 2021 +0100

commit 16ed9bf
Merge: f6eb737 c65f967
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 16 09:15:22 2021 +0100

    Merge remote-tracking branch 'remotes/origin/allfunctionality' into #539

commit f6eb737
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 16 09:06:56 2021 +0100

    - additional csv changes

commit c65f967
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Feb 16 07:33:40 2021 +0100

commit d2bf4cd
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 15 15:32:22 2021 +0100

    - #539 done

commit 710e9fc
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 15 10:02:24 2021 +0100

    - #441 bugfix for select all and deselect all

commit c4d8499
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 15 08:42:06 2021 +0100

    - #441 - finished implementation

commit ff812f1
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 15 08:15:01 2021 +0100

    - #441 - nearly finished implementation

commit 452b8ce
Merge: c5af2dc a2bbaa2
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 11 12:24:25 2021 +0100

    Merge remote-tracking branch 'remotes/origin/allfunctionality' into #441

commit a2bbaa2
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Feb 11 10:57:11 2021 +0100

    - trying to fix problem in test environment where clicking on the vector crashes the fornt-end

commit 39c7d0d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 10 15:50:29 2021 +0100

    - fixed build error

commit ca1054c
Merge: c63468a 6b12b03
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 10 15:16:10 2021 +0100

    Merge branch 'allfunctionality' of https://github.com/m2ms/fragalysis-frontend into allfunctionality

commit c63468a
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 10 15:15:29 2021 +0100

    - updated version number to 0.9.65

commit dfffda9
Merge: 66126f0 54d69f4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 10 14:53:53 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#538' into allfunctionality

commit 6b12b03
Merge: 8529735 6d6e921
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Wed Feb 10 14:50:11 2021 +0100

    Merge branch 'master' into allfunctionality

commit 54d69f4
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Feb 10 14:39:03 2021 +0100

commit 68570b7
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Feb 10 13:51:45 2021 +0100

commit 66126f0
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Feb 10 07:53:50 2021 +0100

commit 8529735
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 10 05:59:36 2021 +0100

    - updated version number to 0.9.64

commit 36bf528
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Feb 9 16:00:20 2021 +0100

commit 191ce97
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 9 09:18:08 2021 +0100

    - updated version number to 0.9.63

commit 8a4de15
Merge: 3dbbeaf ba5e92d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 9 09:16:29 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#523' into allfunctionality

commit 3dbbeaf
Merge: f0b557c 5d9065d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 9 09:15:42 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#553' into allfunctionality

commit 6d6e921
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Tue Feb 9 09:12:56 2021 +0100

    Update package.json

    - updated version number to 0.9.62

commit 7412cbd
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Tue Feb 9 09:11:44 2021 +0100

    Update datasetMoleculeView.js

    fixed problem with inspirations not displaying

commit 5d9065d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 9 08:31:07 2021 +0100

    - fixed problem where no inspirations were displayed

commit ba5e92d
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Feb 9 07:46:53 2021 +0100

commit f0b557c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 9 06:29:21 2021 +0100

    - updated version number to 0.9.61

commit 7ac1ab2
Merge: 1783871 7073755
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 9 06:25:45 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#510' into allfunctionality

commit 7073755
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Feb 8 15:29:49 2021 +0100

commit 1783871
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 8 13:39:45 2021 +0100

    - added new docker compose file which uses alternative neo4j image with actual vector data

commit c5af2dc
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 8 13:37:20 2021 +0100

    - in progress

commit f979aa5
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Feb 8 13:12:29 2021 +0100

commit 3b61636
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Feb 8 09:52:20 2021 +0100

commit d33e729
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Feb 8 08:25:08 2021 +0100

commit 6563581
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 8 05:43:34 2021 +0100

    - updated version number to 0.9.60

commit 81700ab
Merge: 926b442 7d18976
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 8 05:34:43 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#533' into allfunctionality

commit 1a76895
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 8 05:32:53 2021 +0100

    - partial

commit ad5aa18
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Feb 5 15:29:52 2021 +0100

commit 7d18976
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Feb 5 09:48:49 2021 +0100

commit 430fa7c
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Feb 5 08:30:09 2021 +0100

commit 0e82dac
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Feb 4 16:02:18 2021 +0100

commit 5b451fa
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Feb 4 07:55:43 2021 +0100

commit 55e6993
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 14:17:12 2021 +0100

    Update package.json

    - updated version number

commit 5e63309
Merge: 746892e 926b442
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 14:14:32 2021 +0100

    Merge pull request #230 from m2ms/allfunctionality

    Allfunctionality

commit 926b442
Merge: 083cc6d 746892e
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 14:14:13 2021 +0100

    Merge branch 'master' into allfunctionality

commit 33ff8b9
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Feb 3 13:33:02 2021 +0100

commit cda548a
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Feb 3 11:21:01 2021 +0100

commit 083cc6d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 08:35:04 2021 +0100

    - updated version number

commit b32e3d5
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 08:32:39 2021 +0100

    - fixed report issue without screenshot

commit 1031ec9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 05:59:23 2021 +0100

    - updated version number

commit fdaf0e3
Merge: 28d9fa5 42a5391
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 05:59:06 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#519' into allfunctionality

commit 28d9fa5
Merge: fc13e38 f23b8e1
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 05:58:36 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#520' into allfunctionality

commit fc13e38
Merge: 99150c0 e24d821
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 05:58:02 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#509' into allfunctionality

commit 99150c0
Merge: 5b48a2e ed95f12
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Feb 3 05:56:22 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#524' into allfunctionality

commit 42a5391
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Feb 2 13:34:07 2021 +0100

commit f23b8e1
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Feb 2 11:05:33 2021 +0100

commit e24d821
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 2 09:11:34 2021 +0100

    - removed submit idea button
    - fixed report issue

commit ed95f12
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 2 08:28:00 2021 +0100

    - finished fixing the undo/redo behavior for viewer settings

commit 5b48a2e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 2 06:22:57 2021 +0100

    - updated version number

commit e49067d
Merge: e2362bc bcebc5e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 2 06:11:50 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#530' into allfunctionality

commit e2362bc
Merge: 5f34ce0 83eb181
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 2 06:11:25 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#528' into allfunctionality

commit 5f34ce0
Merge: bef6400 c5efc43
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 2 06:10:48 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#517' into allfunctionality

commit 0104ed4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Feb 2 06:08:16 2021 +0100

    - stashing changes to modified implementation of undo-redo

commit bcebc5e
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Feb 1 13:36:03 2021 +0100

commit 83eb181
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Feb 1 08:08:27 2021 +0100

commit c5efc43
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Feb 1 07:47:35 2021 +0100

commit bef6400
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 1 06:47:52 2021 +0100

    - updated version number

commit cdeda90
Merge: c683a05 291a3f7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 1 06:35:19 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#521' into allfunctionality

commit c683a05
Merge: 548dc26 82b84d3
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 1 06:34:53 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#515' into allfunctionality

commit 548dc26
Merge: 533ba8c 04d97df
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 1 06:31:49 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#520' into allfunctionality

commit 533ba8c
Merge: 60cda62 c7bd5a3
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 1 06:30:48 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#511' into allfunctionality

commit 60cda62
Merge: e63dae6 5e37e48
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Feb 1 06:30:16 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#516' into allfunctionality

commit 291a3f7
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Jan 29 15:09:03 2021 +0100

commit 82b84d3
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Jan 29 13:43:26 2021 +0100

commit 04d97df
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Jan 29 13:13:50 2021 +0100

commit c7bd5a3
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Jan 29 10:42:18 2021 +0100

commit 5e37e48
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Jan 29 08:32:58 2021 +0100

commit 746892e
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Thu Jan 28 15:15:31 2021 +0100

    Update package.json

    updated version number

commit 37c4f81
Merge: 4afeb35 e78af5e
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Thu Jan 28 15:13:11 2021 +0100

    Merge pull request #229 from m2ms/allfunctionality

    Allfunctionality

commit e78af5e
Merge: e63dae6 4afeb35
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Thu Jan 28 15:12:57 2021 +0100

    Merge branch 'master' into allfunctionality

commit acf6726
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Jan 28 11:01:24 2021 +0100

commit e63dae6
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Jan 28 07:16:01 2021 +0100

    - updated version number

commit f4ca434
Merge: 610bfc4 d2d92af
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Jan 28 07:15:15 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#508' into allfunctionality

commit d2d92af
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Jan 27 12:58:46 2021 +0100

commit 610bfc4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 27 07:34:51 2021 +0100

    - updated version number

commit 672fcab
Merge: 1c4dfba 022446b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 27 07:30:53 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#486' into allfunctionality

commit 022446b
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Jan 26 13:57:23 2021 +0100

commit 44fdd42
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Jan 26 13:45:11 2021 +0100

commit 1c4dfba
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Jan 26 09:30:49 2021 +0100

    - fixed scenario when there are no actions for ngl view settings modification but ngl view was modified by mouse controls
    - updated version number

commit 7b5b6e5
Merge: 80744db d1b73f2
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Jan 26 07:39:15 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#505' into allfunctionality

commit d1b73f2
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Jan 26 06:44:20 2021 +0100

commit 5e695a2
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Jan 25 16:48:48 2021 +0100

commit 41957fe
Merge: 68eaab9 4efbbee
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Jan 25 13:44:57 2021 +0100

    Merge remote-tracking branch 'remotes/origin/allfunctionality' into #486

commit 80744db
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Jan 25 13:01:06 2021 +0100

commit 4afeb35
Merge: bc1493d 4efbbee
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Mon Jan 25 12:17:21 2021 +0100

    Merge pull request #228 from m2ms/allfunctionality

    Allfunctionality

commit 4efbbee
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Jan 25 11:49:26 2021 +0100

    - fixed yet another automatic merge problem

commit 1e09b45
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Mon Jan 25 11:29:54 2021 +0100

    Update moleculeList.js

    removed duplicate function

commit bc1493d
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Mon Jan 25 11:25:45 2021 +0100

    Update moleculeList.js

    removed duplicate function

commit a31fdaa
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Mon Jan 25 11:04:13 2021 +0100

    Update package.json

    updated version number

commit 19864ba
Merge: 2bb6a6f 2d72fa1
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 16:00:46 2021 +0100

    Merge pull request #227 from m2ms/allfunctionality

    Action capture fixes

commit 2d72fa1
Merge: f31cdcb 2bb6a6f
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 16:00:23 2021 +0100

    Merge branch 'master' into allfunctionality

commit f31cdcb
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 15:32:47 2021 +0100

    - update version number

commit ef21e2f
Merge: 2704676 ffcd372
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 15:27:13 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#503' into allfunctionality

commit ffcd372
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Jan 22 15:06:56 2021 +0100

commit c71a200
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Jan 22 13:57:59 2021 +0100

commit 2704676
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 10:11:22 2021 +0100

    - updated version number

commit 886eeb3
Merge: 9109471 fc1b353
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 10:05:29 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#479' into allfunctionality

commit fc1b353
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Jan 22 09:13:03 2021 +0100

commit 9109471
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 08:23:22 2021 +0100

    - updated version number

commit 4957875
Merge: 8cb09ce 8d816cf
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 08:17:50 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#481' into allfunctionality

commit 8cb09ce
Merge: 87f11ca 5eed0e8
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 08:17:01 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#480' into allfunctionality

commit 5eed0e8
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Jan 22 08:15:24 2021 +0100

    - fixed clip far

commit 68eaab9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Jan 21 14:13:06 2021 +0100

    - in case of error remove loading state

commit 8d816cf
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Jan 21 12:43:27 2021 +0100

commit 87f11ca
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Jan 21 05:52:34 2021 +0100

    - updated version number

commit 0ccbf33
Merge: 1e0e019 c157a7e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Jan 21 05:52:05 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#479' into allfunctionality

commit c157a7e
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Jan 20 14:03:10 2021 +0100

commit 1e0e019
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 20 13:14:07 2021 +0100

    - updated version number

commit 9bf0f84
Merge: aad4c70 655ed84
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 20 13:02:53 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#480' into allfunctionality

commit 655ed84
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 20 13:01:36 2021 +0100

    - finished implementation

commit aa3a832
Merge: 1e5921d aad4c70
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Jan 20 09:40:32 2021 +0100

    Merge remote-tracking branch 'remotes/origin/allfunctionality' into #479

commit aad4c70
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 20 08:30:07 2021 +0100

    - updated version number

commit b3a867f
Merge: db5330b e6747f6
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 20 08:23:59 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#483' into allfunctionality

commit db5330b
Merge: 1bce81d 29e4ff4
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 20 08:23:21 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#485' into allfunctionality

commit 1bce81d
Merge: bc7ee58 108114e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 20 08:20:29 2021 +0100

    Merge remote-tracking branch 'remotes/origin/#480' into allfunctionality

commit 108114e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Jan 20 08:10:53 2021 +0100

    - initial implementation for background color and clip near

commit 1e5921d
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Jan 20 07:36:00 2021 +0100

commit e6747f6
Author: ag-m2ms <anton.gasperak@m2ms.sk>
Date:   Tue Jan 19 13:21:03 2021 +0100

    Slight changes and added comments

commit afb2397
Author: ag-m2ms <anton.gasperak@m2ms.sk>
Date:   Tue Jan 19 12:38:10 2021 +0100

    Mostly done

commit 95aa899
Author: ag-m2ms <anton.gasperak@m2ms.sk>
Date:   Mon Jan 18 18:52:39 2021 +0100

    Initial implementation

commit 29e4ff4
Merge: 030155a bc7ee58
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Jan 18 13:29:40 2021 +0100

    Merge remote-tracking branch 'remotes/origin/allfunctionality' into #485

commit 030155a
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Jan 18 13:28:10 2021 +0100

commit bc7ee58
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Jan 12 06:58:17 2021 +0100

    - removed log rocket

commit 14e0a1f
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Dec 18 16:38:51 2020 +0100

commit 2fe8723
Merge: ac99d74 0ca9ba1
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Dec 18 14:30:21 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#481' into allfunctionality

commit 0ca9ba1
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Dec 18 13:33:28 2020 +0100

commit ac99d74
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Dec 18 07:24:22 2020 +0100

    - updated version number

commit 58ddbdd
Merge: 85959ac 602eeb8
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Dec 18 06:17:00 2020 +0100

    Merge remote-tracking branch 'remotes/origin/allfunctionality' into #432

commit 85959ac
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Dec 17 13:43:37 2020 +0100

commit 602eeb8
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 11:02:28 2020 +0100

    - fixed reference

commit 4c735f8
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 09:03:22 2020 +0100

    - removed debug.log and added to ignore list

commit 4515577
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 09:02:09 2020 +0100

    -updated version number

commit 06b6711
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 08:30:46 2020 +0100

    - fixed X button

commit 4f28190
Merge: f28d5e7 f00d8f3
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 07:32:47 2020 +0100

    Merge remote-tracking branch 'remotes/origin/allfunctionality' into perfMerge1

commit f00d8f3
Merge: 0c31f4d 184d6bd
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 07:31:26 2020 +0100

    Merge branch 'allfunctionality' of https://github.com/m2ms/fragalysis-frontend into allfunctionality

commit 0c31f4d
Merge: 14b1e61 02190a1
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 07:30:15 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#469' into allfunctionality

commit f28d5e7
Merge: c7d89b5 14b1e61
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 07:17:37 2020 +0100

    Merge remote-tracking branch 'remotes/origin/allfunctionality' into perfMerge1

commit 184d6bd
Merge: 9550632 14b1e61
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 07:14:05 2020 +0100

    Merge branch 'allfunctionality' of https://github.com/m2ms/fragalysis-frontend into allfunctionality

commit 9550632
Merge: 8b7779c 02190a1
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 17 07:12:52 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#469' into allfunctionality

commit c7d89b5
Merge: adb5fb9 260e01c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Dec 16 15:52:04 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#455' into perfMerge

commit 02190a1
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Dec 16 13:07:30 2020 +0100

commit 1d1da57
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Dec 16 07:30:41 2020 +0100

commit 4772600
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Dec 14 15:00:39 2020 +0100

commit 14b1e61
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Dec 11 11:57:01 2020 +0100

    - fixed bad merge

commit 2e9939f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 10 15:09:30 2020 +0100

    - updated version number

commit a72bde7
Merge: 8b7779c 99591ac
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 10 15:07:48 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#472' into allfunctionality

commit 2bb6a6f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 10 14:58:06 2020 +0100

    - fixed some automatic merge problems

commit f1ee726
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Thu Dec 10 14:45:08 2020 +0100

    Update package.json

    updated version number

commit 177ffa6
Merge: bacb410 260e01c
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Thu Dec 10 14:30:26 2020 +0100

    Merge pull request #226 from m2ms/#455

commit 260e01c
Merge: 653e165 bacb410
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Thu Dec 10 14:29:10 2020 +0100

    Merge branch 'master' into #455

commit 99591ac
Author: ag-m2ms <anton.gasperak@m2ms.sk>
Date:   Thu Dec 10 14:05:24 2020 +0100

    Adjusted tracking behaviour for turned off sites

commit 8b7779c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 10 10:42:33 2020 +0100

    - updated version number

commit 6e75f88
Merge: c624767 4be4ac6
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 10 10:41:50 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#471' into allfunctionality

commit c21b228
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Dec 10 10:10:15 2020 +0100

commit 4be4ac6
Author: ag-m2ms <anton.gasperak@m2ms.sk>
Date:   Thu Dec 10 09:36:46 2020 +0100

    Fixed 'A' button

commit 48e5071
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Dec 9 16:11:49 2020 +0100

commit 0f9d1cc
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Dec 9 13:31:00 2020 +0100

commit d845a3a
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Dec 9 12:17:49 2020 +0100

commit c624767
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 8 15:12:48 2020 +0100

    - updated version number

commit 56aabcb
Merge: ff48631 653e165
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 8 15:11:50 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#455' into allfunctionality

commit adb5fb9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 8 15:10:13 2020 +0100

    - additional performance fixes

commit 653e165
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Dec 8 14:13:43 2020 +0100

commit 56bdf61
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 8 10:52:44 2020 +0100

    - finished caching

commit 1e45618
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 8 09:14:07 2020 +0100

    - retrieve images from server and cache them

commit 4d83214
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Dec 7 15:10:32 2020 +0100

    Store and retrieve snapshot actions in/from the backend #455

commit ff48631
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Dec 4 09:42:12 2020 +0100

    - updated version number

commit f480602
Merge: 217553c 6ea2e2a
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Dec 4 09:41:44 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#455' into allfunctionality

commit 67373ed
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Dec 4 09:38:46 2020 +0100

    - stashing stuff before merge

commit 6ea2e2a
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Dec 4 09:34:52 2020 +0100

commit e7d95e7
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Dec 3 08:07:38 2020 +0100

    caching

commit bacb410
Merge: eb1edbd 43363c3
Author: boriskovar-m2ms <boris.kovar@m2ms.sk>
Date:   Wed Dec 2 10:30:25 2020 +0100

    Merge pull request #225 from m2ms/#460

commit 217553c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Dec 2 09:27:35 2020 +0100

    - updated version number

commit 078a39f
Merge: e9c7bb9 f9e532e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Dec 2 09:26:58 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#455' into allfunctionality

commit e9c7bb9
Merge: 9d6f428 d319bf6
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Dec 2 09:25:52 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#433' into allfunctionality

commit f9e532e
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Dec 2 08:05:42 2020 +0100

commit 560b23d
Merge: d3792b8 d319bf6
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Dec 2 06:41:35 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#433' into #455

commit d3792b8
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Dec 1 15:17:33 2020 +0100

commit d319bf6
Merge: 2be6880 156565d
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Dec 1 09:10:46 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#455' into #433

commit 9d6f428
Merge: e84f58d 75bf86d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 1 05:59:38 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#453' into allfunctionality

commit e84f58d
Merge: 156565d 15b0286
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 1 05:57:21 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#460' into allfunctionality

commit 021aaa9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Dec 1 05:53:22 2020 +0100

    - additional fixes

commit 2be6880
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Nov 30 14:52:07 2020 +0100

commit dd83f0f
Merge: 75bf86d c2bf2bf
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Nov 30 14:50:37 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#462' into #433

commit 156565d
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Nov 30 14:47:46 2020 +0100

commit 4631505
Merge: 95ef8f4 2e92f21
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Nov 30 13:52:05 2020 +0100

    Merge remote-tracking branch 'remotes/origin/allfunctionality' into #455

commit 95ef8f4
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Nov 30 13:51:31 2020 +0100

commit c2bf2bf
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Nov 30 06:31:12 2020 +0100

commit 75bf86d
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 27 11:41:03 2020 +0100

commit 2e92f21
Merge: 2d017f2 e0c3756
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 27 09:15:14 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#462' into allfunctionality

commit d7fbad6
Merge: eed82dd e0c3756
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 27 09:07:16 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#462' into #453

commit e0c3756
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 27 08:17:43 2020 +0100

commit c67b599
Merge: 2775d64 54f1539
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Nov 26 15:13:04 2020 +0100

    Merge remote-tracking branch 'remotes/origin/master' into #462

commit 2775d64
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Nov 26 15:11:51 2020 +0100

commit b406141
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Nov 26 14:04:09 2020 +0100

    - partial changes

commit c5d562e
Merge: 799efbb 11539d6
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Nov 26 13:55:23 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#455' into #462

commit 799efbb
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Nov 26 13:48:43 2020 +0100

commit 11539d6
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Nov 26 08:01:32 2020 +0100

commit c64a88a
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Nov 25 19:38:25 2020 +0100

commit 36c1f58
Merge: 4c07a93 54f1539
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Nov 25 14:32:01 2020 +0100

    Merge remote-tracking branch 'remotes/origin/master' into #407

commit 83bdb85
Merge: 36f49fe 6187266
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Nov 25 12:55:33 2020 +0100

    Merge branch '#454' into #455

commit 6187266
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Nov 25 12:52:10 2020 +0100

commit 2d017f2
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Nov 25 06:32:29 2020 +0100

    - updated version number

commit d2423da
Merge: eed82dd 0cb5476
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Nov 25 06:31:32 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#462' into allfunctionality

commit 36f49fe
Merge: efb869e 39da154
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Nov 25 06:22:40 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#453' into #455

commit 0cb5476
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Nov 23 16:11:00 2020 +0100

commit 8cfc6a8
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 20 15:43:17 2020 +0100

commit 0a6e5f7
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 20 14:59:57 2020 +0100

commit eed82dd
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 20 14:21:35 2020 +0100

    - updated version number

commit 39da154
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 20 10:04:23 2020 +0100

commit ea50078
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 20 07:56:12 2020 +0100

    - updated version number

commit ab552c4
Merge: 9fb95ec 5178a7f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 20 07:55:13 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#454' into allfunctionality

commit 5178a7f
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 20 07:42:25 2020 +0100

commit 9fb95ec
Merge: 1d74cef 60e153e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 20 07:19:08 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#456' into allfunctionality

commit efb869e
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Nov 19 13:15:12 2020 +0100

commit 1d74cef
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Nov 19 09:56:05 2020 +0100

    - updated version number

commit f3b3e73
Merge: 417be8f 4b3a052
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Nov 19 09:55:19 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#423' into allfunctionality

commit 417be8f
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Nov 18 14:14:10 2020 +0100

    - updated version number

commit 3c1181c
Merge: 1a4d90c db940e5
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Nov 18 13:54:23 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#454' into allfunctionality

commit 1a4d90c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Nov 18 13:53:42 2020 +0100

    - resolved conflict

commit e7e3f9f
Merge: 3a8363d b519ede
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Nov 18 13:47:56 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#453' into allfunctionality

commit db940e5
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Nov 16 15:22:04 2020 +0100

commit 53207bc
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Nov 16 15:06:55 2020 +0100

commit b519ede
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 13 16:54:23 2020 +0100

commit 5059f57
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 13 14:28:17 2020 +0100

commit 3a8363d
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 13 13:48:23 2020 +0100

    - updated version number

commit e7aaded
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 13 12:51:48 2020 +0100

commit d5ba1e2
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 13 12:46:28 2020 +0100

commit a1929e8
Merge: 23fb842 b1dc90e
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 13 11:39:17 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#423' into allfunctionality

commit 23fb842
Merge: 1274ab0 81f3533
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 13 11:37:46 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#446' into allfunctionality

commit 1274ab0
Merge: 740d42b 35f73e9
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 13 11:37:04 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#429' into allfunctionality

commit 4c07a93
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Fri Nov 13 08:03:07 2020 +0100

    - additional fixes

commit 6469799
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 13 07:24:53 2020 +0100

commit 78156fc
Merge: 50d6c9f 4803b60
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Nov 12 16:47:58 2020 +0100

    Merge remote-tracking branch 'remotes/origin/master' into #453

commit 50d6c9f
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Nov 12 16:17:26 2020 +0100

commit 740d42b
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Nov 10 13:39:50 2020 +0100

    - updated version number

commit a647db8
Merge: 057a6f5 165a485
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Nov 10 13:27:39 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#444' into allfunctionality

commit 057a6f5
Merge: bea0e70 95701a3
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Tue Nov 10 13:27:28 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#451' into allfunctionality

commit 35f73e9
Merge: 080a738 6330cbe
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 6 10:44:26 2020 +0100

    Merge remote-tracking branch 'remotes/origin/#428' into #429

commit 080a738
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 6 10:43:41 2020 +0100

commit 3a9db85
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Nov 6 08:31:44 2020 +0100

commit 15effdf
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Nov 5 16:11:42 2020 +0100

commit 3acf88c
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Thu Nov 5 09:44:11 2020 +0100

    - fixed some bugs after the optimization

commit 383f7e7
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Nov 4 16:34:52 2020 +0100

commit 2f22205
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Wed Oct 28 09:38:03 2020 +0100

    - performance optimization - broken right side

commit 4dd7613
Author: Boris Kovar <boris.kovar@m2ms.sk>
Date:   Mon Oct 26 12:31:02 2020 +0100

    - increased version number

commit 8ee0f83
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Oct 26 10:45:58 2020 +0100

commit 7d7f6bf
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Oct 23 10:42:21 2020 +0200

commit 9dfd6b7
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Thu Oct 22 08:27:09 2020 +0200

commit 6cbbeb7
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Oct 21 09:52:29 2020 +0200

commit 174a35e
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Oct 20 15:31:25 2020 +0200

commit f68cd67
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Oct 20 12:22:25 2020 +0200

commit cce0498
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Tue Oct 20 10:12:32 2020 +0200

commit 1638044
Merge: 0d62099 cbee039
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Oct 19 14:17:43 2020 +0200

    Merge branch 'master' of https://github.com/m2ms/fragalysis-frontend into #407

commit 0d62099
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Mon Oct 19 08:25:44 2020 +0200

commit 90defc1
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Oct 16 15:24:30 2020 +0200

commit 3a429c4
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Fri Oct 16 14:24:58 2020 +0200

commit 014b431
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Oct 14 16:32:06 2020 +0200

commit 9cc7ef7
Merge: 6d4b9a4 e5181c4
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Oct 14 06:28:32 2020 +0200

    Merge branch 'master' of https://github.com/m2ms/fragalysis-frontend into #407

commit 6d4b9a4
Author: Adriána Kohanová <adriana.kohanova@m2ms.sk>
Date:   Wed Oct 14 06:24:34 2020 +0200

.gitignore

@@ -8,3 +8,4 @@ npm-debug.log
 *.offsets
 yarn-error.log
 /yarn.lock
+/debug.log

docker-compose.dev.vector.yml

@@ -0,0 +1,64 @@
+version: '3'
+
+services:
+  database:
+    image: postgres:12.2
+    volumes:
+      - ../data/postgre/data:/var/lib/postgresql
+    environment:
+      POSTGRES_PASSWORD: fragalysis
+      POSTGRES_USER: fragalysis
+      POSTGRES_DB: frag
+      PGDATA: /var/lib/postgresql/data/pgdata
+    ports:
+    - "5432:5432"
+  graph:
+    container_name: neo4j
+    image: informaticsmatters/fragnet-test:3.5.25-xchem-combi-sample-2021-02
+    ports:
+# Comment these two out in produciton
+      - "7474:7474"
+      - "7687:7687"
+    ulimits:
+      nofile:
+        soft: 40000
+        hard: 40000
+    environment:
+      GRAPH_PASSWORD: test123
+      CYPHER_PRE_NEO4J_SLEEP: 0
+      NEO4J_dbms_memory_pagecache_size: 4G
+  web:
+    container_name: web_dock
+    image: xchem/fragalysis-stack:latest
+    command: /bin/bash /code/launch-stack.sh
+    volumes:
+      - ../data/logs:/code/logs/
+      - ../data/media:/code/media/
+      - ../fragalysis-frontend:/code/frontend
+    ports:
+      - "8080:80"
+    environment:
+      POSTGRESQL_DATABASE: frag
+      POSTGRESQL_USER: fragalysis
+      POSTGRESQL_PASSWORD: fragalysis
+      POSTGRESQL_HOST: database
+      POSTGRESQL_PORT: 5432
+      NEO4J_AUTH: neo4j/test123
+    depends_on:
+      - database
+      - graph
+  loader:
+    container_name: loader
+    image: loader:latest
+    volumes:
+      - ../data/input:/fragalysis
+      - ../data/media:/code/media
+    environment:
+      POSTGRESQL_DATABASE: frag
+      POSTGRESQL_USER: fragalysis
+      POSTGRESQL_PASSWORD: fragalysis
+      POSTGRESQL_HOST: database
+      POSTGRESQL_PORT: 5432
+      DATA_ORIGIN: EXAMPLE
+    depends_on:
+      - database