|
4c94cadf11
|
Merge branch 'merge' into Comments
# Conflicts:
# client/app/src/main/java/customUI/Button.java
# client/app/src/main/java/customUI/Converter.java
# client/app/src/main/java/customUI/Label.java
# client/app/src/main/java/customUI/Tooltip.java
# client/app/src/main/java/events/EditEventController.java
# client/app/src/main/java/helper/SvgBtnCreator.java
# client/app/src/main/java/main/MainController.java
# client/data/src/main/java/container/Event.java
# client/data/src/main/java/res/DataController.java
# client/data/src/main/java/res/HttpRequest.java
|
2022-02-07 10:40:53 +01:00 |
|
|
dc78d69a00
|
Refactor
|
2022-01-31 23:03:29 +01:00 |
|
|
245314a887
|
Renamed package;
Implemented create user
|
2022-01-29 12:03:09 +01:00 |
|
|
898054bb63
|
Comments all Files with Creator name
|
2022-01-25 11:14:16 +01:00 |
|
|
051000169e
|
Updated login, main-wiew and the controllers
|
2022-01-15 09:24:30 +01:00 |
|
|
c754b77c81
|
Formatted code
|
2021-12-22 15:04:15 +01:00 |
|
|
66edff8ed5
|
Fixed username
|
2021-12-21 09:46:53 +01:00 |
|
|
ded0b9042f
|
Styled login
|
2021-12-21 08:56:07 +01:00 |
|
|
cb6c55a639
|
Added user login
|
2021-12-20 19:26:07 +01:00 |
|