hamburghammer-mirrors/solatium
1
0
Fork 0
mirror of https://gitlab.com/berufsschul-ae/solatium.git synced 2024-12-22 13:07:40 +01:00
Code Issues Projects Releases Wiki Activity
86 commits 19 branches 1 tag 3.9 MiB
Commit graph

86 commits

This branch
This branch
All branches
Author SHA1 Message Date
Blazej
0700b0e59e Added test html 2019-09-18 09:46:13 +02:00
Blazej
e1c80bb491 Merge branch 'dev' into poc/rest 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2019-09-16 12:13:17 +02:00
Blazej
36b5dae4bd Added LoginData Class 2019-09-16 12:11:15 +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
Blazej
ec42872386 Added Spark and checked if its working 2019-09-16 11:16:04 +02: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
hamburghammer
42bbef1316 WIP transactions 2019-09-05 21:47:36 +02:00
Blazej
5b5f8c4ba3 Create Transaction.java 2019-09-05 12:45:29 +02:00
Blazej Josko
cb0c00c243 Merge branch 'poc/blockchain' into 'dev' 
Poc/blockchain

See merge request berufsschul-ae/solatium!4
 2019-09-05 10:44:35 +00:00
Augusto Dwenger
e66c4aa744 Merge branch 'poc/gui' of https://gitlab.com/berufsschul-ae/solatium into poc/gui 
# Conflicts:
#	src/main/java.solatium/Customer.java
#	src/main/java.solatium/User.java
#	src/main/java/solatium/Customer.java
#	src/main/java/solatium/Main.java
#	src/main/java/solatium/User.java
#	src/main/java/solatium/auth/Verification.java
#	src/main/java/solatium/interfaces/Customer.java
#	src/main/java/solatium/interfaces/DataBase.java
#	src/main/java/solatium/interfaces/User.java
#	src/main/java/solatium/interfaces/UserDataBase.java
#	src/test/java.solatium/VerificationTest.java
 2019-09-05 10:44:35 +00:00
Dwenger
cddf0e9449 add ctor to take one block and make the one how takes the hashedBlock public 2019-09-04 17:29:46 +02:00
Dwenger
d0ce2ece40 extract Block to interface and implements in TransactionBlock 2019-09-04 15:01:51 +02:00
Dwenger
88bd56f162 add toString 2019-09-04 10:38:33 +02:00