Commits · bab2de87ad36b1db150d52b6b078a689eebde5de · cooperatic-foodcoops / third-party · GitLab

23 Nov, 2021 22 commits
- Merge branch 'ticket_1591' into 'evolution_bdm' · bab2de87
```
ticket 1591 Add the date of the end of exemption

See merge request !80
```
  François C. authored Nov 23, 2021
  bab2de87 Browse Files
- Merge branch 'ticket_1738' into 'evolution_bdm' · dcee510a
```
Ticket 1738

See merge request !79
```
  François C. authored Nov 23, 2021
  dcee510a Browse Files
- Merge branch 'evolution_bdm' into 'ticket_1738' · dfc58992
```
# Conflicts:
#   members_space/static/js/members-space-my-shifts.js
```
  François C. authored Nov 23, 2021
  dfc58992 Browse Files
- sandwich menu adjusted · 6b6c53bc
  Félicie authored Nov 23, 2021
  
  6b6c53bc Browse Files
- Merge branch 'ticket_1736' into 'evolution_bdm' · 760d7727
```
ticket_1736 - fixed font-size bugs at home space

See merge request !78
```
  Damien Moulard authored Nov 23, 2021
  760d7727 Browse Files
- display comittees shifts in shifts history · c1ebf735
  Damien Moulard authored Nov 23, 2021
  
  c1ebf735 Browse Files
- Add the date of the end of exemption · c925ab95
  Thibault Grandjean authored Nov 23, 2021
  
  c925ab95 Browse Files
- Merge branch 'evolution_bdm' into ticket_1738 · 2bafd38f
  Etienne Freiss authored Nov 23, 2021
  
  2bafd38f Browse Files
- ajout fake activity, ajout config AMNISTIE_DATE · 2f953b53
  Etienne Freiss authored Nov 23, 2021
  
  2f953b53 Browse Files
- when adding/removing makeups, update points counter for standards · e0e7021d
  Damien Moulard authored Nov 23, 2021
  
  e0e7021d Browse Files
- fixed font-size bugs at home space · d25e5e1e
  Félicie authored Nov 23, 2021
  
  d25e5e1e Browse Files
- Merge branch 'ticket_1350' into 'evolution_bdm' · 3bf230a2
```
Modification couleur de fond

See merge request !76
```
  Damien Moulard authored Nov 23, 2021
  3bf230a2 Browse Files
- Merge branch 'ticket_1739' into 'evolution_bdm' · 07224dbc
```
ticket_1739 - Mes infos perso changed to Mes infos

See merge request !77
```
  Damien Moulard authored Nov 23, 2021
  07224dbc Browse Files
- quickfix shift exchange style · 9c92003d
  Damien Moulard authored Nov 23, 2021
  
  9c92003d Browse Files
- quickfix shift exchange · ae39186e
  Damien Moulard authored Nov 23, 2021
  
  ae39186e Browse Files
- Mes infos perso changed to Mes infos · 827046fc
  Félicie authored Nov 23, 2021
  
  827046fc Browse Files
- Merge branch 'evolution_bdm' into ticket_1350 · 8ada00eb
  Etienne Freiss authored Nov 23, 2021
  
  8ada00eb Browse Files
- modif hover · cd0ebe88
  Etienne Freiss authored Nov 23, 2021
  
  cd0ebe88 Browse Files
- Merge branch 'ticket_1728' into 'evolution_bdm' · 1de6869e
```
modification url

See merge request !75
```
  Damien Moulard authored Nov 23, 2021
  1de6869e Browse Files
- Merge branch 'ticket_1714' into 'evolution_bdm' · e7606dae
```
Modif correction de bug

See merge request !74
```
  François C. authored Nov 23, 2021
  e7606dae Browse Files
- modification url · a3180721
  Etienne Freiss authored Nov 23, 2021
  
  a3180721 Browse Files
- Modification couleur de fond · 87218543
  Etienne Freiss authored Nov 23, 2021
  
  87218543 Browse Files
22 Nov, 2021 9 commits
- Merge branch 'ticket_1713' into 'evolution_bdm' · 061ab819
```
sort on date_begin instead of create_date

See merge request !73
```
  François C. authored Nov 22, 2021
  061ab819 Browse Files
- Merge branch 'ticket_1726' into 'evolution_bdm' · 2d9174d7
```
ticket_1726 - button added to the home page

See merge request !72
```
  François C. authored Nov 22, 2021
  2d9174d7 Browse Files
- button added to the home page · 19663a16
  Félicie authored Nov 22, 2021
  
  19663a16 Browse Files
- Merge branch 'ticket_1724' into 'evolution_bdm' · 713eefc0
```
ticket_1724 - remplacer le code html par des caractères UTF8 concernant les apostrophes

See merge request !71
```
  François C. authored Nov 22, 2021
  713eefc0 Browse Files
- Merge branch 'ticket_1677' into 'evolution_bdm' · a9cbbb0b
```
correction orthographique ticket 1677

See merge request !70
```
  François C. authored Nov 22, 2021
  a9cbbb0b Browse Files
- transformed &#39 to ' · 2d3f0105
  Félicie authored Nov 22, 2021
  
  2d3f0105 Browse Files
- sort on date_begin instead of create_date · 1082f99e
  Thibault Grandjean authored Nov 22, 2021
  
  1082f99e Browse Files
- Modif correction de bug · 740ddfb0
  Etienne Freiss authored Nov 22, 2021
  
  740ddfb0 Browse Files
- Merge branch 'evolution_bdm' of… · 0622ae23
```
Merge branch 'evolution_bdm' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into ticket_1677
```
  Etienne Freiss authored Nov 22, 2021
  0622ae23 Browse Files
19 Nov, 2021 9 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