225 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
cami	46ce8655f3	renamed some thigns	2021-07-13 20:25:02 +02:00
cami	b335a471cb	Merge pull request 'Fix broken backend connection in prod build (fix #151)' (#152) from infra/backendconnection into main ... Reviewed-on: #152	2021-07-13 18:06:06 +00:00
cami	ccd53bc2a1	replaced useState from dev.react to stable	2021-07-13 20:04:56 +02:00
cami	07e83e2f00	added working nginx configuration	2021-07-13 20:03:51 +02:00
cami	d72367ccaa	removed port mapping in backend as it's not needed	2021-07-13 20:03:20 +02:00
cami	bab0f6bce5	Merge pull request 'added proxy_pass' (#150) from infra/docker-compose-fix into main ... Reviewed-on: #150	2021-07-13 16:14:38 +00:00
cami	ee04215382	added proxy_pass	2021-07-13 18:13:46 +02:00
cami	9e16129aa5	Merge pull request 'Updated docker-compose file for production use' (#149) from infra/docker-compose-fix into main ... Reviewed-on: #149	2021-07-12 22:39:24 +00:00
cami	d28964dd1f	added nginx back :-)	2021-07-13 00:38:46 +02:00
cami	1b7aba4a70	Updated docker-compose file for production use	2021-07-13 00:08:36 +02:00
cami	7e77a67aac	Merge pull request 'Removed nginx to test if it works without' (#148) from infra/bugfix into main ... Reviewed-on: #148	2021-07-12 21:48:10 +00:00
cami	97b7bc3212	Removed nginx to test if it works without	2021-07-12 23:47:39 +02:00
cami	18094fae3c	Merge pull request 'Update' (#147) from infra/bugfix into main ... Reviewed-on: #147	2021-07-12 21:14:16 +00:00
cami	599f6a2e52	Update	2021-07-12 23:13:53 +02:00
cami	ccd7dfb0e0	Merge pull request 'new npm things..' (#146) from infra/bugfix into main ... Reviewed-on: #146	2021-07-12 21:10:25 +00:00
cami	3b0288dc35	new npm things..	2021-07-12 23:09:49 +02:00
cami	09bbb2e2a4	Merge pull request 'bugfixing..' (#145) from infra/bugfix into main ... Reviewed-on: #145	2021-07-12 20:59:56 +00:00
cami	f4e501458e	bugfixing..	2021-07-12 22:59:34 +02:00
cami	d9f87eb26d	Merge pull request 'Removed react scripts' (#144) from infra/bugfix into main ... Reviewed-on: #144	2021-07-12 20:48:36 +00:00
cami	3965859f0d	Removed react scripts	2021-07-12 22:47:47 +02:00
cami	0ea048048b	Merge pull request 'Use prod build for public things' (#143) from cicd2 into main ... Reviewed-on: #143	2021-07-12 20:38:55 +00:00
cami	5d15fbcd3d	Use prod build for public things	2021-07-12 22:38:20 +02:00
cami	a065ce33c8	Merge pull request 'update' (#142) from cicd2 into main ... Reviewed-on: #142	2021-07-12 20:25:51 +00:00
cami	e98ae905ce	update	2021-07-12 22:25:17 +02:00
cami	9475e61246	Merge pull request 'Update context' (#141) from cicd2 into main ... Reviewed-on: #141	2021-07-12 17:06:19 +00:00
cami	fbbea1a8d1	Update context	2021-07-12 19:05:33 +02:00
cami	8d5bf0f93b	Merge pull request 'Changed repos and added context insted of Dockerfile' (#140) from cicd/1 into main ... Reviewed-on: #140	2021-07-12 17:00:07 +00:00
cami	372de2498f	Changed repos and added context insted of Dockerfile	2021-07-12 18:57:15 +02:00
cami	a5791b3f63	Merge pull request 'doing things..' (#139) from cicd/1 into main ... Reviewed-on: #139	2021-07-12 00:43:43 +00:00
cami	4266bb2723	doing things..	2021-07-12 02:43:08 +02:00
cami	23e7cb328d	Merge pull request 'added things' (#138) from cicd/1 into main ... Reviewed-on: #138	2021-07-12 00:42:06 +00:00
cami	69ec1d1dab	added things	2021-07-12 02:41:18 +02:00
cami	9b344c1138	Merge pull request 'added backend logging' (#136) from enhancement/cicd into main ... Reviewed-on: #136	2021-07-12 00:36:28 +00:00
cami	504e43258b	added backend logging	2021-07-12 02:36:07 +02:00
cami	649c80b5fc	Merge pull request 'doing some things' (#135) from enhancement/cicd into main ... Reviewed-on: #135	2021-07-12 00:34:15 +00:00
cami	123ece89be	removed empty things..	2021-07-12 02:34:01 +02:00
cami	6d044c3271	changed names and repos	2021-07-12 02:27:31 +02:00
cami	c9a01ac68e	Two docker files	2021-07-12 02:24:19 +02:00
cami	8c91f0baaf	doing some things	2021-07-12 02:19:28 +02:00
cami	8fec13cad4	Merge pull request 'feature/cicd' (#134) from feature/cicd into main ... Reviewed-on: #134	2021-07-12 00:13:19 +00:00
cami	e81e079727	drone experiment	2021-07-12 02:09:09 +02:00
cami	5ab66c1e67	removed steps things	2021-07-12 02:00:08 +02:00
cami	ce74bdeb39	..	2021-07-12 01:58:26 +02:00
cami	638a924f96	remove autotag	2021-07-12 01:52:40 +02:00
cami	5bb2aa73e1	First drone-thing	2021-07-12 01:49:21 +02:00
cami	aa26855b43	Merge pull request 'Add behavior pages (fix #119)' (#130) from feature/behaviourpages into main ... Reviewed-on: #130	2021-07-11 23:29:57 +00:00
cami	92dfa04407	Merge pull request 'Removed default login (fix #54)' (#133) from bugfix/remove_default_login into main ... Reviewed-on: #133	2021-07-11 23:25:38 +00:00
cami	42720679ae	Removed default login (fix #54)	2021-07-12 01:25:07 +02:00
cami	84c997f17e	started backend with things	2021-07-12 01:07:34 +02:00
cami	fb5675eebd	changed some unused things	2021-07-12 01:06:53 +02:00