Commit Graph
100 Commits
Author SHA1 Message Date
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
Stephan Porada c7337a5277 Add first stopping and deletion functions etc. 2019-09-11 14:51:59 +02:00
Stephan Porada 230d057fee Add simple logging 2019-09-11 14:50:29 +02:00
Stephan Porada d537096f74 Add user self delete function 2019-09-10 14:18:20 +02:00
Stephan Porada 2f6dd37abb Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-10 13:49:14 +02:00
Stephan Porada fda70e216e Add admin page to edit user informations. 2019-09-10 13:49:01 +02:00
Stephan Porada 8786defa01 Add function to change user email 2019-09-09 16:17:59 +02:00
Stephan Porada 35d126aaea Make admin user list sortable part 2 2019-09-09 15:04:43 +02:00
Stephan Porada c7aae83438 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-09 15:02:25 +02:00
Stephan Porada 7775954123 Make admin user list sortable. 2019-09-09 15:02:17 +02:00
Stephan Porada 9ba7989fcc Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-05 14:47:36 +02:00
Stephan Porada 8d7f053a4c Add postgresql database 2019-09-05 14:43:36 +02:00
Stephan Porada f8bee3553d Dockerize opaque flask app with docker-compose – first step 2019-09-04 14:51:46 +02:00
Stephan Porada c6184976b8 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-04 14:50:33 +02:00
Stephan Porada c5dbc7db7f Remove old Job definitions 2019-09-04 14:50:18 +02:00
Stephan Porada e5ea98510e Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-08-28 10:54:50 +02:00
Stephan Porada 417a00269d Comment out scheduler. 2019-08-28 10:54:48 +02:00
Stephan Porada 9f011b27c3 Add redis message qeue 2019-08-26 14:21:06 +02:00
Stephan Porada 5771fb8ae7 Update README.md 2019-08-26 14:09:43 +02:00
Stephan Porada 2832dd8b6f Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-08-15 15:57:40 +02:00
Stephan Porada 388efbbd73 Add cascade deletion of jobs and corpora on user delete. 2019-08-15 15:57:27 +02:00
Stephan Porada bccf661957 Add new admin blueprint with new user delete feature. Reorganize templates etc. 2019-08-15 15:56:53 +02:00
Stephan Porada 388e0433fd Add searchable User table. 2019-08-08 16:06:41 +02:00
Stephan Porada a52ed253c0 Remove Jaas add Python 3.5 2019-08-08 13:46:55 +02:00
Stephan Porada 2ed63d9a5f Add migrations. 2019-08-06 14:28:19 +02:00
Stephan Porada 6f5bf674c6 Handle job creation with the new Job class. 2019-08-06 14:27:41 +02:00
Stephan Porada 175dbceac6 Add creation and registration dates. 2019-08-06 14:26:22 +02:00
Stephan Porada e30d3fc048 Remove old migrations for new Initial db commit. 2019-08-05 16:46:00 +02:00
Stephan Porada 94dcaa55a3 Add Job model. 2019-08-05 16:45:38 +02:00
Stephan Porada 8763e0f4db Add NLP template. Add Link to NLp template. 2019-08-05 15:36:18 +02:00
Stephan Porada a3039e0529 Comment --keep_intermediates 2019-08-05 15:35:51 +02:00
Stephan Porada 1092312e6d Add NLP view. 2019-08-05 15:35:18 +02:00
Stephan Porada 30f405bb88 Add some docstrings 2019-07-11 15:43:48 +02:00
Stephan Porada 4918d185c2 Add some docstrings to models.py 2019-07-11 15:33:48 +02:00
Stephan Porada ef25ba7545 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-07-10 14:36:33 +02:00
Stephan Porada 4ec9e2ff41 Add flask_table for admin view 2019-07-10 14:36:31 +02:00
Stephan Porada eef9ec9b37 Add title as context and remove wrong title from templates 2019-07-10 14:35:37 +02:00
Stephan Porada d7de198302 Add migrations 2019-07-10 10:48:11 +02:00
Stephan Porada 8458271a5c Add some tests 2019-07-09 15:41:28 +02:00
Stephan Porada 79cccd36ee Add Roles and Permission models so that only admins can access /admin 2019-07-09 15:41:16 +02:00
Stephan Porada 66d9ab8a93 Add custom error pages 2019-07-09 15:39:28 +02:00
Stephan Porada 26016458dd Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-07-09 15:38:53 +02:00
Stephan Porada 2f19052fcb Add new users 2019-07-09 15:38:41 +02:00
Stephan Porada 1db630b74a Add missing title into render_template 2019-07-09 15:38:21 +02:00
Stephan Porada da1ef0e1f1 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-07-09 11:54:58 +02:00
Stephan Porada 54181f21a2 Add new user 2019-07-09 11:54:29 +02:00
Stephan Porada 586bf8af37 Change maind.index to main.index 2019-07-09 10:17:58 +02:00
Stephan Porada 1ec93fa7d6 Add message to confirm account for unconfirmed users 2019-07-09 10:09:35 +02:00
Stephan Porada 68e1607af3 Change test user password 2019-07-08 16:23:52 +02:00
Stephan Porada 1936e1493d Add new password icon for login template 2019-07-08 16:09:28 +02:00
Stephan Porada 3b6c9f22dd Add email confirmation for nuew users 2019-07-08 16:09:00 +02:00
Stephan Porada 8c121a63de Add .j2 suffix for template files 2019-07-08 16:08:34 +02:00
Stephan Porada ce5179e10d Add .j2 suffix for template files 2019-07-08 16:07:46 +02:00
Stephan Porada 5069646b96 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-07-08 16:07:15 +02:00