Commits · main · Yotlan LE CROM / 7 Wonders

23 Dec, 2021 1 commit
- Last global commit with comments and changes. Could not add the cards in the bank. · 32f803d6
  Florian MONSION authored Dec 23, 2021
  
  32f803d6
21 Dec, 2021 22 commits
- Try to connect middleware with PlayerController · 394b8685
  Yotlan LE CROM authored Dec 21, 2021
  
  394b8685
- Merge remote-tracking branch 'origin/main' · d06dae9e
  Jean-Mael BOIS authored Dec 21, 2021
  
  d06dae9e
- update PlayerController.java according to the documentation · 271661c2
  Jean-Mael BOIS authored Dec 21, 2021
  
  271661c2
- correct controller name · 9600054a
  Yotlan LE CROM authored Dec 21, 2021
  
  9600054a
- correct controller name · 9797b204
  Yotlan LE CROM authored Dec 21, 2021
  
  9797b204
- fix conception.adoc · aeac7209
  Jean-Mael BOIS authored Dec 21, 2021
  
  aeac7209
- fix PlayerController.java · 198fc94c
  Jean-Mael BOIS authored Dec 21, 2021
  
  198fc94c
- Merge remote-tracking branch 'origin/main' · 322235f0
  Jean-Mael BOIS authored Dec 21, 2021
  
  322235f0
- swap array to list and fix javadoc · 34c89431
  Jean-Mael BOIS authored Dec 21, 2021
  
  34c89431
- Merge branch 'main' of https://gitlab.univ-nantes.fr/E184058N/projet-2021 · fe5154d9
  Yotlan LE CROM authored Dec 21, 2021
  
  fe5154d9
- Try to add link for websocket · f421b5ce
  Yotlan LE CROM authored Dec 21, 2021
  
  f421b5ce
- fix conception.adoc · 70f815c4
  Jean-Mael BOIS authored Dec 21, 2021
  
  70f815c4
- fix composants.adoc · c55e3b19
  Jean-Mael BOIS authored Dec 21, 2021
  
  c55e3b19
- Merge remote-tracking branch 'origin/main' · c1ded6db
  Jean-Mael BOIS authored Dec 21, 2021
  
  c1ded6db
- fix composants.adoc · 58e5c346
  Jean-Mael BOIS authored Dec 21, 2021
  
  58e5c346
- Add dependancy with Player and his controller · 07eb73bf
  Yotlan LE CROM authored Dec 21, 2021
  
  07eb73bf
- Add constructor for middlewareclient · 06bccdd1
  Yotlan LE CROM authored Dec 21, 2021
  
  06bccdd1
- Add constructor for middlewareclient · b71444ae
  Yotlan LE CROM authored Dec 21, 2021
  
  b71444ae
- fix value name · 36d7dbec
  Jean-Mael BOIS authored Dec 21, 2021
  
  36d7dbec
- fix class name · 1e836207
  Jean-Mael BOIS authored Dec 21, 2021
  
  1e836207
- fix typo in javadoc · 4e421614
  Jean-Mael BOIS authored Dec 21, 2021
  
  4e421614
- update javadoc · 696d98f3
  Jean-Mael BOIS authored Dec 21, 2021
  
  696d98f3
17 Dec, 2021 4 commits
- update javadoc · 6f72ca0d
  Jean-Mael BOIS authored Dec 17, 2021
  
  6f72ca0d
- update some connection (not worked) · ed73e76b
  Endy YU authored Dec 17, 2021
  
  ed73e76b
- update javadoc and delete useless import · edea452a
  Jean-Mael BOIS authored Dec 17, 2021
  
  edea452a
- re-commit javadoc · 78af354a
  Jean-Mael BOIS authored Dec 17, 2021
  
  78af354a
14 Dec, 2021 13 commits
- add class for clientMiddleware · e4cd24ce
  Endy YU authored Dec 14, 2021
  
  e4cd24ce
- update dependencies · 3a536d92
  Endy YU authored Dec 14, 2021
  
  3a536d92
- update dependencies of -web, -test versions · 3cc05a6e
  Endy YU authored Dec 14, 2021
  
  3cc05a6e
- move serverWebSocketConfig · 5bad7a3f
  Endy YU authored Dec 14, 2021
  
  5bad7a3f
- first tests : connection player · 6c84c119
  Florian MONSION authored Dec 14, 2021
  
  6c84c119
- Merge remote-tracking branch 'origin/main' · a3685d30
  Endy YU authored Dec 14, 2021
  
  a3685d30
- move Connexion · 7ed19e84
  Endy YU authored Dec 14, 2021
  
  7ed19e84
- update pom · baa4a5b2
  Endy YU authored Dec 14, 2021
  
  baa4a5b2
- Merge branch 'main' of https://gitlab.univ-nantes.fr/E184058N/projet-2021 · d74d9a8a
  Yotlan LE CROM authored Dec 14, 2021
  
  d74d9a8a
- Try to fix web socket · fbd5cef6
  Yotlan LE CROM authored Dec 14, 2021
  
  fbd5cef6
- Merge remote-tracking branch 'origin/main' · 12a6c281
  Endy YU authored Dec 14, 2021
```
# Conflicts:
#	7-wonder-middlewareServeur/src/main/java/fr/univnantes/alma/serverWebSocketConfig.java
#	7-wonders-serverWebSocket/src/main/java/fr/univnantes/alma/ConnexionControler.java
#	pom.xml
```
  12a6c281
- fixing the commit (temp) · 6c75f368
  Florian MONSION authored Dec 14, 2021
  
  6c75f368
- supdate dependency for messaging.handler · 3ba30463
  Endy YU authored Dec 14, 2021
  
  3ba30463