93 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
hamburghammer	95828033ea	add manager for the controllers	2019-09-18 18:55:24 +02:00
hamburghammer	6b3c0ec6a9	Merge branch 'dev' into feature/javafx/login	2019-09-18 18:28:11 +02:00
hamburghammer	7b1c4af1bf	cleanup	2019-09-18 00:05:21 +02:00
hamburghammer	263d1c6e10	add wrong login label	2019-09-18 00:02:45 +02:00
hamburghammer	e42c88d167	add login with controller and set as startup	2019-09-17 23:46:52 +02:00
hamburghammer	bd0c645e4b	refactor LoggedInUser	2019-09-17 22:39:47 +02:00
hamburghammer	27ff0832b0	rename tests	2019-09-17 22:21:39 +02:00
hamburghammer	1dac2aac7d	move compile test to compile stage	2019-09-17 22:20:20 +02:00
hamburghammer	689bd60aa3	update maven image to jdk 11 and add test for compiling	2019-09-17 22:18:02 +02:00
hamburghammer	b1b6340b2d	update to java 11 and add javafx	2019-09-17 22:15:05 +02:00
hamburghammer	c4f56c0269	add singelton for logged in user	2019-09-17 21:53:25 +02:00
Blazej Josko	b05659bc52	Merge branch 'feature/block_chain_from_list' into 'dev' ... Feature/block chain from list See merge request berufsschul-ae/solatium!10	2019-09-16 10:08:28 +00:00
Augusto Dwenger	5746eef3a7	Merge branch 'feature/persistence' into 'dev' ... Feature/persistence See merge request berufsschul-ae/solatium!9	2019-09-16 10:07:13 +00:00
Augusto Dwenger	b1ebc652fd	Merge branch 'feature/Sorting' into 'dev' ... Feature/sorting See merge request berufsschul-ae/solatium!8	2019-09-16 10:06:54 +00:00
hamburghammer	57df8b6e65	add read persistenceBlockChain	2019-09-12 16:58:38 +02:00
Dwenger	3e247fc42f	WIP	2019-09-12 14:44:46 +02:00
Blazej	ff56c4cba8	Refactoring	2019-09-12 09:45:39 +02:00
Blazej	ef37504289	Merged Branches	2019-09-12 09:44:32 +02:00
hamburghammer	1a676aaae1	add writing and deserialize with jackson	2019-09-11 21:48:18 +02:00
hamburghammer	6e3e2e8598	add cTor for List<HashedBlock> and method to get genesisBlock	2019-09-11 16:24:12 +02:00
hamburghammer	9c7798edeb	rename test method to describe better the test	2019-09-11 16:08:19 +02:00
hamburghammer	5ec1f9a8cc	refactored to remove dependency from BlockChain to isolate the unit tests	2019-09-11 16:06:15 +02:00
Dwenger	3a17705db3	fix test with comparing toString	2019-09-11 12:48:02 +02:00
Blazej	495a119995	Problem occured while testing. Consulting Augusto.	2019-09-11 12:42:33 +02:00
Blazej	55d067e5f0	Changed Return Value to first item in List	2019-09-11 11:00:12 +02:00
Blazej	3f0ef1182b	Changed foreach loop to standard for loop	2019-09-11 10:59:09 +02:00
Dwenger	08937c438b	rename function	2019-09-11 10:55:06 +02:00
Blazej	9ff482c39c	Added Sorting algorithm.	2019-09-11 10:47:09 +02:00
Dwenger	2b4f111734	fix test on ci cauze empty dir get not committed	2019-09-10 21:05:37 +02:00
Dwenger	b566bf4510	Merge branch 'poc/gui' into feature/persistence	2019-09-10 20:59:35 +02:00
Dwenger	5b4d7cf7c8	WIP file write	2019-09-10 20:52:08 +02:00
Augusto Dwenger	226defcea6	Merge branch 'poc/gui' into 'dev' ... Poc/gui See merge request berufsschul-ae/solatium!7	2019-09-10 11:21:18 +00:00
Augusto Dwenger	5f94db4804	Poc/gui	2019-09-10 11:21:18 +00:00
Blazej	e39bcf5df0	Created new Class for Transaction Amount Type Conversion	2019-09-10 13:18:18 +02:00
Blazej	636debc030	Added Logger and Try/Catch	2019-09-10 11:56:45 +02:00
Blazej	4436b539a4	Senpai helped, showed how to add Class in Class OwO	2019-09-10 11:34:34 +02:00
Augusto Dwenger	14864a0e7c	Merge branch 'feature/accountBalance' into 'dev' ... Feature/account balance See merge request berufsschul-ae/solatium!6	2019-09-09 14:39:34 +00:00
Augusto Dwenger	26f10a00df	Feature/account balance	2019-09-09 14:39:34 +00:00
Blazej	cc70759836	Merge branch 'poc/gui' into dev	2019-09-09 12:43:07 +02:00
Blazej	8115bcecf7	Fixed Test Error	2019-09-09 11:31:21 +02:00
Blazej	a718ccd040	Merge branch 'poc/gui' into dev	2019-09-09 11:28:24 +02:00
Blazej	5bd280e01b	Fixed Dependency Error	2019-09-09 11:24:23 +02:00
Blazej	0fe3a3a2ed	Merge branch 'dev' into poc/gui ... # Conflicts: # src/main/java/solatium/interfaces/Customer.java	2019-09-09 11:19:47 +02:00
Blazej	8f8de18463	Merge branch 'dev' into poc/gui ... # Conflicts: # src/main/java/solatium/interfaces/Customer.java	2019-09-09 11:18:37 +02:00
Blazej	55f9bec860	Refactored GUI and added Address to customer	2019-09-09 11:10:51 +02:00
Dwenger	9ec6f909e8	Merge branch 'poc/blockchain' into dev	2019-09-09 10:58:35 +02:00
Dwenger	c77a168cb4	Merge branch 'dev' into poc/blockchain	2019-09-09 10:57:37 +02:00
Dwenger	72b6a02160	spelling	2019-09-09 10:51:22 +02:00
Dwenger	6abc2c6649	changed data from String to Transaction	2019-09-09 10:45:40 +02:00
Dwenger	69a21eaf6a	WIP	2019-09-07 12:26:08 +02:00