|
|
f23a596f47
|
Merge branch 'merge'
|
2022-02-09 13:48:08 +01:00 |
|
|
|
0522908001
|
Fixed edit-event
|
2022-02-09 13:45:12 +01:00 |
|
|
|
59be5048d8
|
fixed bugs in Login
|
2022-02-08 09:00:44 +01:00 |
|
|
|
34e51cb72f
|
Merge remote-tracking branch 'origin/merge' into merge
|
2022-02-08 08:51:05 +01:00 |
|
|
|
88c8a30ad0
|
Refactor
|
2022-02-08 08:50:34 +01:00 |
|
|
|
111d5758e0
|
improved the edit,create-user to JFX
|
2022-02-07 13:48:58 +01:00 |
|
|
|
af441656de
|
fixed the edit-user.fxml
|
2022-02-07 13:31:43 +01:00 |
|
|
|
a190d91e7a
|
fixed the edit-user.fxml
|
2022-02-07 13:30:56 +01:00 |
|
|
|
1050455a4a
|
fixed the create-user.fxml
|
2022-02-07 13:30:38 +01:00 |
|
|
|
8c46670148
|
fixed the create-user.css
|
2022-02-07 13:30:22 +01:00 |
|
|
|
136ead454d
|
Refactor the create-event.css
|
2022-02-07 12:34:24 +01:00 |
|
|
|
0f4ad96dc0
|
Refactor the login.css
|
2022-02-07 12:13:08 +01:00 |
|
|
|
33f8c326d1
|
Refactor the create-user.css and fixed the option-view.css
|
2022-02-07 12:07:42 +01:00 |
|
|
|
de4811ee12
|
Refactor the option-view.css
|
2022-02-07 11:48:53 +01:00 |
|
|
|
f3a7ce21cc
|
Refactor the main-view.css
|
2022-02-07 11:42:03 +01:00 |
|
|
|
a29f6d204f
|
Merge branch 'merge' into CSS-Refactor
# Conflicts:
# client/app/src/main/resources/main/main-view.css
# client/app/src/main/resources/main/main-view.fxml
|
2022-02-07 11:22:31 +01:00 |
|
|
|
ede28ae4a7
|
Commit the new Files
|
2022-02-07 11:06:21 +01:00 |
|
|
|
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 |
|
|
|
351bcd524d
|
Minor fixes
|
2022-02-01 14:05:22 +01:00 |
|
|
|
dc78d69a00
|
Refactor
|
2022-01-31 23:03:29 +01:00 |
|
|
|
30e0afb86c
|
Fixed Time and Datepicker
|
2022-01-31 21:51:45 +01:00 |
|
|
|
d980edeaad
|
Refactored DayPane;
|
2022-01-31 21:16:01 +01:00 |
|
|
|
31dbeec55a
|
Updated onAddBtnClick
|
2022-01-31 21:00:08 +01:00 |
|
|
|
47739a3783
|
Fixed edit events
|
2022-01-31 20:58:18 +01:00 |
|
|
|
b460a77e8c
|
Refactored svgButtons
|
2022-01-31 13:27:50 +01:00 |
|
|
|
8c3925ea1a
|
Refactor
|
2022-01-31 12:42:31 +01:00 |
|
|
|
2fbf3895c5
|
Refactor
|
2022-01-31 08:51:53 +01:00 |
|
|
|
d41abdbad9
|
Save login
|
2022-01-29 20:15:20 +01:00 |
|
|
|
db339eeada
|
Refactor
|
2022-01-29 19:27:06 +01:00 |
|
|
|
245314a887
|
Renamed package;
Implemented create user
|
2022-01-29 12:03:09 +01:00 |
|
|
|
72fdce471b
|
Fixed encoding at http-request
|
2022-01-29 11:44:25 +01:00 |
|
|
|
780ecbee0f
|
Changed encoding to utf-8
|
2022-01-29 10:06:28 +01:00 |
|
|
|
4e07b01b6a
|
Get all user
|
2022-01-28 05:54:26 +01:00 |
|
|
|
2f70515407
|
Format
|
2022-01-28 05:53:53 +01:00 |
|
|
|
a4ce8940ab
|
Fixed raw use of parameterized class 'JFXComboBox'
|
2022-01-26 15:08:44 +01:00 |
|
|
|
91daf95990
|
Tried adding comboBox content
|
2022-01-26 15:04:32 +01:00 |
|
|
|
596343fe47
|
Removed unused imports
|
2022-01-26 14:27:16 +01:00 |
|
|
|
f133257194
|
Map user with JSON
|
2022-01-26 13:55:12 +01:00 |
|
|
|
4aafae9896
|
Merge branch 'option-ui' into merge
# Conflicts:
# client/data/src/main/java/res/DataController.java
|
2022-01-26 13:26:15 +01:00 |
|
|
|
cb5982ef2d
|
Added user class
|
2022-01-26 13:18:05 +01:00 |
|
|
|
2147ca1ad8
|
Added user methods
|
2022-01-25 20:01:22 +01:00 |
|
|
|
c4e24549d5
|
Use edit-event-endpoint to edit events
|
2022-01-25 19:37:49 +01:00 |
|
|
|
5e9a09fc7d
|
print msg when config.json is missing
|
2022-01-25 19:20:06 +01:00 |
|
|
|
f0e431bf6c
|
Refactored send get-request
|
2022-01-25 19:19:18 +01:00 |
|
|
|
f1f07a3515
|
Fixed main class
|
2022-01-25 19:18:38 +01:00 |
|
|
|
898054bb63
|
Comments all Files with Creator name
|
2022-01-25 11:14:16 +01:00 |
|
|
|
3848baddb6
|
Updated ui
|
2022-01-24 14:11:34 +01:00 |
|
|
|
b963a53d85
|
Fixed gitignore
|
2022-01-24 13:44:48 +01:00 |
|
|
|
057c4504d4
|
First view draft and create user connected
|
2022-01-24 13:42:11 +01:00 |
|
|
|
4f6d9670d0
|
Added logout function
|
2022-01-24 13:28:19 +01:00 |
|
