1505 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Patrick Jentsch	8115c8b755	Add Version selection to NLP	2019-09-11 15:40:37 +02:00
Patrick Jentsch	dd7ef2a113	Fix wrong path.	2019-09-11 14:55:26 +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
Patrick Jentsch	53428a01bb	Add workflow dummy entry.	2019-09-11 10:00:52 +02:00
Patrick Jentsch	1960b14d9d	Re- rename edit_profile to settings	2019-09-11 09:47:26 +02:00
Patrick Jentsch	15a418cf7c	Add navigation highlighting.	2019-09-10 16:09:35 +02:00
Patrick Jentsch	51d2623e2e	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-09-10 15:10:21 +02:00
Patrick Jentsch	cc9460c901	Add Account navigation links for medium and small devices.	2019-09-10 15:10:16 +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
Patrick Jentsch	48b5b09db1	Show locale time representation at corpus/job pages.	2019-09-10 13:40:26 +02:00
Patrick Jentsch	f87363ac13	Remove debug message.	2019-09-10 13:39:50 +02:00
Stephan Porada	8786defa01	Add function to change user email	2019-09-09 16:17:59 +02:00
Patrick Jentsch	97517339ff	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-09-09 15:21:35 +02:00
Patrick Jentsch	863db0a540	New storage path	2019-09-09 15:21:29 +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
Patrick Jentsch	295ed49799	Don't use named volumes.	2019-09-09 14:58:49 +02:00
Patrick Jentsch	dc975935ca	Use named volume for database	2019-09-09 12:05:36 +02:00
Patrick Jentsch	50a31967f2	Make compose file swarm ready.	2019-09-09 10:49:17 +02:00
Patrick Jentsch	a8395740b8	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development	2019-09-09 09:12:55 +02:00
Patrick Jentsch	cfc35b5ae7	After dockerization there are no __pycache__ directories. So we don't need to ignore them anymore.	2019-09-09 09:12:52 +02:00
Patrick Jentsch	28bf3b3c1d	After dockerization there are no __pycache__ directories. So we don't need to ignore them anymore.	2019-09-06 14:59:32 +02:00
Patrick Jentsch	d87c424ee7	Rename env files to match the service naming scheme.	2019-09-06 14:23:58 +02:00
Patrick Jentsch	94a1c61a0f	Add code as volume to enable live changes.	2019-09-06 14:00:16 +02:00
Patrick Jentsch	25cb960198	Rename services in compose.	2019-09-06 13:42:47 +02:00
Patrick Jentsch	444e1221df	Rename *_env -> *.env	2019-09-06 13:11:32 +02:00
Patrick Jentsch	a6fc0c7826	Rename examples to tpl files.	2019-09-06 13:03:59 +02:00
Patrick Jentsch	339e6b8de9	Add migrations directory to repo	2019-09-06 13:03:45 +02:00
Patrick Jentsch	fc69eedfea	Add CI script	2019-09-06 13:00:11 +02:00
Patrick Jentsch	b9a8c63aee	Dockerize the Application.	2019-09-06 11:38:35 +02:00
Patrick Jentsch	1044674074	Dockerize the App!	2019-09-05 16:39:50 +02:00
Patrick Jentsch	b34b46ae5d	Remove Merge marker.	2019-09-05 14:58:25 +02:00
Patrick Jentsch	e9da8befd4	Remove merge marker and readd TestingConfig class.	2019-09-05 14:49:59 +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
Patrick Jentsch	e3db2ecd1e	Load environment variables in container. So the python-dotenv module is no longer needed!	2019-09-05 14:42:21 +02:00
Patrick Jentsch	0f0c40951b	Use fix path!	2019-09-05 12:00:31 +02:00
Patrick Jentsch	78499ee731	Remove unused (since flask-socketio) FLASK_ENV variable.	2019-09-05 10:20:41 +02:00
Patrick Jentsch	78710ed58a	Add config selection to .env example.	2019-09-05 10:20:18 +02:00
Patrick Jentsch	40809d9c7b	Change setting names.	2019-09-05 10:12:40 +02:00
Patrick Jentsch	a05e37ddb6	Add .env example file.	2019-09-05 10:12:27 +02:00
Patrick Jentsch	f2806f9473	Codestyle.	2019-09-04 16:00:14 +02:00