1432 Commits

Author	SHA1	Message	Date
Patrick Jentsch	0e982e0749	Remove QueryBuilder artifacts from merge	2022-10-04 13:24:04 +02:00
Patrick Jentsch	5fb4329d5f	Add tesseract-ocr-pipeline and transkribus-htr-pipeline v0.1.1	2022-10-04 13:05:20 +02:00
Patrick Jentsch	b662a3a4d1	Configure migrate to detect type changes in models	2022-10-04 13:02:11 +02:00
dameyer	9802fdd175	Add form and template for adding a model.	2022-10-02 23:49:14 +02:00
Inga Kirschnick	dc86c1e85d	fix wrong url creation	2022-09-20 15:02:44 +02:00
Patrick Jentsch	650a77f055	Remove merge leftover	2022-09-07 15:16:32 +02:00
Patrick Jentsch	7372e538f4	Add querybuilder js file	2022-09-07 14:56:40 +02:00
Inga Kirschnick	7fe183bf2a	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development	2022-09-07 14:53:51 +02:00
Inga Kirschnick	f46544451e	Code Style	2022-09-07 14:47:42 +02:00
Inga Kirschnick	f09403e61d	QueryBuilder 1.1	2022-09-07 14:22:59 +02:00
Inga Kirschnick	d537a38712	Querybuilder 1.0	2022-09-07 09:06:21 +02:00
Patrick Jentsch	ceef272d06	Add API functionality	2022-09-02 13:24:14 +02:00
Patrick Jentsch	dedccad70a	Restructure project 2/2	2022-09-02 13:08:01 +02:00
Patrick Jentsch	8e1d94bb5d	Restructure project	2022-09-02 13:07:30 +02:00
Patrick Jentsch	ec9225b881	Restructure imports (3rd party imports first)	2022-09-02 13:02:04 +02:00
Patrick Jentsch	8f03c2aea7	Add some handy css classes	2022-09-02 12:57:30 +02:00
Patrick Jentsch	131afd6419	New logic for forms including file upload.	2022-09-02 12:56:59 +02:00
Inga Kirschnick	9781425602	Query Builder New Design	2022-08-03 16:21:11 +02:00
Inga Kirschnick	4497567de0	Final prototype	2022-08-01 10:00:12 +02:00
Patrick Jentsch	7acb3b40c2	use hashids in jwt	2022-07-18 17:37:05 +02:00
Patrick Jentsch	1f3ca9664d	Remove dummy /users route	2022-07-18 17:10:44 +02:00
Patrick Jentsch	29900f3ab1	Update some JS libraries	2022-07-18 17:10:21 +02:00
Patrick Jentsch	1de9fce854	Switch from Authlib to pyJWT	2022-07-18 17:10:09 +02:00
Patrick Jentsch	12bba0564f	Migrate to Flask 2	2022-07-15 12:24:04 +02:00
Inga Kirschnick	5cbc6ea822	Prototype Query Builder for demo only	2022-07-13 14:06:22 +02:00
Patrick Jentsch	42ad6e27e2	Add Contributions Mockup and fix email notifications on job status change	2022-07-11 12:14:01 +02:00
Patrick Jentsch	018f9e752c	Fix event names	2022-07-08 15:52:15 +02:00
Patrick Jentsch	4e5957eea2	Change the Subscription Logic for Socket.IO Data exchange	2022-07-08 11:46:47 +02:00
Patrick Jentsch	5771e156ce	Change the APScheduler Logic and try to catch more errors in Daemon	2022-07-04 14:11:10 +02:00
Patrick Jentsch	76924956de	Change the user session SocketIO Logic	2022-07-04 14:09:17 +02:00
Patrick Jentsch	b8bf004684	Restructure code and use APScheduler for daemon functionality	2022-06-28 12:30:02 +02:00
Patrick Jentsch	7c52d3f392	Add Hint on how to store your job data	2022-06-14 12:00:22 +02:00
Patrick Jentsch	7e8f24e6bf	Fix model selection in HTR service page	2022-05-19 09:56:14 +02:00
Patrick Jentsch	31f91aaecb	Fix model selection	2022-05-17 16:16:31 +02:00
Patrick Jentsch	8136cedccb	Add a manual page	2022-05-17 15:31:05 +02:00
Patrick Jentsch	6b8d4d87bb	Fix a JS error regarding non existent data for query results	2022-05-05 15:11:36 +02:00
Patrick Jentsch	80a18386ee	Fix some display issues on smaller screens for the landing page	2022-05-05 15:11:02 +02:00
Patrick Jentsch	a4e65cac33	Update FAQ	2022-05-05 15:10:44 +02:00
Patrick Jentsch	c7c9fece46	Bump Socket.IO client version	2022-05-05 15:10:28 +02:00
Patrick Jentsch	7362bb5514	Codestyle enhancements	2022-05-05 15:10:03 +02:00
Patrick Jentsch	b4082a2547	Update services.yml	2022-04-29 13:04:03 +02:00
Patrick Jentsch	7b10a6be2e	Add April 2022 update news	2022-04-28 14:35:05 +02:00
Patrick Jentsch	603212e1df	Fix add corpus file form	2022-04-26 12:05:46 +02:00
Patrick Jentsch	d68f30db8b	Add transkribus models	2022-04-25 16:09:06 +02:00
Patrick Jentsch	51af30aff3	Fix credential issues	2022-04-25 15:21:30 +02:00
Patrick Jentsch	10b5254e82	Restructure code	2022-04-25 11:32:10 +02:00
Patrick Jentsch	fc1389e8b1	Change the scaling logic and switch back to the socketio web server	2022-04-22 16:36:12 +02:00
Patrick Jentsch	ccdd0d3faa	Integrate TranskribusHTRModels	2022-04-22 15:27:52 +02:00
Patrick Jentsch	9d4001f469	Reimplement corpus import and activate it again	2022-04-19 11:48:44 +02:00
Patrick Jentsch	de4a83582d	simplify form code	2022-04-19 11:48:14 +02:00
Patrick Jentsch	d35ca7c261	Disable binarization for old ocr service versions. Add new ocr service version (including binarization)	2022-04-13 16:39:51 +02:00
Patrick Jentsch	43ea898394	Fix corpus build process	2022-04-13 09:47:02 +02:00
Patrick Jentsch	63217a7e1d	Fix uploading corpus files	2022-04-13 09:08:11 +02:00
Patrick Jentsch	4146e3789b	normalize vrt on build	2022-04-12 16:11:40 +02:00
Patrick Jentsch	99ddd2e3dd	normalize forms	2022-04-12 16:11:24 +02:00
Patrick Jentsch	54b5635e9c	Merge branch 'master' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque	2022-04-04 13:31:15 +02:00
Patrick Jentsch	ce997e69ea	Rename all services, use scss, cleanup, add sandpaper conversion script	2022-04-04 13:31:09 +02:00
Patrick Jentsch	f425ca6fa1	Fix missing color for icons in corpus lists	2022-02-17 11:53:54 +01:00
Patrick Jentsch	10768fbaa4	Remove wrong type annotations	2022-02-17 09:06:18 +01:00
Patrick Jentsch	15e897f005	Delete unused files, restructure assets and use scss	2022-02-15 09:25:34 +01:00
Patrick Jentsch	585a6ba796	Rename some IntEnumColumn related stuff	2022-02-10 12:01:31 +01:00
Patrick Jentsch	86d14f748f	More generic implementation of fake enum db types	2022-02-09 16:02:37 +01:00
Patrick Jentsch	247ac801b0	Rename font files	2022-02-08 15:56:01 +01:00
Patrick Jentsch	df6ab3991c	Use enums where appropriate. This commit includes new migrations that are NOT compatible with older nopaque instances	2022-02-08 12:26:20 +01:00
Patrick Jentsch	fe938c0ca2	Big update, corpus analysis reworked, versioned services, preliminary work for contributions	2022-02-03 12:39:16 +01:00
Patrick Jentsch	0647537192	Fix automatic id generation for RessourceLists	2022-01-14 14:14:04 +01:00
Patrick Jentsch	e356be77da	Implement authentication with before_request in admin package	2021-12-13 12:20:32 +01:00
Patrick Jentsch	82543d883f	Use HashidMixin from flask_hashids	2021-12-13 12:20:01 +01:00
Patrick Jentsch	44f9d0a560	Further codestyle improvements	2021-12-09 15:39:45 +01:00
Patrick Jentsch	40bd169101	Some cleanup (css, html, js)	2021-12-09 12:50:14 +01:00
Patrick Jentsch	067273df6d	Minor Codestyle updates.	2021-12-08 15:36:10 +01:00
Patrick Jentsch	982d5bc46f	Fix broken download link in job result lists	2021-12-08 14:45:15 +01:00
Patrick Jentsch	3d99b8770c	Codestyle enhancements	2021-12-08 14:45:05 +01:00
Patrick Jentsch	1fd7a2e38c	Add nopaque video to index	2021-12-08 11:51:34 +01:00
Patrick Jentsch	832a0283bd	Some styling for ressource lists	2021-12-08 11:25:52 +01:00
Patrick Jentsch	63527da37f	Use Flask-Hashids package	2021-12-08 11:25:33 +01:00
Patrick Jentsch	e1004a0181	First attempts to use type hinting	2021-12-07 14:18:05 +01:00
Patrick Jentsch	9d30dda733	Codestyle	2021-12-06 14:42:49 +01:00
Patrick Jentsch	b3f34648c4	Bug fixes	2021-12-03 16:10:54 +01:00
Patrick Jentsch	3e37cb8582	Fix some navigation issues	2021-12-03 14:56:56 +01:00
Patrick Jentsch	123537cd16	Add new roles and a new permission	2021-12-03 14:07:03 +01:00
Patrick Jentsch	89f518fe38	Sort lists by ressources creation date. CSS and HTML cleanup	2021-12-03 12:01:50 +01:00
Patrick Jentsch	03a57fd7ee	Create a proper class for the upload form	2021-12-02 16:25:48 +01:00
Patrick Jentsch	d8f11a9759	update nopaque forms	2021-12-02 13:48:48 +01:00
Patrick Jentsch	962e58f2d3	Enable auto initialization for ressource lists	2021-12-02 11:16:06 +01:00
Patrick Jentsch	f977c808ec	Even better solution for concurrent promise handling	2021-12-01 17:52:09 +01:00
Patrick Jentsch	ff514368c3	Try to avoid requesting user data multiple times	2021-12-01 17:07:05 +01:00
Patrick Jentsch	82745629bc	Bug fixes	2021-12-01 16:03:55 +01:00
Patrick Jentsch	12ec6be60b	JS codestyle enhancements	2021-12-01 14:15:20 +01:00
Patrick Jentsch	72ba61f369	Only reveal hashids to the ui	2021-11-30 16:22:16 +01:00
Patrick Jentsch	9308618e63	New faq and service desk	2021-11-18 12:09:15 +01:00
Patrick Jentsch	904747ec66	Add dependencies and missing exception handling	2021-11-18 08:39:56 +01:00
Patrick Jentsch	a2e4fd2df5	Add news regarding current maintenance state	2021-11-16 15:50:07 +01:00
Patrick Jentsch	f6c2292e03	Big Corpus analysis update	2021-11-16 15:23:57 +01:00
Patrick Jentsch	c1436c2a5d	Add model section to template and add API link to sidenav	2021-11-15 14:54:08 +01:00
Patrick Jentsch	70d541690f	Add 503 error handler	2021-11-15 14:36:18 +01:00
Patrick Jentsch	1ccdccd0bc	Fix cli run commands	2021-09-22 14:13:59 +02:00
Patrick Jentsch	ee0efcf17f	Rename cli functions to not interfere	2021-09-22 13:58:46 +02:00
Patrick Jentsch	17cbfd71b4	Rename TaskRunner to Daemon (because it essentially is one) and restructure cli	2021-09-22 13:53:39 +02:00
Patrick Jentsch	e0219e84c9	Preliminary work for better socket.io event handling.	2021-09-22 13:52:51 +02:00
Patrick Jentsch	d29190907f	code cleanup	2021-09-22 13:51:45 +02:00
Patrick Jentsch	1832f1d3c8	Remove unused import	2021-09-22 13:50:43 +02:00
Patrick Jentsch	08fec74cff	Use threading.Thread for @background decorator again.	2021-09-22 13:50:26 +02:00
Patrick Jentsch	371cd30893	Let socketio decorators return instead of randomly emiting messages.	2021-09-22 13:49:22 +02:00
Patrick Jentsch	0d96a572e4	Change api root routes, so that they don't have a trailing slash	2021-09-16 14:20:18 +02:00
Patrick Jentsch	5469bd0ec1	Don't use module level logger functions	2021-09-16 11:15:31 +02:00
Patrick Jentsch	e2c68a1a80	Enable advanced logging features	2021-09-15 17:58:17 +02:00
Patrick Jentsch	727553412f	add flag to socketio, hope it will improve firefox compatibility	2021-09-15 15:26:43 +02:00
Patrick Jentsch	1b342d5159	Use gunicorn as the default webserver	2021-09-15 14:15:23 +02:00
Patrick Jentsch	52c25fd563	Simplify Config setup and move some functions to dedicated files	2021-09-15 12:31:53 +02:00
Patrick Jentsch	8a69d6364a	Add more examples	2021-09-14 16:17:26 +02:00
Patrick Jentsch	523faaea05	Fix wording	2021-09-14 13:01:19 +02:00
Patrick Jentsch	a5b1df9e95	Add simple api package including authentication (BasicAuth and TokenAuth)	2021-09-14 12:52:23 +02:00
Patrick Jentsch	def01d474e	Add UTC flag to date strings	2021-09-14 12:51:49 +02:00
Patrick Jentsch	0a9bea0740	Remove api fragments	2021-09-13 17:38:07 +02:00
Patrick Jentsch	05c6f1afa6	Simplify Login mechanism code	2021-09-13 17:36:19 +02:00
Patrick Jentsch	81ed16603d	Remove current_app and current_user usage in forms.	2021-09-13 16:36:48 +02:00
Patrick Jentsch	10483c1e45	Fix Date display issue in UserList	2021-09-13 16:35:09 +02:00
Patrick Jentsch	4950a407af	rename blueprint variables (blueprint_name -> bp) and view files (views.py -> routes.py)	2021-09-13 11:45:43 +02:00
Patrick Jentsch	bc5c8ef074	handle email job status updates with the sqlalchemy event handlers	2021-09-10 16:25:32 +02:00
Patrick Jentsch	281e568edf	Use ISO 8601 as the default datetime format	2021-09-08 12:56:51 +02:00
Patrick Jentsch	9d59aa3409	Move event handlers to a dedicated event directory	2021-09-07 13:50:23 +02:00
Patrick Jentsch	0861d931ce	Add an abort criterion when exporting query results	2021-08-24 09:50:32 +02:00
Patrick Jentsch	cedce5545d	Fix wrong corpus analysis link in sidenav	2021-08-24 09:21:43 +02:00
Patrick Jentsch	e2669e6c25	Add missing exception handler	2021-08-23 16:43:47 +02:00
Patrick Jentsch	5cd18c4c2a	Sort after list ressource list insertions	2021-08-23 16:34:25 +02:00
Patrick Jentsch	280c544297	Fix job result duplication after job restart	2021-08-23 16:31:06 +02:00
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
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