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
170 commits 19 branches 1 tag 3.9 MiB
Commit graph

170 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dwenger
8710a74ca9 genesis block gets initiated with 0 as timestamp 2019-09-04 10:38:00 +02:00
Blazej
8969f898ff Created Home Screen 2019-09-04 09:34:48 +02:00
Blazej
b26c9a8492 lol 
Typo
 2019-09-04 09:31:18 +02:00
Dwenger
d92ee398e7 add blockchain return as list 2019-09-03 23:13:55 +02:00
Dwenger
6b0a924f05 add chain validation 2019-09-03 22:42:38 +02:00
Dwenger
aef8ef718c WIP 2019-09-03 16:58:23 +02:00
Dwenger
02cb0fd0e2 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-03 15:24:52 +02:00
Bjarne Voigtländer
960d4ea37d fixed customer error counter and added tests 2019-09-03 13:41:54 +02:00
Blazej
ecfd980513 Edited GUI 2019-09-03 13:41:39 +02:00
Dwenger
b5b1289597 Merge branch 'dev' into poc/blockchain 2019-09-03 13:25:45 +02:00
Blazej
5e6c59a149 Merge branch 'dev' into poc/gui 2019-09-03 13:19:49 +02:00
Blazej
00d0e6d912 uncommented 2019-09-03 13:19:11 +02:00
Dwenger
defab7cec9 fix login package name 2019-09-03 13:17:55 +02:00
Dwenger
f495cf8f66 resolved 2019-09-03 13:12:35 +02:00
Blazej
04bab18159 Edited GUI 2019-09-03 12:48:49 +02:00
Bjarne Voigtländer
740be44d15 restructure to fix tests 2019-09-03 12:48:20 +02:00
Blazej
ac46e7471e Refactored and added GUI 2019-09-03 12:40:01 +02:00
Dwenger
c85b5a9bed WIP 2019-09-03 12:36:46 +02:00
Bjarne Voigtländer
8a8350a59c added verification of user by password 2019-09-03 12:22:43 +02:00
Blazej
36bcb5c293 Edited gitignore for MacOS 2019-09-03 11:13:27 +02:00
Blazej
31635470f7 Merge remote-tracking branch 'origin/dev' into dev 2019-09-03 11:12:50 +02:00