Commits · 5e068ce820ab227ff638ee12d3643a65e2b404c8 · Krbone / Krbone

25 May, 2021 7 commits
- Update add_consumption.php · 5e068ce8
  BAIGNE Nathan authored May 25, 2021
  
  5e068ce8
- Merge branch 'Nathan' into 'master' · 69782809
  BAIGNE Nathan authored May 25, 2021
```
ajout conso + bug resolve

See merge request krbone/krbone!22
```
  69782809
- Merge branch 'master' into 'Nathan' · b57826d0
  BAIGNE Nathan authored May 25, 2021
```
# Conflicts:
#   Profil/profil_page.php
#   includes/User.php
```
  b57826d0
- ajout conso + bug resolve · f67bef14
  BAIGNE Nathan authored May 25, 2021
  
  f67bef14
- Merge branch 'Thibault' into 'master' · 7ceaa5ae
  BAIGNE Nathan authored May 25, 2021
```
Classement + début groupe

See merge request krbone/krbone!21
```
  7ceaa5ae
- Merge branch 'master' into 'Thibault' · 6ee6e3d0
  BAIGNE Nathan authored May 25, 2021
```
# Conflicts:
#   includes/inscription.php
```
  6ee6e3d0
- Classement + début groupe · 43f2c9be
  KERDRAON Thibault authored May 25, 2021
  
  43f2c9be
17 May, 2021 2 commits
- Merge branch 'Valentin' into 'master' · e59957bd
  BAIGNE Nathan authored May 17, 2021
```
CSS article

See merge request krbone/krbone!19
```
  e59957bd
- CSS article · fdd6e664
  PERROCHON Valentin authored May 17, 2021
  
  fdd6e664
10 May, 2021 4 commits
- Merge branch 'Valentin' into 'master' · 214ad5ed
  BAIGNE Nathan authored May 10, 2021
```
css inscription page

See merge request krbone/krbone!18
```
  214ad5ed
- Merge branch 'Nathan' into 'master' · 7affae10
  BAIGNE Nathan authored May 10, 2021
```
modif conso

See merge request krbone/krbone!17
```
  7affae10
- css inscription page · 3c6052eb
  PERROCHON Valentin authored May 10, 2021
  
  3c6052eb
- modif conso · 0348db66
  BAIGNE Nathan authored May 10, 2021
  
  0348db66
25 Apr, 2021 2 commits
- Merge branch 'Nathan' into 'master' · 6b66c6a2
  BAIGNE Nathan authored Apr 25, 2021
```
Edit article + edit profil

See merge request krbone/krbone!16
```
  6b66c6a2
- Edit article + edit profil · 6bd8c2ce
  BAIGNE Nathan authored Apr 25, 2021
  
  6bd8c2ce
19 Apr, 2021 17 commits
- Merge branch 'Nathan' into 'master' · bd7ce8c1
  BAIGNE Nathan authored Apr 19, 2021
```
Consumption repair

See merge request krbone/krbone!15
```
  bd7ce8c1
- Consumption repair · cad49bf5
  BAIGNE Nathan authored Apr 19, 2021
  
  cad49bf5
- Merge branch 'Nathan' into 'master' · e54e50a9
  BAIGNE Nathan authored Apr 19, 2021
```
Delete article + illustration

See merge request krbone/krbone!14
```
  e54e50a9
- Delete article + illustration · e4b58e9e
  BAIGNE Nathan authored Apr 19, 2021
  
  e4b58e9e
- Merge branch 'Stanick' into 'master' · 1e8f0c57
  BAIGNE Nathan authored Apr 19, 2021
```
Changer les consos car elles ne rentrent pas dans la BDD

See merge request krbone/krbone!11
```
  1e8f0c57
- Merge branch 'thibault' into 'master' · f54b3d32
  BAIGNE Nathan authored Apr 19, 2021
```
Ajout de edit profil

See merge request krbone/krbone!13
```
  f54b3d32
- Ajout de edit profil · 6c165fdd
  KERDRAON Thibault authored Apr 19, 2021
  
  6c165fdd
- Changer les consos car elles ne rentrent pas dans la BDD · 6d98326d
  LE GAL Stanick authored Apr 19, 2021
  
  6d98326d
- Merge branch 'Valentin' into 'master' · c8648ab1
  BAIGNE Nathan authored Apr 19, 2021
```
image

See merge request krbone/krbone!10
```
  c8648ab1
- image · 9b7d40b3
  PERROCHON Valentin authored Apr 19, 2021
  
  9b7d40b3
- Update article.css · 20dae26e
  BAIGNE Nathan authored Apr 19, 2021
  
  20dae26e
- Merge branch 'Valentin' into 'master' · 18d1983c
  BAIGNE Nathan authored Apr 19, 2021
```
inscription css

See merge request krbone/krbone!9
```
  18d1983c
- Merge branch 'master' into 'Valentin' · a33e4a63
  BAIGNE Nathan authored Apr 19, 2021
```
# Conflicts:
#   css/form.css
```
  a33e4a63
- Update form.css · b2324a84
  BAIGNE Nathan authored Apr 19, 2021
  
  b2324a84
- Merge branch 'Nathan' into 'master' · 2647f910
  BAIGNE Nathan authored Apr 19, 2021
```
delete article and css resolve

See merge request krbone/krbone!8
```
  2647f910
- inscription css · 17fb914f
  PERROCHON Valentin authored Apr 19, 2021
  
  17fb914f
- delete article and css resolve · 7d633d70
  BAIGNE Nathan authored Apr 19, 2021
  
  7d633d70
15 Apr, 2021 2 commits
- Merge branch 'Nathan' into 'master' · 9913ad4f
  BAIGNE Nathan authored Apr 15, 2021
```
Affichage des articles en mode lecture

See merge request krbone/krbone!7
```
  9913ad4f
- Affichage des articles en mode lecture · 19804547
  BAIGNE Nathan authored Apr 15, 2021
  
  19804547
14 Apr, 2021 2 commits
- Merge branch 'Valentin' into 'master' · 42a4e42a
  BAIGNE Nathan authored Apr 14, 2021
```
login css et php

See merge request krbone/krbone!6
```
  42a4e42a
- login css et php · 6ddb90d1
  PERROCHON Valentin authored Apr 14, 2021
  
  6ddb90d1
13 Apr, 2021 1 commit
- Update README.md · acc360c1
  BAIGNE Nathan authored Apr 13, 2021
  
  acc360c1
12 Apr, 2021 3 commits
- show article · 699f272a
  BAIGNE Nathan authored Apr 12, 2021
  
  699f272a
- Profil et edit profil · 9fab619c
  KERDRAON Thibault authored Apr 12, 2021
  
  9fab619c
- Merge branch 'Stanick' into 'master' · 7be1f2a0
  BAIGNE Nathan authored Apr 12, 2021
```
Ajout conso

See merge request krbone/krbone!4
```
  7be1f2a0