7 Commits

Author	SHA1	Message	Date
Patrick Jentsch	56e6049665	Remove merge markers....	2020-07-13 15:34:17 +02:00
Patrick Jentsch	ac3310fea5	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2020-07-13 15:33:58 +02:00
Patrick Jentsch	6760061d53	Add a parallel package for query results.	2020-07-13 15:33:00 +02:00
Stephan Porada	cdd421e48a	Rename some result views and templates	2020-07-10 13:27:06 +02:00
Stephan Porada	7648149584	Results import fixes and additions. Table creation rework.	2020-07-07 15:08:15 +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	cb2b64fa9d	integrate nopaque repo	2020-06-05 14:42:04 +02:00