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

15 Dec, 2021 8 commits
- Merge branch 'dev_cooperatic' of… · a6493b55
```
Merge branch 'dev_cooperatic' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into dev_cooperatic
```
  François C. authored Dec 15, 2021
  a6493b55 Browse Files
- Fix standard point added if shift is moved using members_space interface · cb6a66fe
  François C. authored Dec 15, 2021
  
  cb6a66fe Browse Files
- Merge branch '1492-order-press-enter' into 'dev_cooperatic' · 96190610
```
1492 - press enter added

See merge request !90
```
  François C. authored Dec 15, 2021
  96190610 Browse Files
- Merge branch 'dev_cooperatic' into '1492-order-press-enter' · 59cec0ae
```
# Conflicts:
#   orders/static/js/orders_helper.js
```
  Félicie authored Dec 15, 2021
  59cec0ae Browse Files
- comment edited · 69547f1c
  Félicie authored Dec 15, 2021
  
  69547f1c Browse Files
- Merge branch '1491-screen-bug' into 'dev_cooperatic' · b88b0203
```
1491 - focus removed

See merge request !91
```
  François C. authored Dec 15, 2021
  b88b0203 Browse Files
- Merge branch '1838_change_message_last_minute_exchange_shifts' into 'dev_cooperatic' · f39ffe43
```
1838 update message last minute shifts exchange

See merge request !89
```
  François C. authored Dec 15, 2021
  f39ffe43 Browse Files
- Merge branch '1850-update-msg-ba' into 'dev_cooperatic' · 3324d342
```
1850 add explanation for "rattrapage"

See merge request !88
```
  François C. authored Dec 15, 2021
  3324d342 Browse Files
14 Dec, 2021 7 commits
- focus removed · 7476eacc
  Félicie authored Dec 14, 2021
  
  7476eacc Browse Files
- press enter different · 6a22598b
  Félicie authored Dec 14, 2021
  
  6a22598b Browse Files
- press enter added · c7f8a98b
  Félicie authored Dec 14, 2021
  
  c7f8a98b Browse Files
- fix lint error · 61146c38
  Thibault Grandjean authored Dec 14, 2021
  
  61146c38 Browse Files
- add explanation for "rattratape" · 79faad6c
  Thibault Grandjean authored Dec 14, 2021
  
  79faad6c Browse Files
- Rechargement automatique de l'espace membre après validation données perso. coop · 78f6aa31
  François authored Dec 14, 2021
  
  78f6aa31 Browse Files
- Rectifs rendu explications aide à la commande (suite test preprod sur ecran portable) · 0518b7ed
  François authored Dec 14, 2021
  
  0518b7ed Browse Files
13 Dec, 2021 2 commits
- #1911 Explication calcul conso aide à la commande + maj lib js datatables · bc4f9ed4
  François C. authored Dec 13, 2021
  
  bc4f9ed4 Browse Files
- update message · 5a93ad94
  Thibault Grandjean authored Dec 13, 2021
  
  5a93ad94 Browse Files
28 Nov, 2021 1 commit
- Merge branch 'evolution_bdm' into 'dev_cooperatic' · 38643bd9
```
Integration Evolution bdm

See merge request !87
```
  Administrator authored Nov 28, 2021
  38643bd9 Browse Files
26 Nov, 2021 1 commit
- Fix display Sunday on shifts exchange calendar · 4cf3417f
  François authored Nov 26, 2021
  
  4cf3417f Browse Files
25 Nov, 2021 3 commits
- slight style updates · 6c061566
  Damien Moulard authored Nov 25, 2021
  
  6c061566 Browse Files
- enforce ordering in history table · 3a3b4dc7
  Damien Moulard authored Nov 25, 2021
  
  3a3b4dc7 Browse Files
- display Rattrapage status in red on welcoming board · 7a54c6fc
  Damien Moulard authored Nov 25, 2021
  
  7a54c6fc Browse Files
24 Nov, 2021 11 commits
- #1786 new section 002 texts · 958c2ee4
  François authored Nov 24, 2021
  
  958c2ee4 Browse Files
- #1788 : remove unecessary forms links · 0c6bceca
  François authored Nov 24, 2021
  
  0c6bceca Browse Files
- #1786 #1787 FAQ modif. · 503f643f
  François authored Nov 24, 2021
  
  503f643f Browse Files
- Changement image Etats statuts coop · 0dcbb7aa
  François authored Nov 24, 2021
  
  0dcbb7aa Browse Files
- Fix unsubscribe bug in is_comite fn · 0ea9b280
  François authored Nov 24, 2021
  
  0ea9b280 Browse Files
- Merge branch 'ticket_1727' into 'evolution_bdm' · 8a35c6c2
```
Ticket 1727

See merge request !86
```
  François C. authored Nov 24, 2021
  8a35c6c2 Browse Files
- Run eslint --fix · deedd4a3
  François authored Nov 24, 2021
  
  deedd4a3 Browse Files
- lint · ad099012
  Etienne Freiss authored Nov 24, 2021
  
  ad099012 Browse Files
- Merge branch 'evolution_bdm' into ticket_1727 · d82c419f
  Etienne Freiss authored Nov 24, 2021
  
  d82c419f Browse Files
- réalisation ticket 1727 · 7c1eda7d
  Etienne Freiss authored Nov 24, 2021
  
  7c1eda7d Browse Files
- manage resize use-case on shift exchange view · 49b745b2
  Damien Moulard authored Nov 24, 2021
  
  49b745b2 Browse Files
23 Nov, 2021 7 commits
- merge deleted branch in origin · bacaa1e4
  Damien Moulard authored Nov 23, 2021
  
  bacaa1e4 Browse Files
- update history logic · 8c96561a
  Damien Moulard authored Nov 23, 2021
  
  8c96561a Browse Files
- Merge branch 'ticket_1740' into 'evolution_bdm' · 0ccb258d
```
Ticket 1740 - correction fautes de frappes

See merge request !82
```
  François C. authored Nov 23, 2021
  0ccb258d Browse Files
- Merge branch 'ticket_1733' into 'evolution_bdm' · 0e01f176
```
Ticket 1733 - ajout de la session comprendre mon statut dans la page mes infos

See merge request !81
```
  François C. authored Nov 23, 2021
  0e01f176 Browse Files
- 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