Commit Graph
100 Commits
Author SHA1 Message Date
Patrick Jentsch d4c6b72761 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2020-07-16 14:41:05 +02:00
Patrick Jentsch 6f0fd5bc73 Add delete function for services 2020-07-16 14:40:57 +02:00
Patrick Jentsch db16cbf7d6 Add mockup 2020-07-16 11:53:13 +02:00
Patrick Jentsch ac3b20d304 Remove old result package 2020-07-15 14:52:41 +02:00
Patrick Jentsch 0714070a9b Fully integrate new query_results model. old one is now deprecated. 2020-07-15 13:16:31 +02:00
Patrick Jentsch ba49bb39e9 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2020-07-15 11:07:09 +02:00
Patrick Jentsch 7cf04cbe29 Some changes to query result list 2020-07-15 11:07:03 +02:00
Patrick Jentsch 44963b1606 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2020-07-15 08:57:46 +02:00
Patrick Jentsch 06427e81f3 Use capitalized classnames 2020-07-15 08:57:39 +02:00
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
Patrick Jentsch b69c54a762 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2020-07-10 11:39:42 +02:00
Patrick Jentsch af947ee3bc Use appropriate methods and variable naming 2020-07-10 11:39:37 +02:00
Patrick Jentsch d480f92e30 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2020-07-10 11:36:58 +02:00
Patrick Jentsch 7f8797d227 Delete files in db model methods. 2020-07-10 11:36:54 +02:00
Patrick Jentsch f86f3f4fd5 Move file deletion to model methods. add restart job button. 2020-07-09 15:07:43 +02:00
Patrick Jentsch e20a6a31d9 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2020-07-09 09:42:34 +02:00
Patrick Jentsch 53b4b57b61 Add job restart url /jobs/job_id/restart 2020-07-09 09:42:30 +02:00
Patrick Jentsch c9cb52279b Add terms of use 2020-07-03 11:17:47 +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
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
Patrick Jentsch be4377a231 Cookie security only if https is set in the config. 2020-06-17 09:26:37 +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
Patrick Jentsch b3e467beac Update daemon 2020-06-10 14:18:02 +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 59003593b6 All configuration via .env file. (This replaces the nopaque.env file) 2020-06-09 12:46:08 +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
Patrick Jentsch a5a008db2f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/nopaque into development 2020-06-08 10:14:21 +02:00
Patrick Jentsch 023aade995 Some changes for convinience 2020-06-08 10:14:15 +02:00
Patrick Jentsch 056fbe273c Update 2020-06-05 15:12:59 +02:00
Patrick Jentsch cb2b64fa9d integrate nopaque repo 2020-06-05 14:42:04 +02:00
Patrick Jentsch 450ddf69fc Use more restrictive ssl settings 2020-06-03 11:18:15 +02:00
Patrick Jentsch 9f62e782f0 Add permanent redirect from http to https 2020-06-02 10:02:27 +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 01bc246035 Some minor fixes for logformat. 2020-05-27 11:35:49 +02:00
Patrick Jentsch ecac2c481c Only initialize socket when the user is logged in 2020-05-27 11:11:54 +02:00
Patrick Jentsch afd7469178 Rework logging code 2020-05-27 11:03:50 +02:00
Patrick Jentsch f137b8df9b Add ssl config for local development. 2020-05-26 14:40:44 +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
Patrick Jentsch c93d641fe4 Let daemon depend on web container, to make sure that db migrations are applied before daemon starts. 2020-05-19 09:27:21 +02:00
Patrick Jentsch 3d41b18daf Jobpage rework 2020-05-13 16:36:06 +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
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
Patrick Jentsch 86c4b77085 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-28 11:20:41 +02:00
Patrick Jentsch 7f06dc5ff6 Add settings for https 2020-04-28 11:20:35 +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
Patrick Jentsch ab4a7807cf remove gunicorn from entrypoint 2020-04-27 10:20:47 +02:00
Patrick Jentsch 3a05a4d2f4 Switch back to socketio server while development 2020-04-27 09:34:12 +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 606c8cf761 Add flask command switch to docker-entrypoint again 2020-04-23 15:31:10 +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
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
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
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
Patrick Jentsch 716e1c357a fix typo in env.tpl 2020-04-20 14:47:39 +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
Patrick Jentsch 8a9db7f4b8 Add validation flag if field is required. 2020-04-20 11:12:20 +02:00
Patrick Jentsch 339107fd08 Fix Ports 2020-04-20 10:40:10 +02:00
Patrick Jentsch 889976dc9b Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-04-20 10:11:51 +02:00