1581 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Stephan Porada	5867871de2	Remove spaces	2020-07-03 14:46:04 +02:00
Stephan Porada	3080443a81	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-07-03 14:42:04 +02:00
Stephan Porada	1811623583	Add function to import exported results and view them after the import	2020-07-03 14:41:57 +02:00
Patrick Jentsch	c9cb52279b	Add terms of use	2020-07-03 11:17:47 +02:00
Patrick Jentsch	20adc1af34	change some documentation.	2020-07-02 12:01:40 +02:00
Patrick Jentsch	5addc9c28a	remove obsolete flag	2020-07-02 11:50:14 +02:00
Patrick Jentsch	6c9e9dfb57	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-07-01 08:44:23 +02:00
Patrick Jentsch	527857f6f6	Hide progress spinner if a job failed.	2020-07-01 08:44:19 +02:00
Stephan Porada	a997fbe0ee	Fix for the previous fix	2020-06-30 15:15:06 +02:00
Stephan Porada	c6704f3554	Fix add to subcorpus btns not showing when results per page are updated	2020-06-30 14:37:11 +02:00
Stephan Porada	820845b499	Some small fixes and user feedback	2020-06-29 11:09:12 +02:00
Stephan Porada	5764e918f5	Cosmetics III	2020-06-26 13:13:18 +02:00
Stephan Porada	9f341b90b9	Some more documentation!	2020-06-26 10:04:54 +02:00
Stephan Porada	74104922b6	Some documentation	2020-06-26 09:51:10 +02:00
Stephan Porada	e9cd5dafd1	Cosmetics II	2020-06-25 18:01:02 +02:00
Stephan Porada	b29f2ca5ee	Add cosmetics	2020-06-25 17:44:55 +02:00
Stephan Porada	afd5201c05	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-06-25 10:52:00 +02:00
Stephan Porada	2113065075	Export sub results	2020-06-25 10:51:51 +02:00
Patrick Jentsch	84672bba6b	Fix some variables naming	2020-06-25 10:51:13 +02:00
Patrick Jentsch	106fd75c75	fix ocr command	2020-06-23 15:20:05 +02:00
Stephan Porada	ead0117bbb	More Analysis Javascript updates for unified interaction handeling	2020-06-19 15:49:11 +02:00
Stephan Porada	ab61819005	New analysis interface	2020-06-19 12:30:05 +02:00
Patrick Jentsch	be4377a231	Cookie security only if https is set in the config.	2020-06-17 09:26:37 +02:00
Stephan Porada	b427a5e6f1	Use matches instead of one match in match context	2020-06-16 14:05:58 +02:00
Patrick Jentsch	af50da4936	Add compress flag for ocr jobs	2020-06-16 09:34:46 +02:00
Patrick Jentsch	1817532d27	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-06-15 16:14:21 +02:00
Patrick Jentsch	4f8ba7cb3e	Update for new cqi package	2020-06-15 16:14:16 +02:00
Stephan Porada	44688eff65	Add more cosmetics	2020-06-10 16:00:33 +02:00
Stephan Porada	b99bfd9854	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-06-10 15:10:29 +02:00
Stephan Porada	c30ab8f584	Some cosmetic fixes	2020-06-10 15:10:23 +02:00
Patrick Jentsch	e000324e8e	Remove stupid logs	2020-06-10 14:35:25 +02:00
Stephan Porada	66827bbdb1	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-06-10 14:26:00 +02:00
Stephan Porada	7e34892147	Rework job page input file view	2020-06-10 14:25:57 +02:00
Patrick Jentsch	4735df7c60	Add missing configuration to .env.tpl	2020-06-10 14:25:57 +02:00
Patrick Jentsch	b3e467beac	Update daemon	2020-06-10 14:18:02 +02:00
Stephan Porada	6e26e38326	Add True as default if NOPAQUE_EXECUTE_NOTIFICATIONS is not set	2020-06-10 09:39:16 +02:00
Patrick Jentsch	84319681a2	Update	2020-06-09 15:59:41 +02:00
Patrick Jentsch	d92efba805	Update README	2020-06-09 13:27:02 +02:00
Patrick Jentsch	d59268dd29	Add docker-compose.override.yml template duplicate, edit and save it as docker-compose.override.yml next to docker-compose.yml	2020-06-09 12:49:50 +02:00
Patrick Jentsch	59003593b6	All configuration via .env file. (This replaces the nopaque.env file)	2020-06-09 12:46:08 +02:00
Stephan Porada	f32c6e9faa	Fix	2020-06-08 14:56:43 +02:00
Stephan Porada	66cee12dcb	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-06-08 13:53:06 +02:00
Stephan Porada	3449964345	Put execute_flag into enviroment file	2020-06-08 13:52:54 +02:00
Patrick Jentsch	71cea57397	blubb	2020-06-08 13:47:34 +02:00
Patrick Jentsch	4727ce32c6	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-06-08 11:55:31 +02:00
Patrick Jentsch	1faf8f9ab2	Add playground blueprint	2020-06-08 11:55:20 +02:00
Stephan Porada	e0f32ee9eb	Remove sleep	2020-06-08 11:28:02 +02:00
Stephan Porada	50a483cbfc	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-06-08 10:24:28 +02:00
Stephan Porada	b56a8362ff	Avoid that threads of the same type can be executed twice or thrice etc.	2020-06-08 10:23:32 +02:00
Patrick Jentsch	a5a008db2f	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-06-08 10:14:21 +02:00