Commit Graph

1587 Commits

Author SHA1 Message Date
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
Stephan Porada
ebe598312f Add info tool tip 2020-03-19 10:25:09 +01:00
Stephan Porada
8147dc404a Inspect now only works when queryFinished is true 2020-03-19 09:25:23 +01:00
Stephan Porada
b12c9f85d1 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-18 15:52:57 +01:00
Stephan Porada
3111cc5175 Clean up corpus analysis and add new features 2020-03-18 15:52:53 +01:00
Patrick Jentsch
4c67777977 Add privacy 2020-03-18 14:44:15 +01:00
Stephan Porada
c5e56692b1 First analys_corpus clean up 2020-03-17 14:00:41 +01:00
Stephan Porada
c416d64a4c some comment changes 2020-03-17 10:47:52 +01:00
Patrick Jentsch
6414ab36bf Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-16 16:25:12 +01:00
Patrick Jentsch
63600c1301 Remove debug messages. 2020-03-16 16:25:08 +01:00
Stephan Porada
f8d3300e42 Apply context size on first load 2020-03-16 15:57:06 +01:00
Patrick Jentsch
37d2e8f38e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-16 13:15:25 +01:00
Patrick Jentsch
b8437735b4 Defensive programming inc 2020-03-16 13:15:13 +01:00
Stephan Porada
0c7620b438 add white section 2020-03-16 12:27:07 +01:00
Stephan Porada
e0e2fe017c Fix typo 2020-03-16 11:21:58 +01:00
stephan
5b9c1c3adf Add context change toast. 2020-03-12 15:09:27 +01:00
stephan
6bdc0b354b Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-12 14:49:03 +01:00
stephan
5c134dd8c5 Add interaactive context change 2020-03-12 14:48:58 +01:00
Patrick Jentsch
b6ffad1ae4 use variable instead of magic number 2020-03-12 14:18:38 +01:00
Patrick Jentsch
f4ac584668 Update 2020-03-12 14:18:07 +01:00
Patrick Jentsch
bcbb67b707 Remove debug log 2020-03-12 14:16:47 +01:00
Patrick Jentsch
e5e77d7dc2 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-12 14:13:11 +01:00
Patrick Jentsch
416c724f70 Simplify 2020-03-12 14:13:07 +01:00
stephan
db7ccb2b11 important fix! 2020-03-12 10:34:40 +01:00
stephan
7d37f802b1 Hide prepare button 2020-03-11 15:51:55 +01:00
Patrick Jentsch
fa7d2da973 Update 2020-03-11 14:48:48 +01:00
Patrick Jentsch
cedc1f11e3 Update 2020-03-11 13:34:09 +01:00
Patrick Jentsch
e881401a10 Update CQi stuff 2020-03-10 16:06:47 +01:00
Patrick Jentsch
467080c7f8 Update UI 2020-03-07 20:20:58 +01:00
stephan
607fb016df poster 3 2020-03-02 16:10:42 +01:00
Patrick Jentsch
957d4a513c Update poster 2020-03-02 16:00:58 +01:00
stephan
90022d25d2 Poster 2 2020-03-02 15:45:37 +01:00
stephan
6a509646e7 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-02 15:31:36 +01:00
stephan
2c78de1eb9 psoter 2020-03-02 15:31:31 +01:00
Patrick Jentsch
dfd7e556d2 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-02 14:57:17 +01:00
Patrick Jentsch
fb0ca7e759 Fix job form error message generation 2020-03-02 14:57:12 +01:00
stephan
6318c753b2 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-02 14:19:57 +01:00
stephan
c6f522a776 new layout 2020-03-02 14:19:54 +01:00
Patrick Jentsch
55a86a60f3 disable notifications for now 2020-03-02 14:15:50 +01:00
Patrick Jentsch
9912017d78 csrf token immediatly after form tag 2020-03-02 14:13:32 +01:00
Patrick Jentsch
98155e5d25 Update 2020-03-02 14:08:49 +01:00
Patrick Jentsch
02177ed859 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-02 14:05:34 +01:00
Patrick Jentsch
d08014dbbe First implementation of a feedback formular 2020-03-02 14:05:31 +01:00
stephan
d4453fd994 Sort by id 2020-03-02 13:59:16 +01:00
stephan
94f4f304ce Sort input files 2020-03-02 13:52:02 +01:00
stephan
fe9364e891 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-02 11:55:42 +01:00
stephan
cad9f2f7f5 Fix empty 2020-03-02 11:55:33 +01:00
Patrick Jentsch
5c62a1a013 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-02 11:55:32 +01:00
Patrick Jentsch
aa6d5510ce Fix problem with empty table 2020-03-02 11:55:24 +01:00
stephan
50b7f3aaf7 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-02 11:55:17 +01:00
stephan
6c0e1998f2 Poster update text 2020-03-02 11:55:12 +01:00
Patrick Jentsch
b5e8ab376e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-03-02 11:42:04 +01:00
Patrick Jentsch
8a1339e42a Always show log in section on poster 2020-03-02 11:42:00 +01:00
stephan
4a8696cf16 Fix typo 2020-03-02 11:18:34 +01:00
stephan
f8524be488 Sort result files without log message 2020-03-02 11:07:25 +01:00
stephan
a0c0f3ff0c Sort result files 2020-03-02 11:06:36 +01:00
Patrick Jentsch
020f99d93f Remove Poster nav 2020-03-02 10:45:46 +01:00
Patrick Jentsch
5ea19abbfd Text updates 2020-03-02 10:42:25 +01:00
Patrick Jentsch
d5ecf5b9c5 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-27 16:26:08 +01:00
Patrick Jentsch
62b70a7532 Update 2020-02-27 16:26:04 +01:00
stephan
be423e1b5c poster pics 2020-02-27 15:44:47 +01:00
stephan
c385b21739 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-27 15:41:09 +01:00
stephan
535800558e pics+ 2020-02-27 15:41:06 +01:00
Patrick Jentsch
1b61182932 login page update 2020-02-27 15:39:53 +01:00
Patrick Jentsch
ef5b975b6a Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-27 15:33:59 +01:00
Patrick Jentsch
9d197ef8c7 Update according to poster texts 2020-02-27 15:33:55 +01:00
stephan
2744d107ae Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-27 15:33:43 +01:00
stephan
275e6953b7 new parallax pics 2020-02-27 15:33:37 +01:00
Patrick Jentsch
adf6b9e4ae Bring back the original footer 2020-02-27 15:29:36 +01:00
Patrick Jentsch
2e8a2751d8 schubs 2020-02-27 13:23:21 +01:00
Patrick Jentsch
aaaed0f214 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-27 12:19:59 +01:00
Patrick Jentsch
3f163ba953 posterama 2020-02-27 12:19:56 +01:00
stephan
8a688bf314 all lower case 2020-02-27 11:56:20 +01:00
stephan
c2124ebddf Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-27 11:46:30 +01:00
stephan
50d06d0eea Poster stuff 2020-02-27 11:46:28 +01:00
Patrick Jentsch
dbbecf595c update 2020-02-27 11:30:05 +01:00
Patrick Jentsch
25b66609bf New texts 2020-02-27 11:29:42 +01:00
stephan
41b171e460 Fix typo 2020-02-27 10:25:33 +01:00
Patrick Jentsch
d9d2f702d9 Set title for poster page 2020-02-27 10:15:04 +01:00
Patrick Jentsch
d27919bef3 Update texts 2020-02-27 09:55:58 +01:00
Patrick Jentsch
762482582d Fix background problem 2020-02-26 13:54:24 +01:00
Patrick Jentsch
721f424d30 poster update 2020-02-26 13:50:06 +01:00
Patrick Jentsch
448f1117ca Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-26 11:38:25 +01:00
Patrick Jentsch
934674d5ba Make some changes 2020-02-26 11:38:21 +01:00
stephan
b1a50d2339 poster 2020-02-26 11:37:59 +01:00
Patrick Jentsch
4728978cbf update 2020-02-25 15:56:44 +01:00
stephan
2656577f74 Add text 2020-02-25 15:10:20 +01:00
Patrick Jentsch
fa2af2d8b9 new poster 2020-02-25 14:53:33 +01:00
Patrick Jentsch
18163400e1 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-25 11:05:25 +01:00
Patrick Jentsch
b0c94e169e dunno 2020-02-25 11:05:19 +01:00
stephan
cf37ae163e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-25 11:00:35 +01:00
stephan
f8aa18e2a7 Add expert view to inspect view. 2020-02-25 11:00:30 +01:00
Patrick Jentsch
1a5af62179 Add theme color 2020-02-25 10:46:24 +01:00
Patrick Jentsch
2aa86fdd04 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-25 10:39:38 +01:00
Patrick Jentsch
f65fab0c77 Mobile styles 2020-02-25 10:39:33 +01:00
stephan
40255c7b79 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-25 10:29:44 +01:00
stephan
5568f535bd Change dark mode settings 2020-02-25 10:29:20 +01:00
Patrick Jentsch
9a925ee141 Update 2020-02-25 10:20:29 +01:00
Patrick Jentsch
b8fa1e15d3 Fix account deletion 2020-02-25 10:03:31 +01:00
Patrick Jentsch
f58a6f5778 Changes for page title 2020-02-25 09:59:49 +01:00
Patrick Jentsch
b8abc8856c Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-24 17:32:24 +01:00
Patrick Jentsch
697a9e3108 Update 2020-02-24 17:32:20 +01:00
stephan
423ad6a778 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-24 16:54:28 +01:00
stephan
bb536f5534 Setup Files to File Setup 2020-02-24 16:54:20 +01:00
Patrick Jentsch
8f209374ab Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-24 15:55:34 +01:00
Patrick Jentsch
47127dcd80 Remove unused file 2020-02-24 15:51:02 +01:00
stephan
ae8bf021da Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-24 15:50:09 +01:00
stephan
dbcd627284 Change button 2020-02-24 15:50:02 +01:00
Patrick Jentsch
f3bcbd3264 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-24 15:47:18 +01:00
Patrick Jentsch
c5dee67f4d Change favicon 2020-02-24 15:47:13 +01:00
stephan
2147b9e3b4 Change layout 2020-02-24 15:41:35 +01:00
stephan
e424c39b3d change title 2020-02-24 14:59:29 +01:00
stephan
945cb5e130 Poster 2020-02-24 11:50:05 +01:00
Patrick Jentsch
cd405d937e some scaling 2020-02-24 10:25:34 +01:00
Patrick Jentsch
0ce0ac5593 Change processes and services section 2020-02-24 10:21:30 +01:00
Patrick Jentsch
31c958cb6f move macros to new file 2020-02-24 09:27:02 +01:00
Patrick Jentsch
c7254781d0 Add macro for submit button 2020-02-24 09:18:49 +01:00
Patrick Jentsch
62263a1f88 Update buttons 2020-02-20 15:59:08 +01:00
Patrick Jentsch
6aa51fcd85 Add tooltip to posterpage 2020-02-20 11:19:24 +01:00
stephan
c7155badf2 fix typo 2020-02-20 10:59:54 +01:00
stephan
a1405150bb Change tilte 2020-02-20 10:58:46 +01:00
stephan
7744232e5c Set background picture to cover 2020-02-20 10:32:02 +01:00
Patrick Jentsch
5b0c6a86d7 Add ugly background images to log in and register page 2020-02-20 10:28:05 +01:00
Patrick Jentsch
9a75d07181 Update 2020-02-20 10:18:10 +01:00
Patrick Jentsch
4f35fb56de Add some icons 2020-02-20 10:13:35 +01:00
Patrick Jentsch
4c6b1ee461 Fix Settings button 2020-02-20 10:03:42 +01:00
Patrick Jentsch
50746ab821 Allow username for login 2020-02-20 09:45:38 +01:00
Patrick Jentsch
ba3f9ec214 Update 2020-02-19 16:58:56 +01:00
Patrick Jentsch
48685e4da6 Fix some bugs 2020-02-19 16:36:55 +01:00
Patrick Jentsch
75329382ab Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-19 16:25:02 +01:00
Patrick Jentsch
3b798cb617 Rework auth package 2020-02-19 16:24:58 +01:00
stephan
120f4778d5 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-19 15:41:00 +01:00
stephan
928ab9512b Add automatic query display option changes 2020-02-19 15:40:54 +01:00
Patrick Jentsch
c90cd4d8a3 Rework settings page. 2020-02-19 14:49:52 +01:00
Patrick Jentsch
5e4666d3c8 Fix sidenav open trigger 2020-02-19 10:17:27 +01:00
Patrick Jentsch
bbe31dec71 Use anchor link to scroll to login form 2020-02-19 09:49:35 +01:00
Patrick Jentsch
42dca19941 wording 2020-02-18 16:28:39 +01:00
Patrick Jentsch
8839c2882a code updates 2020-02-18 16:25:32 +01:00
Patrick Jentsch
db41be56c7 code updates 2020-02-18 16:13:30 +01:00
Patrick Jentsch
12829eada8 Update index page 2020-02-18 16:07:44 +01:00
Patrick Jentsch
a1d33077a3 Small changes everywhere 2020-02-18 15:44:55 +01:00
Patrick Jentsch
4de2fdf6d8 Simplify template 2020-02-18 15:31:10 +01:00
stephan
e611a15aac Revert admin edit_user view 2020-02-18 15:22:48 +01:00
stephan
ad588c4344 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-18 14:54:19 +01:00
stephan
1fc61f4528 Add parallax with scorllspy 2020-02-18 14:54:14 +01:00
Patrick Jentsch
1817b6326d more feedback 2020-02-18 14:53:35 +01:00
Patrick Jentsch
4f803d0aa6 Readd some stuff 2020-02-18 14:44:31 +01:00
Patrick Jentsch
292c24b38f Simplify nopaque.js 2020-02-18 14:39:05 +01:00
Patrick Jentsch
e409727ef1 updat4e 2020-02-18 13:29:59 +01:00
Patrick Jentsch
12aeb33aa0 New variable 2020-02-18 13:28:17 +01:00
Patrick Jentsch
180e420021 Change Binarization text 2020-02-18 12:10:42 +01:00
Patrick Jentsch
54baa8633a Add Feedback for select field in job forms 2020-02-18 12:01:36 +01:00
Patrick Jentsch
283fbca969 Codestyle 2020-02-18 10:37:04 +01:00
Patrick Jentsch
cdb352f14a Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-17 16:14:30 +01:00
Patrick Jentsch
c327291cbe Small changes everywhere 2020-02-17 16:14:24 +01:00
stephan
950f87668f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-17 14:57:28 +01:00
stephan
241a40ef44 Add secure filename for modesl and services 2020-02-17 14:57:24 +01:00
Patrick Jentsch
75d09b985b Redesign start page 2020-02-17 14:23:19 +01:00
Patrick Jentsch
50596ff2ae Use new event. 2020-02-17 12:20:09 +01:00
Patrick Jentsch
4f5aeed215 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-17 12:01:40 +01:00
Patrick Jentsch
8166ca840b Update landing page 2020-02-17 12:01:36 +01:00
stephan
191066a7e4 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-17 11:59:03 +01:00
stephan
aed888086f Add create_secure_filename Job method 2020-02-17 11:58:58 +01:00
Patrick Jentsch
1314993a60 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-17 11:08:08 +01:00
Patrick Jentsch
55d7848bd3 Update service pages 2020-02-17 11:08:03 +01:00
stephan
e7e4470699 Fix unclickable inputfields 2020-02-17 10:46:42 +01:00
stephan
416cc145cf Fix unclickable input fields 2020-02-17 10:45:45 +01:00
Patrick Jentsch
1f0e7f1c06 update 2020-02-14 15:40:28 +01:00
Patrick Jentsch
545c3ae2ec update 2020-02-14 15:23:02 +01:00
Patrick Jentsch
fb7d5151ba Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-13 15:08:19 +01:00
Patrick Jentsch
0cb51a34c4 Remove unnecessary job status 2020-02-13 15:08:15 +01:00
Stephan Porada
2edb6f9fdf Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-13 14:41:07 +01:00
Stephan Porada
81402d2d6a Add check_encoding to nlp jobs 2020-02-13 14:41:02 +01:00
Patrick Jentsch
0ea03983d6 small fix 2020-02-12 16:42:46 +01:00
Patrick Jentsch
0f7df4fd3b new status view 2020-02-12 16:34:31 +01:00
Patrick Jentsch
67dab88674 Add running indicator 2020-02-12 16:24:56 +01:00
Patrick Jentsch
1cbea56ba9 Change title settings 2020-02-12 15:57:31 +01:00
Patrick Jentsch
de699e6ccf Update Jobpage 2020-02-12 15:48:51 +01:00
Patrick Jentsch
72984448de Update Job Page 2020-02-12 14:48:29 +01:00
Patrick Jentsch
0d7f7d859c Remove unused class 2020-02-12 13:32:21 +01:00
Patrick Jentsch
dc17ba5824 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-02-12 12:19:58 +01:00
Patrick Jentsch
611bb6ef62 Change RessourceList 2020-02-12 12:19:54 +01:00
Stephan Porada
bb5f456e6e Remove useless row html div 2020-02-11 16:13:00 +01:00
Patrick Jentsch
a28726994c Update Postertexts 2020-02-11 16:12:45 +01:00
Patrick Jentsch
87979bf7af Add Poster to navigation, Enable Account entries on all display sizes 2020-02-11 16:07:31 +01:00
Patrick Jentsch
efbb48c258 Poster update 2020-02-11 09:22:29 +01:00
Patrick Jentsch
69de8e9369 update 2020-02-10 16:07:26 +01:00
Patrick Jentsch
f3ea822108 Change poster page 2020-02-10 16:06:08 +01:00
Patrick Jentsch
cc1ff6e685 Revert index page 2020-02-10 16:06:01 +01:00
Patrick Jentsch
ef64280a2b Add poster option 2020-02-10 14:05:47 +01:00
Patrick Jentsch
8c40a1aa96 Add Posterpage 2020-02-10 13:25:15 +01:00
Patrick Jentsch
aa6ee42984 Remove unused test variable 2020-02-07 16:24:15 +01:00
Patrick Jentsch
81ca4ef12a fix icon 2020-02-07 16:21:48 +01:00
Patrick Jentsch
dd5b82c70b Add corpora and jobs as sub menu point for dashboard 2020-02-07 16:11:39 +01:00
Patrick Jentsch
e04f3d0ac3 Some fixes 2020-02-07 16:00:48 +01:00
Patrick Jentsch
00238e83c3 Update merge images name 2020-02-07 15:29:07 +01:00
Patrick Jentsch
b65b80fb3c Fix display without roadmap 2020-02-07 15:23:39 +01:00
Patrick Jentsch
acf5ae32ae Add roadmap and use just one template 2020-02-07 15:21:59 +01:00
Patrick Jentsch
3ce28de053 rerename 2020-02-06 09:52:14 +01:00
Patrick Jentsch
bb0f2e43bb Rename merge images to concat images 2020-02-06 09:50:57 +01:00
Stephan Porada
004e85aad0 Add expert view in a hacky way 2020-02-05 16:09:59 +01:00
Patrick Jentsch
692b887d99 Add some documentation and code style 2020-02-04 10:10:22 +01:00
Patrick Jentsch
1d47e38780 Update 2020-02-03 16:04:47 +01:00
Patrick Jentsch
14cf2c55f9 Fix result addition 2020-02-03 15:58:46 +01:00
Stephan Porada
ccb97d5773 Add match nr 2020-02-03 13:59:37 +01:00
Stephan Porada
da766b32ca mv socket on event on match_context to nopaque.js 2020-02-03 13:01:26 +01:00
Stephan Porada
21371efde6 Continue new list building for results 2020-02-03 12:58:40 +01:00
Stephan Porada
e95cc42a22 Add empty template 2020-02-03 09:59:39 +01:00
Patrick Jentsch
ca4c199191 Update user page to use ressource lists 2020-01-31 14:16:25 +01:00
Patrick Jentsch
279cdb70a8 Remove a lot of code redundancy 2020-01-31 14:14:08 +01:00
Patrick Jentsch
87cf04a87f Try to make the JavaScript a bit less pythonic. :D 2020-01-31 13:41:46 +01:00
Patrick Jentsch
56315c4e33 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-31 13:11:35 +01:00
Patrick Jentsch
20200dac30 Simplify corpus and job list data structure. 2020-01-31 13:11:30 +01:00
Stephan Porada
d03e04bcb9 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-30 14:23:21 +01:00
Stephan Porada
d36598bdda Update new analysis list construction 2020-01-30 14:23:19 +01:00
Patrick Jentsch
6e20e00c4e Change models 2020-01-30 11:01:17 +01:00
Patrick Jentsch
3dad22d41a Move JobList static attributes 2020-01-29 16:34:50 +01:00
Stephan Porada
da4cc75943 Work on new list bilding 2020-01-29 16:12:57 +01:00
Patrick Jentsch
c1adcb93ee insert null values instead of empty attributes 2020-01-29 13:57:38 +01:00
Patrick Jentsch
bd8d0c14c3 Merge list classes 2020-01-29 10:50:31 +01:00
Patrick Jentsch
26e767609a use small buttons. 2020-01-28 17:01:20 +01:00
Patrick Jentsch
59866dea97 Add job bundle download preview 2020-01-28 16:42:40 +01:00
Patrick Jentsch
c9f5488a24 use empty template for JobList and CorpusList. performance++ 2020-01-28 16:42:15 +01:00
Patrick Jentsch
f1ab50b283 Change event names 2020-01-28 10:08:09 +01:00
Stephan Porada
4b0e9392a7 NEw analysis stuff 2020-01-27 16:11:34 +01:00
Stephan Porada
b4427cd3ec Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-27 13:19:34 +01:00
Stephan Porada
2b1e8f34de Rename some stuff 2020-01-27 13:19:33 +01:00
Patrick Jentsch
2c0f009e7c Change corpus analysis init behavior 2020-01-27 13:18:54 +01:00
Patrick Jentsch
cd02046590 Remove add_job.js 2020-01-24 11:58:11 +01:00
Patrick Jentsch
6a4ad05c35 Integrate job list javascript in nopaque.js 2020-01-24 10:27:11 +01:00
Stephan Porada
4dce792b51 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-23 16:00:52 +01:00
Stephan Porada
87d6380e22 Rework corpus analysis list building part 1 2020-01-23 16:00:48 +01:00
Patrick Jentsch
2dafe5ff0f Fix nopaque toast 2020-01-23 12:06:30 +01:00
Patrick Jentsch
77f1bf6cc8 not working test 2020-01-23 11:19:37 +01:00
Patrick Jentsch
88873c8aee Dynamic data collection from forms 2020-01-23 09:43:51 +01:00
Patrick Jentsch
fb089d62f0 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-22 16:14:03 +01:00
Patrick Jentsch
6bafa68804 Add test package for socketio form submission 2020-01-22 16:14:00 +01:00
Stephan Porada
50df7e0ab0 Do some cosmetics and code style 2020-01-21 15:39:08 +01:00
Stephan Porada
2142fb14af Add second iteration of json download 2020-01-21 14:50:27 +01:00
Stephan Porada
d6fdf69e81 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-20 15:53:56 +01:00
Stephan Porada
74e5c47e3b Enhance analysis UI add first iteration of results download 2020-01-20 15:53:53 +01:00
Stephan Porada
5c5f7012eb Remove redundant info 2020-01-20 15:53:06 +01:00
Patrick Jentsch
e2dada4dc9 Remove old version 2020-01-20 15:32:38 +01:00
Patrick Jentsch
ed0ec31246 Fix non unique id error 2020-01-20 11:11:53 +01:00
Patrick Jentsch
3e85daf8ab Create and use a nopaque namespace for functions and ressources 2020-01-20 09:49:39 +01:00
Stephan Porada
cc52744109 Add cheese to all toasts. 2020-01-17 15:10:11 +01:00
Stephan Porada
e5928731ec Enhance toast to grilled cheese toast! 2020-01-17 15:10:01 +01:00
Stephan Porada
9ee2e9bdbd Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-17 14:31:20 +01:00
Stephan Porada
e4b794d37c Add tmp List.js implemetation 2020-01-17 14:31:14 +01:00
Patrick Jentsch
cebe1c6d31 move dropdown menu code 2020-01-17 11:46:30 +01:00
Patrick Jentsch
501eb3756c Minor updates 2020-01-17 10:49:04 +01:00
Patrick Jentsch
04bfe108c3 Javascript cleanup 2020-01-17 10:42:02 +01:00
Patrick Jentsch
554cc735b0 Tune the new job modal 2020-01-16 15:24:24 +01:00
Patrick Jentsch
b0d1ba472b Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-16 15:04:17 +01:00
Patrick Jentsch
688591ebe8 Add sort function to corpus and job lists 2020-01-16 15:04:12 +01:00
Stephan Porada
e04b31d282 Add error handling of invalid CQP queries 2020-01-16 11:56:16 +01:00
Patrick Jentsch
ef1eb9976e Change query result display 2020-01-15 16:04:33 +01:00
Patrick Jentsch
9353a3d5db Change corpus analyse ui 2020-01-15 15:52:42 +01:00
Patrick Jentsch
88f87da86c Change scaling 2020-01-15 13:45:57 +01:00
Patrick Jentsch
8dcf195e1b Use tables instead of collections in admin user view 2020-01-15 13:20:20 +01:00
Patrick Jentsch
91da024f36 Remove unneccessary code 2020-01-15 13:20:04 +01:00
Patrick Jentsch
32f2d7dbf7 New corpus and job lists. 2020-01-15 10:52:51 +01:00
Patrick Jentsch
9862d32dbb Use default values for lists in admin user page 2020-01-13 15:35:21 +01:00
Patrick Jentsch
8c69c3881f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-13 15:33:11 +01:00
Patrick Jentsch
310c652514 Package cleanup and add LICENSE files! 2020-01-13 15:33:05 +01:00
Stephan Porada
446eca2d22 Add function to edit new metadata fields 2020-01-10 12:13:42 +01:00
Stephan Porada
cee89dd712 continue additional metadata 2020-01-10 11:29:26 +01:00
Stephan Porada
e1a8fbc531 Add options to add more detailed metadate to corpus file 2020-01-09 16:04:52 +01:00
Stephan Porada
96700586c8 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-08 16:02:49 +01:00
Stephan Porada
8e02c2fd14 Add more metadate to corpus files 2020-01-08 16:02:42 +01:00
Patrick Jentsch
2308ed9a87 Add missing ";" 2020-01-08 13:20:56 +01:00
Patrick Jentsch
4446260c10 Change the way how the dismiss feature is added to toasts. 2020-01-08 10:47:59 +01:00
Patrick Jentsch
8416bda04b Add Icon and color for "merge_images" service. 2020-01-08 10:18:15 +01:00
Patrick Jentsch
6d65521000 Make toasts eckig again! 2020-01-08 10:16:49 +01:00
Patrick Jentsch
5aa4fcd66f Add close function for Toasts 2020-01-08 10:13:58 +01:00
Patrick Jentsch
a7e94b8c9b Add merge images functionality. 2020-01-07 14:39:01 +01:00
Stephan Porada
0b0838f6e0 Fix typo 2020-01-07 13:05:44 +01:00
Stephan Porada
f189460543 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2020-01-07 13:03:44 +01:00
Stephan Porada
93891a34c9 Add form and service 2020-01-07 13:03:42 +01:00
Patrick Jentsch
0a3f2d3a67 Add newer nlp version 2020-01-07 11:34:16 +01:00
Patrick Jentsch
e240bf7860 Show prepare button if status switches to failed. 2019-12-05 15:58:28 +01:00
Patrick Jentsch
19651433cd Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-04 11:03:49 +01:00
Stephan Porada
947e9f984b Add loading animation for query request 2019-12-04 10:54:40 +01:00
Patrick Jentsch
90c12e5800 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-04 10:40:15 +01:00
Patrick Jentsch
904e36a8bb Fix js 2019-12-04 10:40:11 +01:00
Stephan Porada
c3fe3d9247 Change loading animation 2019-12-04 10:31:01 +01:00
Stephan Porada
31ac9ddcf3 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-03 15:11:40 +01:00
Stephan Porada
7ec41a03be Add Inspect view 2019-12-03 15:11:31 +01:00
Patrick Jentsch
ccfd449260 Rename analysis container 2019-12-03 11:46:56 +01:00
Stephan Porada
94e8d0895c Add first things to get more context for one match. 2019-12-02 16:13:53 +01:00
Stephan Porada
d2334e6a1e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-12-02 14:19:51 +01:00
Stephan Porada
3af400a732 Add get_sentences to wrapper 2019-12-02 14:19:40 +01:00
Patrick Jentsch
ae30ba7186 Change email template to fit new name 2019-12-02 12:03:50 +01:00
Patrick Jentsch
f63a850175 Renaming: opaque->nopaque 2019-12-02 11:34:28 +01:00
Patrick Jentsch
da2f7f6c7d Updates for stack deployment 2019-12-02 11:06:46 +01:00
Stephan Porada
1c9e715980 Fixe some things for query results 2019-11-28 15:19:52 +01:00
Stephan Porada
dbd580b3c0 Get results with wrapper 3.0 2019-11-28 14:14:56 +01:00
Patrick Jentsch
dec90e30b5 better tooltips 2019-11-28 13:45:00 +01:00
Patrick Jentsch
9b71fb0cc9 Add tooltips to query ui 2019-11-28 12:09:25 +01:00
Patrick Jentsch
49311f58f0 Add basic style for expert view 2019-11-27 15:56:39 +01:00
Patrick Jentsch
54f3036d89 push 2019-11-27 13:29:43 +01:00
Patrick Jentsch
5411bd91bd Fix imports and hardcoded values 2019-11-27 10:18:15 +01:00
Stephan Porada
b5afdf74f2 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-27 09:41:22 +01:00
Stephan Porada
b3d5c15df3 CQiWrapper new data structure 2019-11-27 09:41:21 +01:00
Patrick Jentsch
d63b5ec266 Handle new data structure 2019-11-27 09:36:27 +01:00
Patrick Jentsch
9f42b9b99d Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-26 14:58:48 +01:00
Patrick Jentsch
5336eac2c9 fix stack deploy yml 2019-11-26 14:58:33 +01:00
Patrick Jentsch
7edd635573 fix socketio redis 2019-11-26 14:58:21 +01:00
Stephan Porada
00d61a7bf5 Add sentences to results 2019-11-26 11:48:54 +01:00
Stephan Porada
52b7202017 Fix CQiClient 2019-11-26 11:48:42 +01:00
Patrick Jentsch
6c9b43367b push 2019-11-25 12:31:48 +01:00
Patrick Jentsch
0f23cbe2a2 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-25 11:56:30 +01:00
Patrick Jentsch
2fc092285c Dinge 2019-11-25 11:56:27 +01:00
Stephan Porada
d23656ae80 Some fixes 2019-11-25 11:51:56 +01:00
Patrick Jentsch
eeed9268bb Remove gzip compression 2019-11-25 10:29:05 +01:00
Patrick Jentsch
3d8d2b3e48 Codestyle update 2019-11-25 10:12:39 +01:00
Patrick Jentsch
dd469386e1 change socket logic 2019-11-22 14:13:14 +01:00
Stephan Porada
e52622a5d5 First result view 2019-11-21 16:05:17 +01:00
Stephan Porada
fd2547de0c Add compression of result dictionary and size infos for other compression or no compression methods 2019-11-21 16:05:00 +01:00
Stephan Porada
e6b27b0970 Add first setup for compression 2019-11-19 15:21:42 +01:00
Stephan Porada
1f74ad8a8e Add Wrapper Version 2.0 2019-11-19 11:48:00 +01:00
Patrick Jentsch
e3db29e476 Change container name for analysis 2019-11-19 11:42:23 +01:00
Patrick Jentsch
88b0907fc5 Fix for loop 2019-11-19 10:23:47 +01:00
Patrick Jentsch
fb5d9cbf7d Add errors to form, if they occur 2019-11-19 09:54:31 +01:00
Stephan Porada
96db5c1e75 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-18 16:07:12 +01:00
Stephan Porada
0ca4bf6030 Add first query result function 2019-11-18 16:07:07 +01:00
Patrick Jentsch
9a475f2ad2 Remove job deletion workaround 2019-11-18 15:55:19 +01:00
Patrick Jentsch
6d807d897d Update add job js 2019-11-18 15:41:32 +01:00
Stephan Porada
5c8ca4e22d Fix imports 2019-11-18 14:29:16 +01:00
Stephan Porada
14e869b2dd Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-18 14:26:39 +01:00
Stephan Porada
ba0e82738a Some template stuff 2019-11-18 14:24:47 +01:00
Stephan Porada
ae6e252830 Temp event query handling 2019-11-18 14:24:31 +01:00
Stephan Porada
5fdd67ebf2 Add new CQiWrapper 2019-11-18 14:24:13 +01:00
Patrick Jentsch
ab0e79ac3b Change add job handling (preparation for api processing) 2019-11-18 14:23:53 +01:00
Patrick Jentsch
8d47d16319 Remove debug statement 2019-11-18 11:22:28 +01:00
Patrick Jentsch
7a94b19326 Fix wrong job additions 2019-11-18 11:21:40 +01:00
Patrick Jentsch
0cd4be055e Change corpus analysis socket behavior 2019-11-18 11:08:33 +01:00
Patrick Jentsch
fc560933bc Change edit user form name 2019-11-15 14:01:36 +01:00
Patrick Jentsch
5fd9711da9 Simplify db lookup for queries by id 2019-11-15 13:09:12 +01:00
Patrick Jentsch
7457a4be94 Move admin tables in admin package. 2019-11-15 12:57:01 +01:00
Patrick Jentsch
aacfe40bd6 Code enhancement 2019-11-15 12:51:53 +01:00
Patrick Jentsch
f22bff4ed0 Updated URL Logic for admin package 2019-11-15 11:45:04 +01:00
Patrick Jentsch
74324ac0be Remove back to corpus button 2019-11-14 16:15:24 +01:00
Patrick Jentsch
3fb5802682 Cleanup corpus analysis code 2019-11-14 15:53:43 +01:00
Patrick Jentsch
df98f3a900 Change HTML for corpus analysis 2019-11-14 15:34:07 +01:00
Patrick Jentsch
1b02d73d66 Update background functions 2019-11-14 13:40:05 +01:00