Archived
1
0
Fork 0
Commit graph

37 commits

Author SHA1 Message Date
83d3e6c0a4 Update README 2022-01-30 19:41:07 +01:00
d60f2803a5 Move ServerConfiguration to GUI package 2022-01-30 18:26:06 +01:00
58ffe690fe Add command / support 2022-01-30 17:41:43 +01:00
538b2d30f4 Merge branch 'ziedelth'
# Conflicts:
#	src/fr/univ/lyon1/client/Client.java
#	src/fr/univ/lyon1/client/ClientReceive.java
#	src/fr/univ/lyon1/common/ServerConfiguration.java
2022-01-30 17:16:48 +01:00
1d46eda1ba Merge branch 'flifloo' into 'main'
Merging flifloo

See merge request p1905458/java-tp!4
2022-01-30 16:02:54 +00:00
Ziedelth
bf53611af1 Comment and remove unused code 2022-01-30 15:01:25 +01:00
Ziedelth
1289ac8ad5 Fix invalid connection exception 2022-01-19 11:53:36 +01:00
54b1eb7299 Add documentation to server package 2022-01-19 10:41:34 +01:00
Ziedelth
7ac2b05254 New controller 2022-01-19 10:22:50 +01:00
b5e8b96f65 Add documentation to client package 2022-01-19 09:31:24 +01:00
f3813d23e2 Add documentation to common package 2022-01-19 09:19:23 +01:00
6e05784eb7 Support of send message to a specific channel from CLI and command interpretation 2022-01-19 08:50:06 +01:00
Ziedelth
1e24c3aba1 Add username and password 2022-01-07 11:58:51 +01:00
62727bcb3c Add channels list command 2022-01-07 11:53:35 +01:00
Ziedelth
931e34bcaa Fix stupid bug 2022-01-07 11:38:15 +01:00
7cf3b41e6a Add connection.properties to .gitignore 2022-01-07 10:55:44 +01:00
371a1bb0cb Merge flifloo into main 2022-01-07 10:52:19 +01:00
57501b7b93 Merge branch 'flifloo'
# Conflicts:
#	.gitignore
#	pom.xml
#	src/fr/univ/lyon1/gui/ClientGUI.java
#	src/module-info.java
2022-01-07 10:31:56 +01:00
6b3cd0613e Merge branch 'ziedelth' into 'main'
Ziedelth

See merge request p1905458/java-tp!2
2022-01-07 09:27:13 +00:00
14f40813b7 Add channel check on message broadcast 2022-01-07 10:25:57 +01:00
38b86b16de Setup SSL for WebSocket connection 2022-01-05 10:00:07 +01:00
7caec71de3 Init database with tables and test user 2022-01-05 09:05:11 +01:00
f8a5cde8bf Setup commands action 2022-01-05 08:58:33 +01:00
Ziedelth
68cbef6722 Remove todo and debug print 2022-01-05 08:38:18 +01:00
Ziedelth
cc3a9033ff Can switch between scene 2022-01-05 08:37:40 +01:00
Ziedelth
0e36273ab9 Fix bug on close 2021-12-10 10:35:17 +01:00
06bc4d5451 Setup channel model and join a channel 2021-12-08 17:05:33 +01:00
Ziedelth
8e4d54b70f Add load server configuration on application start 2021-12-08 09:59:07 +01:00
a6ec8e5676 Setup model, user model and identification 2021-12-08 09:47:29 +01:00
Ziedelth
bb100489dc Reformat server configuration 2021-12-08 09:40:50 +01:00
Ziedelth
a9215ccb9a Update dependencies and save connection information 2021-12-08 09:25:21 +01:00
Ziedelth
00effd8b55 Add connection to server 2021-12-08 09:02:25 +01:00
Ziedelth
2ebe7a68ae Add requirements 2021-11-22 16:04:08 +01:00
c4779c1a06 Implementation of chat lib and GUI 2021-11-22 15:47:46 +01:00
WATTEAU PIERRE p2111528
94307933d3 Merge branch 'pierre' into 'main'
Add JavaFX

See merge request p1905458/java-tp!1
2021-11-22 14:29:08 +00:00
Ziedelth
3999f6a2e2 Add JavaFX 2021-11-22 15:28:38 +01:00
a3fff365f6 Initial commit 2021-11-22 15:21:22 +01:00