Commit Graph
100 Commits
Author SHA1 Message Date
Stephan Porada 1f74ad8a8e Add Wrapper Version 2.0 2019-11-19 11:48:00 +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
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
Stephan Porada 5660318450 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-12 14:02:20 +01:00
Stephan Porada dfd9d09f3f Clean up 2019-11-12 14:02:01 +01:00
Stephan Porada 6459c9f064 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-12 12:08:11 +01:00
Stephan Porada 55cacf53fc Add JSON handling with emit and on 2019-11-12 12:08:09 +01:00
Stephan Porada d8b8c9f6e0 Remove unused import 2019-11-12 12:07:34 +01:00
Stephan Porada ffed8592c8 Add new CQiWrapper 2019-11-11 15:35:37 +01:00
Stephan Porada e0a1514084 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-07 15:58:24 +01:00
Stephan Porada 9be33ffc5a Add first tr to implement VQiWrapper 2019-11-07 15:51:01 +01:00
Stephan Porada 8e5e8408bd Add CQiWrapper 2019-11-07 15:48:47 +01:00
Stephan Porada 13421a9e7f Remove 2019-11-07 14:37:37 +01:00
Stephan Porada 7233c74dca Add some fixes 2019-11-07 13:56:21 +01:00
Stephan Porada 54c0d0f27d Fix app context 2019-11-07 10:55:23 +01:00
Stephan Porada 19f470ca18 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-07 10:48:10 +01:00
Stephan Porada 47440880d5 Set up all things for first query 2019-11-07 10:45:12 +01:00
Stephan Porada 0af783a5a6 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-06 15:40:47 +01:00
Stephan Porada 08aafb8f99 Add corpus analysis stuff 2019-11-06 15:40:43 +01:00
Stephan Porada 64dce7ed28 Set status on upload, edit, or delete 2019-11-06 10:04:29 +01:00
Stephan Porada 2d4559e4fe Show buttons only on wanted status 2019-11-06 10:04:01 +01:00
Stephan Porada d04f90dee8 Add live colors to corpu sstatus 2019-11-05 15:22:25 +01:00
Stephan Porada f2024be050 Add back button 2019-11-05 14:23:45 +01:00
Stephan Porada a288ce2ec3 Add merge_corpus_files to compose file for dev process 2019-11-05 14:06:36 +01:00
Stephan Porada a2f7f90137 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-05 09:57:57 +01:00
Stephan Porada efd3be5264 Add mount for development process 2019-11-05 09:57:52 +01:00
Stephan Porada 3bfe50b15c Add status for Corpus model 2019-11-04 14:12:15 +01:00
Stephan Porada ce39b24937 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-04 13:19:20 +01:00
Stephan Porada 9c611afdc3 Emit query data via socketio 2019-11-04 13:19:15 +01:00
Stephan Porada fa61f97413 Add recv_query event for testing 2019-11-04 13:18:55 +01:00
Stephan Porada 85629aa006 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-11-04 09:52:59 +01:00
Stephan Porada 60f1cb7573 Revert to view per formular in user settings 2019-11-04 09:52:55 +01:00
Stephan Porada 61545ed4ec Push one fix idea for multiple forms 2019-10-31 13:19:18 +01:00
Stephan Porada 4d953f85f7 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-30 15:16:42 +01:00
Stephan Porada e9ef0d1391 Add new profile forms and views (error prone) 2019-10-30 15:16:37 +01:00
Stephan Porada dcea3ea8e2 Add corpus analysis fix 2019-10-30 14:15:06 +01:00
Stephan Porada 30eefbcb72 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-30 14:06:25 +01:00
Stephan Porada 0dc015b29c Add more form fields to corpus analysis 2019-10-30 14:06:23 +01:00
Stephan Porada f586518e9a Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-29 17:44:24 +01:00
Stephan Porada 31c015f761 Add query analysis form options etc. 2019-10-29 17:42:32 +01:00
Stephan Porada 5f29112390 Fix some things 2019-10-29 09:51:47 +01:00
Stephan Porada 2534b4cae7 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-28 09:18:12 +01:00
Stephan Porada b46090133d Add first iteration of query and analysis corpora page 2019-10-28 09:16:34 +01:00
Stephan Porada 3e622ac553 Add first Corpus analysis page 2019-10-24 13:14:15 +02:00
Stephan Porada dce834c9a1 Add full_width and limited_width templates. 2019-10-24 13:13:34 +02:00
Stephan Porada 6f8a8dbc77 Fix mount path 2019-10-23 15:21:34 +02:00
Stephan Porada c0fab4aef3 Add bash ti image 2019-10-23 14:42:23 +02:00
Stephan Porada f919e97446 Fix wait-for-it clone 2019-10-23 14:15:45 +02:00
Stephan Porada 5774b5120d Add git install to Dockerfile 2019-10-23 14:05:23 +02:00
Stephan Porada ad6daa35cc Add wait-for-it.sh 2019-10-23 13:58:27 +02:00
Stephan Porada f324bc9f3b Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-23 13:31:01 +02:00
Stephan Porada 02c4f814b8 Mount config.ini into daemon container 2019-10-23 13:30:54 +02:00
Stephan Porada 5eb13f2ab5 Add migrations 2019-10-23 11:23:29 +02:00
Stephan Porada bf4b9808c3 Fix undefined JobList error 2019-10-23 11:23:06 +02:00
Stephan Porada afac42464a Add CurpusFile result relation to Corpus 2019-10-23 11:22:29 +02:00
Stephan Porada 488baf0b67 Fix new results table view 2019-10-22 15:28:54 +02:00
Stephan Porada 64f0082471 Add storage mount to daemon 2019-10-22 13:07:06 +02:00
Stephan Porada 83d6839fd7 Add new results table view 2019-10-22 13:06:57 +02:00
Stephan Porada bafa522eae Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-10-17 13:33:19 +02:00
Stephan Porada fcfcd7032d Add migrations. 2019-10-17 13:33:16 +02:00
Stephan Porada 82fb73de1a Add new realtion 2019-10-17 13:32:22 +02:00
Stephan Porada 88042dfd8e Add dark mode 2019-10-09 16:10:30 +02:00
Stephan Porada a8489a5550 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-24 17:10:23 +02:00
Stephan Porada b05718c03d Fix result file order. 2019-09-24 17:10:18 +02:00
Stephan Porada a267de0867 Add cancel button to delete modal. 2019-09-24 16:21:22 +02:00
Stephan Porada 6d3ccce83f Fix QueuePool size timeout error. 2019-09-24 16:16:55 +02:00
Stephan Porada 202ab2e0de Add download icons to job page download buttons. 2019-09-24 16:16:30 +02:00
Stephan Porada 1f9137be47 Fix admin user page layout. 2019-09-24 16:16:01 +02:00
Stephan Porada 873997fbbf Sort result files for sorted download buttons. 2019-09-24 16:15:46 +02:00
Stephan Porada 695a57560f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-24 14:04:57 +02:00
Stephan Porada ed288598cd Add delete corpora function and function to view an delete foreign jobs and corpora. 2019-09-24 14:04:49 +02:00
Stephan Porada 9f74e8ce82 Fix typo 2019-09-18 13:12:49 +02:00
Stephan Porada 43a01b8de6 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-18 12:07:06 +02:00
Stephan Porada 5ad5bc0a2f Add foreign admin views 2019-09-18 12:06:34 +02:00
Stephan Porada daf6c15111 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-18 11:33:08 +02:00
Stephan Porada 1ebfee5cb3 Add admin view on foreign jobs. 2019-09-18 11:33:06 +02:00
Stephan Porada 0ea87de072 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-17 16:31:45 +02:00
Stephan Porada 0d060f0cbf Move job and user delete functions to utils.py 2019-09-17 16:31:41 +02:00
Stephan Porada 09f7d7ac68 Add delete functions for jobs and users. 2019-09-17 14:36:15 +02:00
Stephan Porada ba838eaf1f Enhance delete_job method. 2019-09-16 14:09:07 +02:00
Stephan Porada 1bdae333b7 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-12 16:45:12 +02:00
Stephan Porada b2e2484725 Add job delete function. 2019-09-12 16:45:05 +02:00
Stephan Porada 2991082f1f Add different logging levels. 2019-09-12 16:44:53 +02:00
Stephan Porada 682ca30991 Fix logging. 2019-09-12 12:01:46 +02:00
Stephan Porada 2368cfb1f9 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-12 11:42:40 +02:00
Stephan Porada 86b08bc142 Add logging for production. Mount web.env into opaque_daemon. 2019-09-12 11:42:33 +02:00
Stephan Porada 926935af56 Enhance logging. 2019-09-12 11:35:23 +02:00
Stephan Porada 9f341293b9 Update README.md 2019-09-11 16:25:56 +02:00
Stephan Porada 50b21d056d Update .gitignore 2019-09-11 16:19:44 +02:00
Stephan Porada 26be218293 Update .gitignore 2019-09-11 16:11:06 +02:00
Stephan Porada 59f0018516 Update .gitignore 2019-09-11 16:09:19 +02:00
Stephan Porada 05043e16e8 Update .gitignore 2019-09-11 15:55:44 +02:00
Stephan Porada 66adec8b7d Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-11 15:53:51 +02:00
Stephan Porada 3accc058e3 Correct simple loging 2019-09-11 15:52:38 +02:00
Stephan Porada 0826f6a9f7 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-11 14:53:15 +02:00