1118 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
Patrick Jentsch	33e9e40c61	new names	2020-04-09 08:18:04 +02:00
Patrick Jentsch	0f28b6296d	Remove hardcoded values	2020-04-09 07:57:52 +02:00
Patrick Jentsch	5069c5facd	removed variables again	2020-04-08 17:40:56 +02:00
Patrick Jentsch	6bbe0129b4	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-08 17:21:49 +02:00
Patrick Jentsch	f27d56ac6b	Remove stuff and add variables	2020-04-08 17:21:42 +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