Commit Graph

1826 Commits

Author SHA1 Message Date
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
Patrick Jentsch
787bf4c377 Unify service pages. 2019-09-24 16:55:24 +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
Patrick Jentsch
300832d403 further ui improvements 2019-09-24 13:42:30 +02:00
Patrick Jentsch
3cf42832f5 Add additional options to ocr form. 2019-09-24 12:03:24 +02:00
Patrick Jentsch
4858f36d76 Codestyle for auth package. 2019-09-23 16:39:36 +02:00
Patrick Jentsch
5749c94bca Codestyle for admin package. 2019-09-23 16:25:26 +02:00
Patrick Jentsch
783b8c7e82 Move auth.settings to a new package (profile) as profile.index 2019-09-23 16:11:01 +02:00
Patrick Jentsch
5da5e402c0 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-23 14:37:03 +02:00
Patrick Jentsch
4aba8cbd51 Change border 2019-09-23 14:36:52 +02:00
Patrick Jentsch
556e6a0ae2 Update README.md 2019-09-23 14:24:09 +02:00
Patrick Jentsch
8ba1d43f33 Further styling for ocr job form. 2019-09-23 14:10:27 +02:00
Patrick Jentsch
4c8ab6b3c1 Add dummy checkboxes for further ocr job options. 2019-09-23 13:55:25 +02:00
Patrick Jentsch
2d84c11282 Update .gitlab-ci.yml 2019-09-19 09:23:20 +02:00
Patrick Jentsch
3e3918c672 Update .gitlab-ci.yml 2019-09-19 09:22:18 +02:00
Patrick Jentsch
d269249db0 Only use one generic function for socketio background tasks and rename the socketio event (it's no connect so don't name it like one) 2019-09-18 14:05:56 +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
Patrick Jentsch
f9649af08d Make CorpusList class ready for admin view. 2019-09-18 11:35:25 +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
Patrick Jentsch
b90d6114b0 Make JobList class ready for admin view. 2019-09-18 11:32:35 +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
Patrick Jentsch
d7e71638a2 Update progress modal 2019-09-17 16:15:37 +02:00
Stephan Porada
09f7d7ac68 Add delete functions for jobs and users. 2019-09-17 14:36:15 +02:00
Patrick Jentsch
683b59bb47 Add function to cancel file upload. 2019-09-17 14:20:15 +02:00
Patrick Jentsch
07c4e31510 Use modals instead of toasts for progress indication. 2019-09-17 10:56:56 +02:00
Patrick Jentsch
70c97d44f9 Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development 2019-09-17 10:00:45 +02:00
Patrick Jentsch
3cacdf8185 Set version for latest. 2019-09-17 10:00:39 +02:00
Patrick Jentsch
373c7ed4d9 Update .gitlab-ci.yml 2019-09-16 15:58:42 +02:00
Stephan Porada
ba838eaf1f Enhance delete_job method. 2019-09-16 14:09:07 +02:00
Patrick Jentsch
9005c583ca Add progress bar for file upload. 2019-09-16 12:12:42 +02:00
Patrick Jentsch
22a1223258 Codestyle 2019-09-13 14:02:17 +02:00
Patrick Jentsch
1118beaf61 Add storage as volume 2019-09-13 14:01:57 +02:00
Patrick Jentsch
3913663c56 Don't use migrate in setup-database routine. 2019-09-13 09:35:20 +02:00
Patrick Jentsch
6333c88d36 Add new migrations. 2019-09-13 09:32:30 +02:00
Patrick Jentsch
a1386c3e0b Delete migrations from repo 2019-09-13 09:27:01 +02:00
Patrick Jentsch
3a5725d943 Update .gitignore 2019-09-13 09:25:39 +02:00
Patrick Jentsch
f32f3c7fa6 Use logging again 2019-09-13 09:22:10 +02:00
Patrick Jentsch
df0e677198 Comment out logger code. 2019-09-13 08:49:23 +02:00
Patrick Jentsch
591850bbfd Set unbuffered binary stdout and stderr. 2019-09-13 08:49:00 +02:00