169 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Augusto Dwenger	99cb294e3c	Merge branch 'dev' into 'master' ... Releasing 1.0 to master See merge request berufsschul-ae/solatium!13	2019-09-27 07:46:18 +00:00
Dwenger	e6cc25ebb0	setup for release	2019-09-27 09:20:56 +02:00
Dwenger	4f50063ac1	Merge branch 'feature/readme' into dev	2019-09-27 09:16:51 +02:00
Dwenger	b6554ab857	add docker setup, add small changes and redone the structure	2019-09-27 09:14:31 +02:00
Blazej	8e40abb4ef	Merge branch 'dev' into feature/readme	2019-09-27 08:31:30 +02:00
Blazej	bc48c6d895	Added Readme	2019-09-27 08:30:52 +02:00
Bjarne Voigtländer	cc0db59b8f	Merge branch 'feature/website_redesign' into 'dev' ... Redesign See merge request berufsschul-ae/solatium!12	2019-09-26 11:45:44 +00:00
Dwenger	6025ef030e	fix template	2019-09-26 11:10:07 +02:00
Bjarne Voigtländer	af70d4c912	redesign ... added external css	2019-09-26 10:57:43 +02:00
Dwenger	62a9a40bfc	cleanup and refactoring -> simplifying the docker building jobs	2019-09-26 10:55:42 +02:00
Dwenger	9ebef3eea4	add new user	2019-09-25 10:54:27 +02:00
Dwenger	cd23dadfb9	change directory to run app in path	2019-09-25 10:54:19 +02:00
Dwenger	5ad2479c3e	add param to skip maven test on startup	2019-09-25 10:53:52 +02:00
Dwenger	b6c4be22e6	adding docker-compose	2019-09-25 10:52:40 +02:00
Dwenger	37956077e2	Merge branch 'feature/block_chain_persistence_ingtgration' into dev	2019-09-24 21:32:07 +02:00
Dwenger	1b6752d4ef	add ignore to the directory for the persistence block save	2019-09-24 21:30:55 +02:00
Dwenger	11998edd08	change name of the bash script to match tests	2019-09-24 21:29:47 +02:00
Dwenger	eef592028f	cleanup and refactoring	2019-09-24 21:06:04 +02:00
Dwenger	905b4d4c7f	add persistence for the blockChain	2019-09-24 20:49:58 +02:00
Dwenger	f3415ada9a	final docker build	2019-09-23 21:58:36 +02:00
Dwenger	6cfddd69af	add docker as service	2019-09-23 21:48:42 +02:00
Dwenger	cf1543e81a	add forgotten mvn wrapper	2019-09-23 21:45:28 +02:00
Dwenger	bdc64b96da	remove local java var	2019-09-23 21:43:34 +02:00
Dwenger	c81b3c8b69	local java var	2019-09-23 21:34:03 +02:00
Dwenger	f85337c257	move to first stage to test it	2019-09-23 21:31:27 +02:00
Dwenger	ad5256198b	fix image naming error	2019-09-23 21:28:45 +02:00
Dwenger	a6732a5e6d	add custom image for docker with jdk8	2019-09-23 21:18:00 +02:00
Dwenger	5589a74c9f	use maven wrapper for building docker image and change jacoco merge directory	2019-09-23 19:40:55 +02:00
Dwenger	580188732f	add docker image to be automatically build and pushed with the ci	2019-09-23 19:28:45 +02:00
Dwenger	9be7ea23f0	add coverage report for integration test, unit test and aggregated/merged	2019-09-23 17:57:49 +02:00
Dwenger	ab5876e7d6	remove coverage from mvn tests	2019-09-23 17:08:39 +02:00
Dwenger	57b7487ff9	fix not compiling test	2019-09-23 16:48:02 +02:00
Dwenger	50468f8c52	CI fine tuning jobs	2019-09-23 16:32:17 +02:00
Dwenger	a786b3b3c3	remove caching target and add coverage report to the unit-test	2019-09-23 14:51:16 +02:00
Blazej	d7eac247fc	augusto did an oopsie OwO	2019-09-23 14:31:07 +02:00
Blazej	72245f94f1	quality of life changes	2019-09-23 14:21:24 +02:00
Blazej	617e748f1b	testing pipeline should fail	2019-09-23 14:16:11 +02:00
Blazej	44d9b35818	Augusto forgot that the package isnt installed by default	2019-09-23 14:11:59 +02:00
Blazej	fc38f255e3	Merge branch 'dev' of https://gitlab.com/berufsschul-ae/solatium into dev	2019-09-23 14:06:07 +02:00
Blazej	c1f5ee1cdd	Added new fancy bash script for api testing	2019-09-23 14:05:47 +02:00
Blazej	2bd3de12c5	Removed unused import statments	2019-09-23 12:31:44 +02:00
Blazej	5144ff8ab5	Added more testcases for view controller	2019-09-23 12:31:20 +02:00
Dwenger	8e2b360ea0	refactoring and cleanup	2019-09-23 11:23:16 +02:00
Blazej	1a4e31455e	Removed most sonar code smells	2019-09-23 10:28:13 +02:00
Blazej	9154c7ce47	Merge branch 'dev' into feature/spring ... # Conflicts: # .gitlab-ci.yml	2019-09-23 09:22:27 +02:00
Blazej	f3cd9e1231	Removed Bug identified by sonar	2019-09-23 09:13:58 +02:00
hamburghammer	4430ff7d1c	add dockerignore	2019-09-22 22:43:19 +02:00
hamburghammer	055e505c4e	add artifacts	2019-09-22 22:14:52 +02:00
hamburghammer	27b530e93d	refactor controller methods to public	2019-09-22 20:41:32 +02:00
hamburghammer	8babc8ec0d	remove spelling error	2019-09-22 20:40:24 +02:00