Commits · 888a3e23bfa9c0729f2a421cbea61c94fbae3dda · cooperatic-foodcoops / third-party · GitLab

11 Mar, 2022 10 commits
- Merge branch '2463-go-to-normal-validation-for-associated-member' into 'dev_cooperatic' · 888a3e23
```
fix bug

See merge request !144
```
  Damien Moulard authored Mar 11, 2022
  888a3e23 Browse Files
- Merge branch '2500-delete-extra-shift-display-date-bug' into 'dev_cooperatic' · c7b3bf64
```
2500 delete extra shift display date bug

See merge request !147
```
  Félicie authored Mar 11, 2022
  c7b3bf64 Browse Files
- Merge branch 'dev_cooperatic' into 2500-delete-extra-shift-display-date-bug · a3ec6bff
  Etienne Freiss authored Mar 11, 2022
  
  a3ec6bff Browse Files
- fix bug · 7af15e88
  Etienne Freiss authored Mar 11, 2022
  
  7af15e88 Browse Files
- #2475 force search input clearing when order changes (orders helper) · fe8b6ea3
  François C. authored Mar 11, 2022
  
  fe8b6ea3 Browse Files
- Merge branch 'dev_cooperatic' into 2463-go-to-normal-validation-for-associated-member · 730e964d
  Etienne Freiss authored Mar 11, 2022
  
  730e964d Browse Files
- fix bug · 756ec12a
  Etienne Freiss authored Mar 11, 2022
  
  756ec12a Browse Files
- Merge branch '2496-create-connection-for-shift-registration-station' into 'dev_cooperatic' · 3ecb4014
```
2496 create connection for shift registration station

See merge request !146
```
  Damien Moulard authored Mar 11, 2022
  3ecb4014 Browse Files
- Merge branch '2469-correct-affect-associate-button' into 'dev_cooperatic' · 18b87a0d
```
2469 correct affect associate button

See merge request !145
```
  Damien Moulard authored Mar 11, 2022
  18b87a0d Browse Files
- Merge branch '2462-enter-to-search-associate' into 'dev_cooperatic' · e2fd0fe2
```
2462 enter to search associate

See merge request !143
```
  Damien Moulard authored Mar 11, 2022
  e2fd0fe2 Browse Files
10 Mar, 2022 30 commits
- Merge branch '2415-associated-can-choose-makeups' into 'dev_cooperatic' · e2089d28
```
allow associated members to choose makeups + fixs

See merge request !131
```
  Etienne Freiss authored Mar 10, 2022
  e2089d28 Browse Files
- Merge branch 'dev_cooperatic' into 2496-create-connection-for-shift-registration-station · 298c4ee4
  Etienne Freiss authored Mar 10, 2022
  
  298c4ee4 Browse Files
- develop · 1828883a
  Etienne Freiss authored Mar 10, 2022
  
  1828883a Browse Files
- fix merge conflict · 3b4db2e4
  Damien Moulard authored Mar 10, 2022
  
  3b4db2e4 Browse Files
- typo · 50c25ff1
  Etienne Freiss authored Mar 10, 2022
  
  50c25ff1 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 'dev_cooperatic' into 2469-correct-affect-associate-button · 09f9d3a7
  Etienne Freiss authored Mar 10, 2022
  
  09f9d3a7 Browse Files
- fix bug · f601d114
  Etienne Freiss authored Mar 10, 2022
  
  f601d114 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
- fix bug · 47ad69a7
  Etienne Freiss authored Mar 10, 2022
  
  47ad69a7 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
- comment · f58c3d6b
  Etienne Freiss authored Mar 10, 2022
  
  f58c3d6b Browse Files
- fix bug · 8dd016d7
  Etienne Freiss authored Mar 10, 2022
  
  8dd016d7 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