Commits · feature/128-websocket-in-game-2 · Níðhöggr TaskForce / Vili

Jan 13, 2025
- merge Feature/115 endquiz for multi · de787131
  GOEPP THOMAS authored 4 months ago
```
Merge branch 'feature/115-endquiz-for-multi' into 'develop'
```
  de787131
- Merge branch 'develop' into 'feature/115-endquiz-for-multi' · 00f7e739
  GOEPP THOMAS authored 4 months ago
```
# Conflicts:
#   routes/StackNavigator.tsx
```
  00f7e739
Jan 12, 2025
- merge Feature/126 restart end quiz · 1b336dd5
  HARTZ HENRI authored 4 months ago
```
Merge branch 'feature/126-restart-end-quiz' into 'develop'
```
  1b336dd5
- merge Feature/129 my quizzes · 1f7cc335
  GOEPP THOMAS authored 4 months ago
```
Merge branch 'feature/129-my-quizzes' into 'develop'
```
  1f7cc335
- Merge branch 'develop' into 'feature/129-my-quizzes' · ff32f008
  GOEPP THOMAS authored 4 months ago
```
# Conflicts:
#   services/QuizService.ts
```
  ff32f008
- feat: navigator · 3ec74ecb
  GOEPP THOMAS authored 4 months ago
  
  3ec74ecb
- feat: new services · d4ae1c4a
  GOEPP THOMAS authored 4 months ago
  
  d4ae1c4a
- feat: My quizzes · 260c2c0b
  GOEPP THOMAS authored 4 months ago
  
  260c2c0b
- feat: new model · 702bf261
  GOEPP THOMAS authored 4 months ago
  
  702bf261
- feat: new model · 7a2795fa
  GOEPP THOMAS authored 4 months ago
  
  7a2795fa
- feat: restart quiz at the end · e899008d
  HARTZ HENRI authored 4 months ago
  
  e899008d
- fix: shuffle import · d40bcad4
  HARTZ HENRI authored 4 months ago
  
  d40bcad4
- Merge branch 'develop' of git.unistra.fr:Nidhoggr/vili into feature/126-restart-end-quiz · ba16b62f
  HARTZ HENRI authored 4 months ago
  
  ba16b62f
- merge feat: start quiz from community · 95045014
  HARTZ HENRI authored 4 months ago
```
Merge branch 'feature/127-start-quiz-from-community' into 'develop'
```
  95045014
- merge Feature/118 service for multiplayer · 6d5ab896
  GOEPP THOMAS authored 4 months ago
```
Merge branch 'feature/118-service-for-multiplayer' into 'develop'
```
  6d5ab896
- fix: conflits · c94b568b
  HARTZ HENRI authored 4 months ago
  
  c94b568b
- Merge branch 'develop' of git.unistra.fr:Nidhoggr/vili into feature/127-start-quiz-from-community · cb5e9a61
  HARTZ HENRI authored 4 months ago
  
  cb5e9a61
- feat: start quiz from community · 21943fec
  HARTZ HENRI authored 4 months ago
  
  21943fec
- merge feat: add shuffle question · a7cb65f0
  HARTZ HENRI authored 4 months ago
```
Merge branch 'feature/125-add-shufflequiz' into 'develop'
```
  a7cb65f0
- Merge branch 'develop' into 'feature/118-service-for-multiplayer' · fab7ffdf
  GOEPP THOMAS authored 4 months ago
```
# Conflicts:
#   screens/PlayingQuiz/EndQuiz/EndQuizChild.tsx
```
  fab7ffdf
- feat: add route create run · fdb7ef0f
  HARTZ HENRI authored 4 months ago
  
  fdb7ef0f
- feat: lobby · e9c6f6ec
  GOEPP THOMAS authored 4 months ago
  
  e9c6f6ec
- feat: add shuffle question · 33c6015d
  HARTZ HENRI authored 4 months ago
  
  33c6015d
Jan 11, 2025
- merge refactor: join a quiz · 2ec7c1b5
  GOEPP THOMAS authored 4 months ago
```
Merge branch 'feature/124-join-a-quiz' into 'develop'
```
  2ec7c1b5
- refactor: join a quiz · 08c7fbf2
  GOEPP THOMAS authored 4 months ago
  
  08c7fbf2
- merge refactor: endquiz · 48a9e95f
  GOEPP THOMAS authored 4 months ago
```
Merge branch 'feature/123-end-quiz' into 'develop'
```
  48a9e95f
- refactor: endquiz · db1c2884
  GOEPP THOMAS authored 4 months ago
  
  db1c2884
- feat: strating websocket · 257b2577
  GOEPP THOMAS authored 4 months ago
  
  257b2577
- fix: generate quiz · a25e07fd
  GOEPP THOMAS authored 4 months ago
  
  a25e07fd
- merge Feature/120 modify multiply community · 947ec5f1
  HARTZ HENRI authored 4 months ago
```
Merge branch 'feature/120-modify-multiply-community' into 'develop'
```
  947ec5f1
- styles: change the size of detail container · a147d5b8
  HARTZ HENRI authored 4 months ago
  
  a147d5b8
- feat: add information to quiz detail · d3f57121
  HARTZ HENRI authored 4 months ago
  
  d3f57121
- styles: show background · 4a93b056
  HARTZ HENRI authored 4 months ago
  
  4a93b056
- refactor: delete unused function · 1c7ba2ef
  HARTZ HENRI authored 4 months ago
  
  1c7ba2ef
- feat: add info for quiz · cabac789
  HARTZ HENRI authored 4 months ago
  
  cabac789
- feat: add description of the quiz · 235c9712
  HARTZ HENRI authored 4 months ago
  
  235c9712
- styles: show background · 6dd1ff56
  HARTZ HENRI authored 4 months ago
  
  6dd1ff56
- merge feat: added users stats · 5df5c552
  GOEPP THOMAS authored 4 months ago
```
Merge branch 'feature/119-stats-of-users' into 'develop'
```
  5df5c552
- feat: added users stats · 1d8259bf
  GOEPP THOMAS authored 4 months ago
  
  1d8259bf
- feat: play pressed got to lobby · 8c30d5f7
  HARTZ HENRI authored 4 months ago
  
  8c30d5f7

Admin message