Commits · 3b4db2e4a9c803d928c4a630bb8d44686673b8e9 · cooperatic-foodcoops / third-party · GitLab

10 Mar, 2022 24 commits
- fix merge conflict · 3b4db2e4
  Damien Moulard authored Mar 10, 2022
  
  3b4db2e4 Browse Files
- Merge branch '2435-admin-bdm-update-deleting-makeup-registration' into 'dev_cooperatic' · 17a551fc
```
admin bdm - registrations - deleting a makeup adds a point

See merge request !134
```
  Etienne Freiss authored Mar 10, 2022
  17a551fc Browse Files
- Merge branch '2387-member-points' into 'dev_cooperatic' · 366a1416
```
2387 member points

See merge request !142
```
  Etienne Freiss authored Mar 10, 2022
  366a1416 Browse Files
- Merge branch '2251-shift-screen-associate' into 'dev_cooperatic' · 76c6252c
```
2251 shift screen associate

See merge request !140
```
  Damien Moulard authored Mar 10, 2022
  76c6252c Browse Files
- Merge branch '2251-shift-screen-associate' of… · 2c422b94
```
Merge branch '2251-shift-screen-associate' of gl.cooperatic.fr:cooperatic-foodcoops/third-party into 2251-shift-screen-associate
```
  Damien Moulard authored Mar 10, 2022
  2c422b94 Browse Files
- fix record presence screen style · 0b9eec41
  Damien Moulard authored Mar 10, 2022
  
  0b9eec41 Browse Files
- Merge branch 'dev_cooperatic' into 2251-shift-screen-associate · d4e58ed9
  Etienne Freiss authored Mar 10, 2022
  
  d4e58ed9 Browse Files
- Merge branch '2251-shift-screen-associate' of… · fe9266d5
```
Merge branch '2251-shift-screen-associate' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into 2251-shift-screen-associate
```
  Etienne Freiss authored Mar 10, 2022
  fe9266d5 Browse Files
- change name reopen_registration · a94dfe0c
  Etienne Freiss authored Mar 10, 2022
  
  a94dfe0c Browse Files
- Merge branch '2459-search-associate-only-in-members' into 'dev_cooperatic' · 6aa05fdd
```
2459-search-associate-only-in-members

See merge request !138
```
  Damien Moulard authored Mar 10, 2022
  6aa05fdd Browse Files
- fix style in calendar shift list · 1611fdbc
  Damien Moulard authored Mar 10, 2022
  
  1611fdbc Browse Files
- Merge branch 'dev_cooperatic' into 2387-member-points · 3f56c19b
  Félicie authored Mar 10, 2022
  
  3f56c19b Browse Files
- number points added · e70a0559
  Félicie authored Mar 10, 2022
  
  e70a0559 Browse Files
- Merge branch '2460-center-inscription-page' into 'dev_cooperatic' · 5bc06b9f
```
2460-center-inscription-page

See merge request !139
```
  Damien Moulard authored Mar 10, 2022
  5bc06b9f Browse Files
- shift_type added · 96e847ab
  Félicie authored Mar 10, 2022
  
  96e847ab Browse Files
- Merge branch '2417-diferent-color-for-makeups' into 'dev_cooperatic' · 3ac8dfd8
```
develop

See merge request !137
```
  Damien Moulard authored Mar 10, 2022
  3ac8dfd8 Browse Files
- fix error message not being displayed in calendar · 0f923906
  Damien Moulard authored Mar 10, 2022
  
  0f923906 Browse Files
- quickfix · e34df3cc
  Damien Moulard authored Mar 10, 2022
  
  e34df3cc Browse Files
- small fix in calendar legend · f544f2db
  Damien Moulard authored Mar 10, 2022
  
  f544f2db Browse Files
- Merge branch 'ticket_2473' into 'dev_cooperatic' · a28e4a63
```
Ticket 2473 : If a product stock value is 0 and sales average value is 0, set 1 package to order

See merge request !136
```
  Damien Moulard authored Mar 10, 2022
  a28e4a63 Browse Files
- fix merge conflict · ef2f29e4
  Damien Moulard authored Mar 10, 2022
  
  ef2f29e4 Browse Files
- Merge branch 'ticket_2416' into 'dev_cooperatic' · 47f168b8
```
#2416 Fixing Mozilla input number lack off blur event firing

See merge request !135
```
  Damien Moulard authored Mar 10, 2022
  47f168b8 Browse Files
- Merge branch 'dev_cooperatic' into 2251-shift-screen-associate · b5ae60ba
  Etienne Freiss authored Mar 10, 2022
  
  b5ae60ba Browse Files
- modif typo · 7efbf85d
  Etienne Freiss authored Mar 10, 2022
  
  7efbf85d Browse Files
09 Mar, 2022 9 commits
- develop · 6b49fec1
  Etienne Freiss authored Mar 09, 2022
  
  6b49fec1 Browse Files
- develop · dca25d09
  Etienne Freiss authored Mar 09, 2022
  
  dca25d09 Browse Files
- develop · 84f0455b
  Etienne Freiss authored Mar 09, 2022
  
  84f0455b Browse Files
- Ticket 2473 : If a product stock value is 0 and sales average value is 0, set 1 package to order · 310ce8a3
  François C. authored Mar 09, 2022
  
  310ce8a3 Browse Files
- Fix eslint warning · cc101100
  François C. authored Mar 09, 2022
  
  cc101100 Browse Files
- #2416 Fixing Mozilla input number lack off blur event firing · 5b119348
  François C. authored Mar 09, 2022
  
  5b119348 Browse Files
- Merge branch '2425-delete-future-registration' into 'dev_cooperatic' · afe5a5e8
```
2425 delete future registration

See merge request !133
```
  Etienne Freiss authored Mar 09, 2022
  afe5a5e8 Browse Files
- Merge branch '2386-fix-scroll-reloads-calendar' into 'dev_cooperatic' · 3f8e967a
```
only apply func on resize in a width threshold is passed

See merge request !132
```
  Etienne Freiss authored Mar 09, 2022
  3f8e967a Browse Files
- develop · a7f142e4
  Etienne Freiss authored Mar 09, 2022
  
  a7f142e4 Browse Files
08 Mar, 2022 5 commits
- admin bdm - registrations - deleting a makeup adds a point · b9c9621d
  Damien Moulard authored Mar 08, 2022
  
  b9c9621d Browse Files
- linting · ba8cceb1
  Damien Moulard authored Mar 08, 2022
  
  ba8cceb1 Browse Files
- prevent deleting a makeup · ab49214a
  Damien Moulard authored Mar 08, 2022
  
  ab49214a Browse Files
- delete future registration · 23109cf5
  Damien Moulard authored Mar 08, 2022
  
  23109cf5 Browse Files
- Merge branch '2253-new-binome' into 'dev_cooperatic' · 41c352f2
```
2253 new binome

See merge request !130
```
  François C. authored Mar 08, 2022
  41c352f2 Browse Files
07 Mar, 2022 2 commits
- can delete future shifts buttons & offer extra shifts · 9298c1f1
  Damien Moulard authored Mar 07, 2022
  
  9298c1f1 Browse Files
- column point added · 7ce1951e
  Félicie authored Mar 07, 2022
  
  7ce1951e Browse Files