Commits · 0622ae232a5beb1a3f9958ef3c8616442176403d · cooperatic-foodcoops / third-party

22 Nov, 2021 1 commit

Merge branch 'evolution_bdm' of… · 0622ae23

Merge branch 'evolution_bdm' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into ticket_1677

authored Nov 22, 2021

0622ae23 Browse Files

19 Nov, 2021 34 commits
- Merge branch 'ticket_1677' into 'evolution_bdm' · 28d949d7
```
Ticket 1677 ajout diaggramme

See merge request !69
```
  Damien Moulard authored Nov 19, 2021
  28d949d7 Browse Files
- #1357 Don't retrieve 'services des comités' shifts · e4f0d419
  François authored Nov 19, 2021
  
  e4f0d419 Browse Files
- Merge branch 'evolution_bdm' of… · e0331aec
```
Merge branch 'evolution_bdm' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into ticket_1677
```
  Etienne Freiss authored Nov 19, 2021
  e0331aec Browse Files
- ajout diaggrame etat statut · baa689f0
  Etienne Freiss authored Nov 19, 2021
  
  baa689f0 Browse Files
- Merge branch 'ticket_1642' into 'evolution_bdm' · 10ef839e
```
ticket_1642 - alignement de la ligne créneau

See merge request !66
```
  Damien Moulard authored Nov 19, 2021
  10ef839e Browse Files
- Merge branch 'evolution_bdm' of… · a67ae465
```
Merge branch 'evolution_bdm' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into evolution_bdm
```
  Damien Moulard authored Nov 19, 2021
  a67ae465 Browse Files
- remove 1 pt to members to whom we add the first makeup · 717c2f7d
  Damien Moulard authored Nov 19, 2021
  
  717c2f7d Browse Files
- margin top removed to align fields · 0c433a61
  Félicie authored Nov 19, 2021
  
  0c433a61 Browse Files
- Merge branch 'ticket_1677' into 'evolution_bdm' · 9da7f0d6
```
Ticket 1677

See merge request !68
```
  Damien Moulard authored Nov 19, 2021
  9da7f0d6 Browse Files
- change a suspendu into rattrapage · ef2e3736
  Damien Moulard authored Nov 19, 2021
  
  ef2e3736 Browse Files
- Merge branch 'evolution_bdm' of… · 6a825fc3
```
Merge branch 'evolution_bdm' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into evolution_bdm
```
  Damien Moulard authored Nov 19, 2021
  6a825fc3 Browse Files
- #1689 don't display exempted people in shift list · f70ac9a7
  François authored Nov 19, 2021
  
  f70ac9a7 Browse Files
- force status update after delay creation · 4d3070db
  Damien Moulard authored Nov 19, 2021
  
  4d3070db Browse Files
- Merge branch 'evolution_bdm' of… · 0426685d
```
Merge branch 'evolution_bdm' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into ticket_1677
```
  Etienne Freiss authored Nov 19, 2021
  0426685d Browse Files
- seconde correction Maxime · 99bf603d
  Etienne Freiss authored Nov 19, 2021
  
  99bf603d Browse Files
- Change in late people rendering in shift list · a7c0febd
  François authored Nov 19, 2021
  
  a7c0febd Browse Files
- Merge branch 'ticket_1677' into 'evolution_bdm' · 0825e1e6
```
changement suite au retour de maxime ticket 1677

See merge request !67
```
  Damien Moulard authored Nov 19, 2021
  0825e1e6 Browse Files
- Merge branch 'ticket_1330' into 'evolution_bdm' · 5855d9b0
```
Ticket 1330

See merge request !64
```
  Damien Moulard authored Nov 19, 2021
  5855d9b0 Browse Files
- Merge branch 'ticket_1315' into 'evolution_bdm' · 1ab954f6
```
Ticket 1315 - invalid date sur safari

See merge request !65
```
  Damien Moulard authored Nov 19, 2021
  1ab954f6 Browse Files
- update my info form styles · f03b374e
  Damien Moulard authored Nov 19, 2021
  
  f03b374e Browse Files
- Merge branch 'evolution_bdm' into ticket_1330 · a47130e0
  Damien Moulard authored Nov 19, 2021
  
  a47130e0 Browse Files
- changement suite au retour de maxime · f256d41f
  Etienne Freiss authored Nov 19, 2021
  
  f256d41f Browse Files
- same size in every area · 04087031
  Félicie authored Nov 19, 2021
  
  04087031 Browse Files
- Fix syntax error (street2, zip) · 9f883d7c
  François authored Nov 19, 2021
  
  9f883d7c Browse Files
- invalid date repaired · 96c8e66d
  Félicie authored Nov 19, 2021
  
  96c8e66d Browse Files
- sans street2 · 7a830c75
  Etienne Freiss authored Nov 19, 2021
  
  7a830c75 Browse Files
- Merge branch 'ticket_1673' into 'evolution_bdm' · a0aa58ad
```
ticket_1673 Modifier la page "404"

See merge request !63
```
  Damien Moulard authored Nov 19, 2021
  a0aa58ad Browse Files
- fix merge conflict · c55afbb8
  Damien Moulard authored Nov 19, 2021
  
  c55afbb8 Browse Files
- slight style change in no content page · 6c445deb
  Damien Moulard authored Nov 19, 2021
  
  6c445deb Browse Files
- slight style change in no content page · 29029a0a
  Damien Moulard authored Nov 19, 2021
  
  29029a0a Browse Files
- re-enable shift buttons after selecting makeup · 3408c38b
  Damien Moulard authored Nov 19, 2021
  
  3408c38b Browse Files
- Merge branch 'evolution_bdm' of… · 05ef2f71
```
Merge branch 'evolution_bdm' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into ticket_1330
```
  Etienne Freiss authored Nov 19, 2021
  05ef2f71 Browse Files
- Merge branch 'evolution_bdm' of… · 64baa185
```
Merge branch 'evolution_bdm' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into ticket_1330
```
  Etienne Freiss authored Nov 19, 2021
  64baa185 Browse Files
- tickect 1330 · ee354959
  Etienne Freiss authored Nov 19, 2021
  
  ee354959 Browse Files
18 Nov, 2021 5 commits
- 404 page added · 805876a9
  Félicie authored Nov 18, 2021
  
  805876a9 Browse Files
- Merge branch 'ticket_1680' into 'evolution_bdm' · 9305e1ab
```
Ticket 1680 & 1695 - retirer clemenceau au calendrier et ajuster le calendrier à la bonne taille de service

See merge request !60
```
  Damien Moulard authored Nov 18, 2021
  9305e1ab Browse Files
- linting · 6013862c
  Damien Moulard authored Nov 18, 2021
  
  6013862c Browse Files
- company specific code · 10420b89
  Damien Moulard authored Nov 18, 2021
  
  10420b89 Browse Files
- Merge branch 'ticket_1680' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into ticket_1680 · 58cbb59f
  Félicie authored Nov 18, 2021
  
  58cbb59f Browse Files