1090 Commits

Author	SHA1	Message	Date
Stephan Porada	1c27c0a36c	uncomment log messages	2020-04-23 12:10:36 +02:00
Stephan Porada	d9353e3d7d	Clean up	2020-04-23 12:07:08 +02:00
Stephan Porada	191f197b6c	clean up	2020-04-23 11:21:20 +02:00
Stephan Porada	7efb16246f	Clean up and better text break in amtch context	2020-04-23 11:18:50 +02:00
Stephan Porada	a1439f37d7	Set callbac kfor match_context	2020-04-23 10:37:44 +02:00
Patrick Jentsch	bbcf5c5312	Add some documentation	2020-04-23 09:40:43 +02:00
Patrick Jentsch	3a989534cf	Make the app arg in @background functions a bit less magical	2020-04-23 08:35:18 +02:00
Patrick Jentsch	83c05d93b0	Make delete user function a background task	2020-04-23 08:24:11 +02:00
Patrick Jentsch	edc0b34032	Process corpus files in task, not in database model	2020-04-23 07:56:23 +02:00
Patrick Jentsch	bb8a542eed	Small fixes	2020-04-22 09:29:45 +02:00
Patrick Jentsch	60cc93a806	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-21 18:34:27 +02:00
Patrick Jentsch	bc27744946	Create and use a decorator for background functions	2020-04-21 18:34:21 +02:00
Stephan Porada	beba4c1558	Fix expert mode automatic activation	2020-04-21 10:45:40 +02:00
Stephan Porada	c7f7036306	Visual fix	2020-04-21 10:41:08 +02:00
Stephan Porada	a3c049c4ed	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-21 10:31:40 +02:00
Stephan Porada	ddc7859002	Some visual stuff	2020-04-21 10:31:34 +02:00
Patrick Jentsch	79c9ca97b2	Fix Typos	2020-04-21 10:28:04 +02:00
Patrick Jentsch	29f1be5c80	Delete functions should not throw an error, if the ressource does not exists. -> Consider it as deleted if does not exist	2020-04-21 10:27:42 +02:00
Patrick Jentsch	e83c762551	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-21 10:26:49 +02:00
Patrick Jentsch	461f80be20	Change email function names	2020-04-21 10:26:44 +02:00
Stephan Porada	78f93a884b	Move down from 100 to 50 words lr context	2020-04-20 15:09:08 +02:00
Patrick Jentsch	d16e749ee7	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-20 14:24:41 +02:00
Patrick Jentsch	7dd27fb007	Change some email settings. MAIL_DEFAULT_SENDER removed.	2020-04-20 14:24:36 +02:00
Stephan Porada	b4c98a9713	Last fix	2020-04-20 13:59:28 +02:00
Stephan Porada	986336618b	Add fix	2020-04-20 13:55:11 +02:00
Stephan Porada	f7dc83f51d	Disable export in inspect modal	2020-04-20 13:49:59 +02:00
Stephan Porada	80c049ae06	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-20 13:48:44 +02:00
Stephan Porada	6126477825	Finalize inspect view display options	2020-04-20 13:48:40 +02:00
Patrick Jentsch	8a9db7f4b8	Add validation flag if field is required.	2020-04-20 11:12:20 +02:00
Stephan Porada	2eb3d2f03e	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-20 09:59:34 +02:00
Patrick Jentsch	188aeae88f	Fix wrong macro usage.	2020-04-17 19:50:21 +02:00
Patrick Jentsch	5fa1ba385b	Update	2020-04-17 16:00:40 +02:00
Patrick Jentsch	b9ebb64fcc	Change macro names	2020-04-17 11:13:11 +02:00
Patrick Jentsch	1f0a87a474	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-17 11:07:47 +02:00
Patrick Jentsch	3aafe664a3	Add macros and use them	2020-04-17 11:04:09 +02:00
Stephan Porada	9145265e4b	Add expert mode and higlight sentences switch to inspect. WIP	2020-04-16 15:06:03 +02:00
Stephan Porada	fe26c56344	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-16 13:49:24 +02:00
Stephan Porada	1567e6e134	Filx text break	2020-04-16 13:49:21 +02:00
Patrick Jentsch	23ffbe5f6b	Fix link after service renaming (file-setup)	2020-04-16 13:48:31 +02:00
Patrick Jentsch	6177093a51	Set characters according to metadata label	2020-04-16 13:47:52 +02:00
Patrick Jentsch	72e585395b	status update handling for corpus list	2020-04-16 13:28:09 +02:00
Patrick Jentsch	f356d4bb89	Naming...	2020-04-16 10:21:22 +02:00
Patrick Jentsch	8cec7b2d3a	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-16 09:40:45 +02:00
Patrick Jentsch	fede774196	Change nopaque upload forms. Add corpus file form has an upload progress bar now.	2020-04-16 09:40:38 +02:00
Stephan Porada	bcd431da22	fix	2020-04-15 15:22:48 +02:00
Stephan Porada	4992ac73a8	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-15 15:11:31 +02:00
Stephan Porada	8b27ddf5d2	fix	2020-04-15 15:11:25 +02:00
Patrick Jentsch	20d4d1c0b3	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-15 14:57:19 +02:00
Patrick Jentsch	f264b27ae5	Change validation process (currently broken)	2020-04-15 14:57:17 +02:00
Stephan Porada	68eb1d1972	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-15 14:55:36 +02:00
Stephan Porada	9031ca5845	New context options	2020-04-15 14:55:29 +02:00
Patrick Jentsch	b1d819444e	corpus page: Only show compile buttons if corpus is unprepared AND has files.	2020-04-15 14:30:41 +02:00
Patrick Jentsch	b251f9993d	Add message if corpus is empty	2020-04-15 12:49:26 +02:00
Patrick Jentsch	bbccbcfcd2	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-15 10:32:27 +02:00
Patrick Jentsch	338e760bfb	Hide analyze button if corpus is not ready for this	2020-04-15 10:32:21 +02:00
Stephan Porada	34e8d952b6	Add match context display options	2020-04-14 15:51:26 +02:00
Stephan Porada	9578a12f42	Fix match_count in resultsJSON	2020-04-14 12:46:33 +02:00
Stephan Porada	518d16d189	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-14 11:33:56 +02:00
Stephan Porada	514baf0f5e	New expert mode	2020-04-14 11:31:57 +02:00
Patrick Jentsch	7c8ae161a9	Fix context size and codestyle	2020-04-14 09:51:33 +02:00
Patrick Jentsch	9a1efbe5f3	corpus logic	2020-04-09 15:14:39 +02:00
Patrick Jentsch	860e99dfcb	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-09 14:50:26 +02:00
Patrick Jentsch	b274fd1d20	Change some logic for showing/hiding buttons	2020-04-09 14:50:20 +02:00
Stephan Porada	f19f67614d	Remove cascade plus new tooltip creation and destruction (a bit buggy)	2020-04-09 14:49:17 +02:00
Stephan Porada	ca333e29ee	Some fixes and clean up	2020-04-09 10:17:04 +02:00
Patrick Jentsch	24cc8975a9	More fixes	2020-04-09 10:03:55 +02:00
Patrick Jentsch	faf3d01626	Fixes after renaming	2020-04-09 10:02:24 +02:00
Patrick Jentsch	341b53f0a1	Rename file setup service	2020-04-09 09:53:56 +02:00
Stephan Porada	f69a401db6	Clean up and stuff	2020-04-08 11:37:34 +02:00
Stephan Porada	d5d0ffe7ea	sort and clean variables	2020-04-08 09:57:18 +02:00
Stephan Porada	b0104fe606	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-08 09:46:38 +02:00
Stephan Porada	0146a92f6d	reverse array	2020-04-08 09:46:37 +02:00
Patrick Jentsch	ca833c966a	fixes and doc	2020-04-07 16:36:27 +02:00
Patrick Jentsch	08dba25de3	fix	2020-04-07 16:30:27 +02:00
Patrick Jentsch	a1cdfd498a	Remove wrapper	2020-04-07 16:27:28 +02:00
Patrick Jentsch	83a607728d	cqi package update and changes to match the new functions	2020-04-07 16:25:44 +02:00
Stephan Porada	90ef828e61	Make analyse OOP style	2020-04-07 13:13:48 +02:00
Stephan Porada	6260f2436a	Remove some useless loading animations	2020-04-07 09:53:17 +02:00
Stephan Porada	49dc7c4cdb	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-06 15:29:04 +02:00
Stephan Porada	69b17f350e	Remove all pjs!	2020-04-06 15:28:58 +02:00
Stephan Porada	961027a8f7	Add global prgress for inspect activation	2020-04-06 15:27:25 +02:00
Patrick Jentsch	606c4dee85	CQi updates	2020-04-06 14:53:50 +02:00
Stephan Porada	b78558fc03	Fix script import	2020-04-06 14:37:38 +02:00
Stephan Porada	2aca966d13	Fix wrong expert mode check	2020-04-06 14:35:57 +02:00
Stephan Porada	99e82a1cc3	Rename pj_analyse_corpus.js to analyse_corpus.js	2020-04-06 14:33:58 +02:00
Stephan Porada	52efa0e821	Remove old analyse_corpus.js	2020-04-06 14:33:26 +02:00
Stephan Porada	a09f3d79a8	Rename pj_analyse_corpus.html.j2 to analyse_corpus_analyse.html.j2	2020-04-06 14:28:20 +02:00
Stephan Porada	0ffcf972ca	Remove old analysis template	2020-04-06 14:27:38 +02:00
Stephan Porada	9ec1b596f8	Remove pj_	2020-04-06 14:27:14 +02:00
Stephan Porada	19aee30b1b	remove wrong inits	2020-04-06 14:18:48 +02:00
Stephan Porada	a6bcfe51b1	Rename pj_views|events|forms to views, events, forms	2020-04-06 14:16:59 +02:00
Stephan Porada	85abf7748d	Delete old events	2020-04-06 14:13:45 +02:00
Stephan Porada	a6855797d5	Update new view	2020-04-06 14:12:22 +02:00
Stephan Porada	e0df6a9eca	Delete old views	2020-04-06 14:12:15 +02:00
Stephan Porada	66a2fcdb34	update new forms	2020-04-06 14:09:41 +02:00
Stephan Porada	e6efb042c3	Delete old form	2020-04-06 14:09:33 +02:00
Stephan Porada	e7bed7dee1	Add comment	2020-04-06 14:09:12 +02:00
Stephan Porada	1ed696f558	Fix 2	2020-04-06 12:52:26 +02:00
Stephan Porada	41f24a03b4	Fix	2020-04-06 12:41:23 +02:00
Stephan Porada	12586bb13d	First feature complete rebuilt of analysis interface	2020-04-06 12:32:29 +02:00
Patrick Jentsch	38e1408e01	quick fix	2020-04-06 12:01:36 +02:00
Patrick Jentsch	9dace02378	Fix missing icon after renaming setup_files to file_setup	2020-04-06 10:04:54 +02:00
Patrick Jentsch	2896f94e8d	Add changes for new file_setup Pipeline	2020-04-03 18:49:45 +02:00
Patrick Jentsch	9da08508c0	Add changes for new OCR and NLP Pipelines	2020-04-03 17:36:38 +02:00
Patrick Jentsch	498defa386	Fix	2020-04-02 14:45:02 +02:00
Stephan Porada	2c93f02c11	Update	2020-04-02 14:22:03 +02:00
Stephan Porada	bface71503	use ranges	2020-04-02 11:38:27 +02:00
Stephan Porada	e14f7a517b	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-02 11:37:53 +02:00
Stephan Porada	89891da663	handle result ranges	2020-04-02 11:37:45 +02:00
Patrick Jentsch	848bc90b0c	Bugfix	2020-04-02 10:43:01 +02:00
Patrick Jentsch	b8a086f389	Set list/range flag in events.py instead of the export function	2020-04-02 10:36:59 +02:00
Patrick Jentsch	452fb37b99	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-02 10:14:49 +02:00
Patrick Jentsch	6a5621b753	Add Flag to indicate if cpos lists are saved as ranges or lists.	2020-04-02 10:14:43 +02:00
Stephan Porada	fb1403e9cb	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-01 15:58:26 +02:00
Patrick Jentsch	bfd7591f4d	add comment	2020-04-01 14:27:01 +02:00
Patrick Jentsch	37526a6b43	Use expanded List	2020-04-01 14:25:49 +02:00
Stephan Porada	8c83bb87a5	Fix to 3.1	2020-04-01 13:49:28 +02:00
Stephan Porada	46b82f5737	Corpus analysis version 3.0 lul	2020-04-01 13:44:06 +02:00
Stephan Porada	90cf1bf8a0	Fix	2020-03-31 10:27:26 +02:00
Stephan Porada	0d40f04bdd	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-31 10:19:44 +02:00
Stephan Porada	c33889f617	Enhance pj_analyse	2020-03-31 10:17:04 +02:00
Patrick Jentsch	9ced65f34c	Force socketio to use websockets	2020-03-30 17:27:24 +02:00
Patrick Jentsch	f605430bf8	Show progress bar after new query	2020-03-30 10:47:36 +02:00
Patrick Jentsch	4556a52ffc	Abort transmission after disconnect	2020-03-30 09:01:40 +02:00
Patrick Jentsch	0be0e12aee	add simple status check	2020-03-30 08:36:55 +02:00
Patrick Jentsch	6e3579b33f	Update	2020-03-29 20:54:51 +02:00
Patrick Jentsch	4ff372de77	small updates	2020-03-29 20:33:00 +02:00
Patrick Jentsch	d07b73781f	Update	2020-03-29 19:40:29 +02:00
Patrick Jentsch	f7692102a5	Update	2020-03-29 12:38:24 +02:00
Patrick Jentsch	2db9677659	Make it work again	2020-03-28 20:45:33 +01:00
Patrick Jentsch	e3fde2d5c9	compatibility fixes and add reimplementations	2020-03-28 19:29:19 +01:00
Patrick Jentsch	970d7024e0	Wrap socket usage in DOMContentLoaded eventlistener	2020-03-28 11:57:12 +01:00
Patrick Jentsch	a51394dddd	Update cqi package	2020-03-28 11:56:01 +01:00
Patrick Jentsch	97fb8ded9a	fix	2020-03-27 12:52:17 +01:00
Patrick Jentsch	4294c2854b	Make inner package imports relative	2020-03-27 12:06:11 +01:00
Patrick Jentsch	3bbe45d015	remove legacy code	2020-03-27 10:32:33 +01:00
Patrick Jentsch	3ea1f4bd9f	Rename nopaque.toast to nopaque.flash which offers styling by categories	2020-03-27 10:32:14 +01:00
Patrick Jentsch	b0c2415f55	Codestyle++	2020-03-27 10:13:42 +01:00
Patrick Jentsch	ca8d438e79	Change how flashed messages are processed	2020-03-27 10:11:19 +01:00
Patrick Jentsch	4af7d8d4ba	Update darkreader	2020-03-27 10:10:49 +01:00
Patrick Jentsch	8bedbfeae5	Use slim socketio again (this time with .map file) change socket behavior	2020-03-26 17:32:26 +01:00
Patrick Jentsch	eba6af3b1e	Replace the default function decorators with new socketio specific ones	2020-03-26 16:14:09 +01:00
Stephan Porada	257600a2a8	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-26 15:28:36 +01:00
Stephan Porada	08e7df4ad3	Add function to resend queries during running query	2020-03-26 15:28:11 +01:00
Patrick Jentsch	0db99e33fe	Update cqi package	2020-03-25 15:39:32 +01:00
Stephan Porada	6b24184206	remove logger warnings	2020-03-23 13:03:40 +01:00
Stephan Porada	16b1733ec5	remove logger	2020-03-23 12:16:41 +01:00
Stephan Porada	ac14bedc62	Add neww result recieving	2020-03-23 12:14:32 +01:00
Patrick Jentsch	94e71b41df	fix empty matches error	2020-03-23 11:24:39 +01:00
Patrick Jentsch	e99053e3cf	rename	2020-03-23 11:18:27 +01:00
Patrick Jentsch	303ea166d2	fix num matches	2020-03-23 11:17:37 +01:00
Patrick Jentsch	e13ed86d29	new style	2020-03-23 10:28:07 +01:00
Patrick Jentsch	acfcc0321b	Add package implementation of cqi	2020-03-23 09:10:35 +01:00
Patrick Jentsch	7752e7fb57	Add changes from cqiclient repository	2020-03-20 15:12:19 +01:00
Stephan Porada	7c9b9f0712	Code clean up	2020-03-19 13:59:31 +01:00
Stephan Porada	25f54f1119	Add some documentation strings	2020-03-19 12:35:30 +01:00
Stephan Porada	8a6eb04dbe	Easy fix	2020-03-19 12:04:14 +01:00
Stephan Porada	7de4b391df	Fix inspect activation on queryFinished	2020-03-19 11:04:36 +01:00
Stephan Porada	ebe598312f	Add info tool tip	2020-03-19 10:25:09 +01:00
Stephan Porada	8147dc404a	Inspect now only works when queryFinished is true	2020-03-19 09:25:23 +01:00
Stephan Porada	b12c9f85d1	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-18 15:52:57 +01:00
Stephan Porada	3111cc5175	Clean up corpus analysis and add new features	2020-03-18 15:52:53 +01:00
Patrick Jentsch	4c67777977	Add privacy	2020-03-18 14:44:15 +01:00
Stephan Porada	c5e56692b1	First analys_corpus clean up	2020-03-17 14:00:41 +01:00
Stephan Porada	c416d64a4c	some comment changes	2020-03-17 10:47:52 +01:00
Patrick Jentsch	6414ab36bf	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-16 16:25:12 +01:00
Patrick Jentsch	63600c1301	Remove debug messages.	2020-03-16 16:25:08 +01:00
Stephan Porada	f8d3300e42	Apply context size on first load	2020-03-16 15:57:06 +01:00
Patrick Jentsch	37d2e8f38e	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-16 13:15:25 +01:00
Patrick Jentsch	b8437735b4	Defensive programming inc	2020-03-16 13:15:13 +01:00
Stephan Porada	0c7620b438	add white section	2020-03-16 12:27:07 +01:00
Stephan Porada	e0e2fe017c	Fix typo	2020-03-16 11:21:58 +01:00
stephan	5b9c1c3adf	Add context change toast.	2020-03-12 15:09:27 +01:00
stephan	6bdc0b354b	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-12 14:49:03 +01:00
stephan	5c134dd8c5	Add interaactive context change	2020-03-12 14:48:58 +01:00
Patrick Jentsch	b6ffad1ae4	use variable instead of magic number	2020-03-12 14:18:38 +01:00
Patrick Jentsch	f4ac584668	Update	2020-03-12 14:18:07 +01:00
Patrick Jentsch	bcbb67b707	Remove debug log	2020-03-12 14:16:47 +01:00
Patrick Jentsch	e5e77d7dc2	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-12 14:13:11 +01:00
Patrick Jentsch	416c724f70	Simplify	2020-03-12 14:13:07 +01:00
stephan	db7ccb2b11	important fix!	2020-03-12 10:34:40 +01:00
stephan	7d37f802b1	Hide prepare button	2020-03-11 15:51:55 +01:00
Patrick Jentsch	fa7d2da973	Update	2020-03-11 14:48:48 +01:00
Patrick Jentsch	cedc1f11e3	Update	2020-03-11 13:34:09 +01:00
Patrick Jentsch	e881401a10	Update CQi stuff	2020-03-10 16:06:47 +01:00
Patrick Jentsch	467080c7f8	Update UI	2020-03-07 20:20:58 +01:00
stephan	607fb016df	poster 3	2020-03-02 16:10:42 +01:00
Patrick Jentsch	957d4a513c	Update poster	2020-03-02 16:00:58 +01:00
stephan	90022d25d2	Poster 2	2020-03-02 15:45:37 +01:00
stephan	6a509646e7	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-02 15:31:36 +01:00
stephan	2c78de1eb9	psoter	2020-03-02 15:31:31 +01:00
Patrick Jentsch	dfd7e556d2	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-02 14:57:17 +01:00
Patrick Jentsch	fb0ca7e759	Fix job form error message generation	2020-03-02 14:57:12 +01:00
stephan	6318c753b2	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-02 14:19:57 +01:00
stephan	c6f522a776	new layout	2020-03-02 14:19:54 +01:00
Patrick Jentsch	55a86a60f3	disable notifications for now	2020-03-02 14:15:50 +01:00
Patrick Jentsch	9912017d78	csrf token immediatly after form tag	2020-03-02 14:13:32 +01:00
Patrick Jentsch	98155e5d25	Update	2020-03-02 14:08:49 +01:00
Patrick Jentsch	02177ed859	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-03-02 14:05:34 +01:00
Patrick Jentsch	d08014dbbe	First implementation of a feedback formular	2020-03-02 14:05:31 +01:00