Filip Bucek
2073f4ae35
Merge branch 'ci-full-build' into 'master'
...
ci: perform full build ( not incremental - problems )
See merge request spaceti-app/integrations/acs/colnod-connector!20
2019-11-20 08:49:40 +00:00
Filip Bucek
5bff3ce9f3
ci: perform full build ( not incremental - problems )
2019-11-20 09:33:37 +01:00
Ondřej Fischer
ccb74554e4
Merge branch 'fix-ssl' into 'master'
...
Fix ssl
See merge request spaceti-app/integrations/acs/colnod-connector!19
2019-11-12 15:28:25 +00:00
Ondřej Fischer
2af740a1f5
fix
2019-11-12 16:23:08 +01:00
Ondřej Fischer
f62563a7ff
ignore ssl errors
2019-11-12 16:20:56 +01:00
Ondřej Fischer
7c49c7a1ec
Merge branch 'diffrent-format-of-input' into 'master'
...
Diffrent format of input
See merge request spaceti-app/integrations/acs/colnod-connector!18
2019-11-11 16:28:35 +00:00
Ondřej Fischer
b316e39e21
fix end line
2019-11-11 17:25:39 +01:00
Ondřej Fischer
a7617762f7
Change functionality for input with only important data
2019-11-11 17:13:32 +01:00
Filip Bucek
e34aaeb2a6
updating server-sdk to work without SDK_ROOT path and other defines
2019-11-11 10:36:35 +01:00
Filip Bucek
3c321fbdec
updating ci
2019-11-08 18:33:47 +01:00
Filip Bucek
4ded4f943c
updating ci
2019-11-08 18:29:15 +01:00
Filip Bucek
7f903b601b
updating ci
2019-11-08 18:21:59 +01:00
Filip Bucek
7c0c2c99cd
Merge branch 'server-sdk' into 'master'
...
Server sdk
See merge request spaceti-app/integrations/acs/colnod-connector!17
2019-11-08 17:07:15 +00:00
Filip Bucek
22080cb83b
updating ci
2019-11-08 17:59:11 +01:00
Filip Bucek
71d66a74fd
updating ci
2019-11-08 17:58:01 +01:00
Filip Bucek
be0e0d4d37
returning back to using 'cache'
2019-11-08 17:43:44 +01:00
Filip Bucek
9c9279b7c9
Merge branch 'server-sdk' into 'master'
...
switch to vm due to problem when switching from different gitlab runners on different machine
See merge request spaceti-app/integrations/acs/colnod-connector!16
2019-11-08 16:39:26 +00:00
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
