marko.ferme
f2bdf3d9f6
Merge remote-tracking branch 'origin/main'
...
Merge popravkov vrste in celega brancha z definicijami, kanonizirano obliko ter kodo ijs-ja
2023-01-10 12:00:54 +01:00
marko.ferme
69a92a3420
Working fix pre merge
2023-01-10 11:20:14 +01:00
Marko Ferme
1cd7663d49
Main brez modelov
2022-12-07 06:22:36 +01:00
Kikimanox
7b7214905a
Updated so json doesn't get sorted anymore, bugfixes, added new parameter to two endpoints, docker-compose jobs saving location update, json & swagger update
2022-11-03 15:58:11 +01:00
Marko Ferme
107e5fd4d3
Dodani popravki za iskanje kandidatov in števila besedil. Dodana logika za klicanje ocrja. Popravljen bug za timeout v ateapi-ju. Popravljen swager.
2022-10-19 04:07:15 +02:00
Marko Ferme
8ffa85cd76
mariadb update
2022-10-18 19:58:04 +02:00
Marko Ferme
abf79be4c8
tika update
2022-10-18 12:26:16 +02:00
Kikimanox
5833dfafc8
Preperation for merging multiple conllus, also added ATE files
2022-10-18 10:07:01 +02:00
Kikimanox
63099da8c9
reverting most useless attempts at trying to make this work
2022-08-31 18:34:51 +02:00
Kikimanox
8bd8567b98
running out of ideas what to do
2022-08-31 18:30:49 +02:00
Kikimanox
3e450b9d41
forgot to remove dot
2022-08-31 18:00:53 +02:00
Kikimanox
c4558242e1
time to try running it without docker instead
2022-08-31 18:00:44 +02:00
Kikimanox
3415d790d6
.
2022-08-31 17:52:43 +02:00
Kikimanox
ffbb292289
reverted all workarounds that didn't work
2022-08-31 17:44:03 +02:00
Kikimanox
7d4aceb457
reverted attempted workarounds back to initial state
2022-08-31 17:39:46 +02:00
Kikimanox
08711f38f9
maybe this?
2022-08-31 17:33:09 +02:00
Kikimanox
cf8e217c82
Will this workaround maybe work on the server?
2022-08-31 17:27:19 +02:00
Kikimanox
55ea46397f
maybe this will work, because it works locally...
2022-08-31 16:33:40 +02:00
Kikimanox
0561fd03af
changed the way tika runs in docker-compose.yml, port 9998 already taken on the server currently
2022-08-31 16:20:04 +02:00
Kikimanox
a8319072f8
Trying to figure out how to run this without messing up Ivan's Tika instance
2022-08-31 15:52:54 +02:00
Kikimanox
f28fa109fa
forgot to remove dot
2022-08-31 15:42:27 +02:00
Kikimanox
500e5aa2a5
Different tika port since 9998 is already in use
2022-08-31 15:42:19 +02:00
Marko Ferme
5a87193490
Hitri popravki in navodila
2022-08-31 06:52:47 +02:00
Kikimanox
1f2c9161fb
will this workaround work....?
2022-08-29 16:36:07 +02:00
Kikimanox
44222fea39
typo
2022-08-29 15:32:39 +02:00
Kikimanox
796fca551a
more server specific paths
2022-08-29 15:26:12 +02:00
Kikimanox
15fc2e0f62
fixed docker specific paths so that everything works...
2022-08-29 15:20:21 +02:00
Kikimanox
748db5ad0f
nl
2022-08-29 14:26:02 +02:00
Kristjan Žagar
b78e657266
Docker-compose update
2022-07-08 16:25:28 +02:00
Kristjan Žagar
c8e4f7da17
- Popravljena swagger definicija in json (/oznaciBesedilo ni delal)
...
- Dodani resourci za classlo
- Priprava util-ov za podatkovno bazo (se v zelo surovem stanju)
- Dodan docker-compose, ki bo potreben za nadaljni development
- Popravilejni controllerji
2022-07-08 15:54:52 +02:00
marko.ferme
Kikimanox
Kristjan Žagar