279 Commits

Author SHA1 Message Date
Filip Bucek
a0c36627a2 switch to vm due to problem when switching from different gitlab runners on different machine
e.g. from hw to vm machnie
2019-11-08 17:35:32 +01:00
Filip Bucek
ce7c676c31 Merge branch 'server-sdk' into 'master'
updating server-sdk

See merge request spaceti-app/integrations/acs/colnod-connector!15
2019-11-08 16:28:34 +00:00
Filip Bucek
8f5729ca0d updating server-sdk 2019-11-08 17:25:20 +01:00
Filip Bucek
89849a0fe8 Merge branch 'server-sdk' into 'master'
Server sdk

See merge request spaceti-app/integrations/acs/colnod-connector!14
2019-11-08 15:36:38 +00:00
Filip Bucek
cc7dafa0be updating tests 2019-11-08 16:33:17 +01:00
Filip Bucek
66b05793b9 updating server-sdk 2019-11-08 16:11:25 +01:00
Filip Bucek
2a44cdf777 using arftifacts instead of cache 2019-11-08 16:09:40 +01:00
Filip Bucek
05d64ad28a Merge branch 'server-sdk' into 'master'
updating to latest server-sdk

See merge request spaceti-app/integrations/acs/colnod-connector!13
2019-11-08 14:55:10 +00:00
Filip Bucek
f1cfd62abd updating server-sdk 2019-11-08 15:49:01 +01:00
Filip Bucek
2f5d8c77a6 Merge branch 'fix/name-update' into 'master'
Fix/name update

See merge request spaceti-app/integrations/acs/colnod-connector!12
2019-11-08 14:44:55 +00:00
Filip Bucek
3023c7480a updated name 2019-11-08 15:42:32 +01:00
Filip Bucek
aa79df7aa0 Merge branch 'server-sdk' into 'master'
server sdk

See merge request spaceti-app/integrations/acs/colnod-connector!11
2019-11-08 10:42:16 +00:00
Filip Bucek
2d03f742bb Merge branch 'master' into test-lineending
# Conflicts:
#	src/app/app.pro
#	src/colnod/colnod.pri
#	src/colnod/databasemanager.cpp
#	src/colnod/databasemanager.h
#	src/colnod/datamanager.cpp
#	src/colnod/datamanager.h
#	src/colnod/entity.h
#	src/colnod/requestmanager.cpp
#	src/colnod/subject.h
#	src/colnod/syncmanager.h
#	src/colnod/token.h
#	test/unitTests/unitTests.pro
2019-11-08 11:29:40 +01:00
Filip Bucek
8bb1bbd125 fixing line endings 2019-11-08 11:26:34 +01:00
Filip Bucek
29531e5f5d using fixed server-sdk 2019-11-08 11:16:07 +01:00
Filip Bucek
fcdf5abf5d fixing path 2019-11-08 11:12:03 +01:00
Filip Bucek
88fba3aab3 updated sever-sdk + added check lineendings 2019-11-08 11:07:52 +01:00
Ondřej Fischer
c9a311d4aa Merge branch 'make-all-files-LF' into 'master'
Change all files to LF

See merge request spaceti-app/integrations/acs/colnod-connector!10
2019-11-08 09:54:14 +00:00
Ondřej Fischer
77c749c20b Change all files to LF 2019-11-08 10:51:31 +01:00
Ondřej Fischer
9354726740 fix IP address of DB 2019-11-08 09:00:43 +00:00
Filip Bucek
8e4968ebac added missing logger.h 2019-11-07 17:20:50 +01:00
Filip Bucek
ab41e47f1e Merge branch 'master' into server-sdk
# Conflicts:
#	src/colnod/databasemanager.h
#	src/colnod/datamanager.cpp
#	src/colnod/syncmanager.cpp
2019-11-07 17:16:24 +01:00
Filip Bucek
e20b66f529 cppcheck: fixing warnings 2019-11-07 17:08:27 +01:00
Filip Bucek
88a0f842df must be compiled in order
CONFIG += ordered
2019-11-07 16:59:09 +01:00
Filip Bucek
98873562a5 WIP: trying to use server-sdk 2019-11-07 16:55:55 +01:00
Ondřej Fischer
25b1a0ee0c Merge branch 'fix-unit-tests' into 'master'
Fix unit tests

See merge request spaceti-app/integrations/acs/colnod-connector!9
2019-11-07 13:57:37 +00:00
Ondřej Fischer
f53b82de9b update readme 2019-11-07 14:54:43 +01:00
Ondřej Fischer
a4f20f1c29 better way of handling error 2019-11-07 13:49:37 +01:00
Ondřej Fischer
a324e390ae fix login test 2019-11-07 12:57:27 +01:00
Ondřej Fischer
b914b1c11d added staff to handle initialization error 2019-11-07 12:49:02 +01:00
Filip Bucek
dbe60c60ee adding submodule 'server-sdk' 2019-11-07 10:22:30 +01:00
Ondřej Fischer
811345c301 fix memory leaks 2019-11-07 09:54:22 +01:00
Ondřej Fischer
bd6b1f4224 fix 2019-11-07 08:22:19 +00:00
Ondřej Fischer
14cdb47fd8 Merge branch 'sync' into 'master'
Sync DB and Colnod

See merge request spaceti-app/integrations/acs/colnod-connector!8
2019-11-07 08:16:06 +00:00
Ondřej Fischer
c945bccafa repair 2019-11-07 09:13:25 +01:00
Ondřej Fischer
a5e4e89c01 Merge branch 'master' into 'sync'
# Conflicts:
#   src/colnod/requestmanager.cpp
#   test/unitTests/complextest.cpp
#   test/unitTests/complextest.h
2019-11-07 08:03:18 +00:00
Ondřej Fischer
3a09a291da change tests 2019-11-06 17:13:42 +01:00
Ondřej Fischer
33e0c42eac Clang-tidy and Clanzy 2019-11-06 16:56:16 +01:00
Ondřej Fischer
8e21275b6a Fix code formating 2019-11-06 16:48:53 +01:00
Ondřej Fischer
8364523839 Fixed bugs, first working version 2019-11-06 16:46:49 +01:00
Filip Bucek
c0a016f87b added another script to describe BUG with getTokensDeleted 2019-11-05 11:49:40 +01:00
Ondřej Fischer
39205695b3 edit for more readability 2019-11-05 11:48:12 +01:00
Ondřej Fischer
44da045e29 Update bug script 2019-11-05 11:05:15 +01:00
Ondřej Fischer
4cc0b0e2c6 script for representation api bug 2019-11-04 17:24:57 +01:00
Ondřej Fischer
8f16ac06a6 Fix memory leaks and add error handling 2019-11-04 11:07:11 +01:00
Ondřej Fischer
8d6dc6714c Change time of deleting to time of sync begin 2019-10-30 15:59:30 +01:00
Ondřej Fischer
31183087c2 Logs to db first version 2019-10-30 14:31:10 +01:00
Ondřej Fischer
ba1315d1da Working on logs 2019-10-30 13:59:41 +01:00
Ondřej Fischer
a55a6f6b93 Add logger class 2019-10-29 15:59:21 +01:00
Ondřej Fischer
921fc2cb77 add dry mode, compare '>' for tokens doesnt work correctly 2019-10-24 15:56:53 +02:00