1105 Commits

Author	SHA1	Message	Date
Patrick Jentsch	a5782f932c	Do not manually emit corpus changes via socket.	2021-08-23 12:29:31 +02:00
Patrick Jentsch	c7b2c413d3	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2021-08-23 11:04:10 +02:00
Patrick Jentsch	fd5fcf9821	Change exception handling in corpus analysis	2021-08-23 11:04:09 +02:00
Patrick Jentsch	1a59b19124	Handle all ressource events with unified sqlalchemy event handlers.	2021-08-20 14:41:40 +02:00
Patrick Jentsch	98a43ec86f	Use sqlalchemy events to emit jsonpatches to the client.	2021-08-18 15:11:11 +02:00
Patrick Jentsch	5662140a8d	Add a flag to all db Model to_dict methods: include_relationships	2021-08-18 15:09:56 +02:00
Patrick Jentsch	869c1ba632	Fix corpus service creation	2021-08-16 12:09:50 +02:00
Patrick Jentsch	99c43cc1a6	some style updates	2021-08-09 11:02:09 +02:00
Patrick Jentsch	575dc45242	Rework a lot of daemon code. Add missing patch messages	2021-08-04 17:07:59 +02:00
Patrick Jentsch	da350474fb	standardize the use of service name handles, e.g. file-setup instead of file_setup	2021-08-04 12:26:49 +02:00
Patrick Jentsch	ec7a88f36e	Simplify color setup in templates	2021-08-04 09:07:18 +02:00
Patrick Jentsch	d6ab379418	Change directory structure (move ./nopaque/* to ./)	2021-07-20 15:07:42 +02:00
Patrick Jentsch	cb2b64fa9d	integrate nopaque repo	2020-06-05 14:42:04 +02:00
Patrick Jentsch	4ac4fcb4ff	Add security enhancements. See: https://blog.miguelgrinberg.com/post/cookie-security-for-flask-applications	2020-06-02 16:51:08 +02:00
Patrick Jentsch	d5569fa65b	flashed messages for unauthenticated users too!	2020-05-27 13:34:55 +02:00
Patrick Jentsch	ba916b70bd	Change location where socket is initialized...again	2020-05-27 13:32:07 +02:00
Patrick Jentsch	94d99862bd	Use werkzeugs pre implemented ProxyFix middleware	2020-05-27 12:52:41 +02:00
Patrick Jentsch	814821a2bd	Make flask respect https! :D See: https://stackoverflow.com/questions/14810795/flask-url-for-generating-http-url-instead-of-https/37842465#37842465	2020-05-27 11:36:28 +02:00
Patrick Jentsch	ecac2c481c	Only initialize socket when the user is logged in	2020-05-27 11:11:54 +02:00
Patrick Jentsch	eccf9691c1	Add missing import. Remove unused import.	2020-05-26 14:29:01 +02:00
Patrick Jentsch	af527c1cf3	Bump socketio-client version. (2.2.0 -> 2.3.0)	2020-05-26 14:26:11 +02:00
Patrick Jentsch	d4e81b11e0	Fix foreign user data transmission for admins	2020-05-20 10:32:39 +02:00
Patrick Jentsch	8d201a29ae	Proper socketio_login/admin_required decorators	2020-05-20 09:36:59 +02:00
Patrick Jentsch	f86301112b	Remove unused .png	2020-05-20 09:36:23 +02:00
Patrick Jentsch	2af6daccf2	switch parallax images so that the code image is displayed when the user is logged in	2020-05-19 14:39:23 +02:00
Patrick Jentsch	b93bcb36f7	update	2020-05-19 14:27:35 +02:00
Patrick Jentsch	ddfa0f47bf	Add new config variable and rename opaque_domain -> nopaque_domain	2020-05-19 14:19:23 +02:00
Patrick Jentsch	94a193f6dd	Add legal notice and gitlab link as button	2020-05-19 10:25:16 +02:00
Stephan Porada	6f842a1092	Remove unnecessary deletes which hare handled by cascade options	2020-05-18 14:53:31 +02:00
Stephan Porada	8f4cd9a375	Add additional new __repr_ function	2020-05-18 13:46:12 +02:00
Stephan Porada	243eba2f78	Add new __repr__ function.	2020-05-18 11:59:19 +02:00
Stephan Porada	6e81e424c4	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-05-15 15:07:50 +02:00
Stephan Porada	9ce00ff5e0	Merge notify into daemon	2020-05-15 14:43:12 +02:00
Stephan Porada	7a6cbccbd2	First working mail notification system	2020-05-14 15:30:13 +02:00
Patrick Jentsch	3d41b18daf	Jobpage rework	2020-05-13 16:36:06 +02:00
Stephan Porada	07c104196f	Add Notification model	2020-05-11 16:09:09 +02:00
Stephan Porada	cb8f3faae0	Add curren ttoken and max token nr	2020-05-04 12:08:43 +02:00
Stephan Porada	c49684611a	Add more metadata	2020-05-04 11:05:17 +02:00
Stephan Porada	58295b986d	Rename some things. Add metadata to downloadable json	2020-04-30 15:21:55 +02:00
Stephan Porada	1350e6ddd6	Add metadata object on analysis	2020-04-30 14:45:54 +02:00
Patrick Jentsch	a17771a772	Better comments	2020-04-30 12:56:59 +02:00
Patrick Jentsch	08b909b9a8	Add new field to dict method. Always keep in mind to do this, when you or modify a field.	2020-04-30 11:32:48 +02:00
Patrick Jentsch	f87fe589c1	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-30 11:29:01 +02:00
Patrick Jentsch	e1b07d8719	Handle user data streams different 1/2 ... In the future this will be much more performant!	2020-04-30 11:28:55 +02:00
Stephan Porada	d4318cb205	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-29 16:15:12 +02:00
Stephan Porada	d54a3d3f33	First metadata addition	2020-04-29 16:15:11 +02:00
Patrick Jentsch	b7fc804b40	Sort things a bit... this should get improved in the future	2020-04-29 12:17:16 +02:00
Patrick Jentsch	4d677244e0	Some styling	2020-04-28 16:33:47 +02:00
Stephan Porada	eb5e5c3253	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-27 16:16:59 +02:00
Stephan Porada	deda16f0f5	Add meta data recv after corpus analysis init	2020-04-27 16:16:57 +02:00
Patrick Jentsch	c67c033aec	Rework notification system	2020-04-27 15:22:20 +02:00
Patrick Jentsch	b30382e605	beauty enhancements	2020-04-27 14:33:49 +02:00
Patrick Jentsch	f744e32d7e	Fix email function	2020-04-27 14:08:59 +02:00
Patrick Jentsch	45a3c664a2	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-27 13:51:07 +02:00
Patrick Jentsch	565274fce1	A lot of database changes and add options to change notification level	2020-04-27 13:50:54 +02:00
Stephan Porada	5dfaf51793	Add download for context data.	2020-04-27 13:25:29 +02:00
Stephan Porada	76e7d65017	Some comments	2020-04-27 10:30:38 +02:00
Stephan Porada	7cfa3bd022	Change darmode setting	2020-04-27 10:19:20 +02:00
Patrick Jentsch	98fecacb11	use cqi from pypi	2020-04-24 15:44:40 +02:00
Patrick Jentsch	7fc1084749	Add notifications on status changes of jobs and corpora	2020-04-24 15:22:04 +02:00
Patrick Jentsch	d520184d1d	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-23 13:41:43 +02:00
Patrick Jentsch	4a7f2dbb24	Add word-break to corpus file list.	2020-04-23 13:41:37 +02:00
Stephan Porada	9e693fc440	Remove &nsbp;	2020-04-23 13:28:13 +02:00
Patrick Jentsch	a4f122bdab	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2020-04-23 12:40:04 +02:00
Patrick Jentsch	154631dcb4	Add placeholder to indicate required file types in forms	2020-04-23 12:39:59 +02:00
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