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

25 Mar, 2022 4 commits
- finalize create pair · b1c320b6
  Thibault Grandjean authored Mar 25, 2022
  
  b1c320b6 Browse Files
- Merge branch 'dev_cooperatic' of… · a2101668
```
Merge branch 'dev_cooperatic' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into 2170-create-delete-binome
```
  Thibault Grandjean authored Mar 25, 2022
  a2101668 Browse Files
- update merge makeups · 6182eb4d
  Thibault Grandjean authored Mar 25, 2022
  
  6182eb4d Browse Files
- Merge branch '2493-binome-shift' into 'dev_cooperatic' · c71e8d67
```
2493-binome-shift

See merge request !151
```
  Damien Moulard authored Mar 25, 2022
  c71e8d67 Browse Files
24 Mar, 2022 3 commits
- Merge branch 'dev_cooperatic' into 2493-binome-shift · 64142662
  Félicie authored Mar 24, 2022
  
  64142662 Browse Files
- space · dd218463
  Félicie authored Mar 24, 2022
  
  dd218463 Browse Files
- shift print · 9cde319b
  Félicie authored Mar 24, 2022
  
  9cde319b Browse Files
23 Mar, 2022 1 commit
- Merge branch '2420-regular-shift-admin' into 'dev_cooperatic' · 32757349
```
2420 regular shift admin

See merge request !148
```
  Etienne Freiss authored Mar 23, 2022
  32757349 Browse Files
20 Mar, 2022 1 commit
- Merge branch 'ticket_2595' into 'dev_cooperatic' · e0e9dc85
```
Hotfix #2595 : Add barcode to associated member

See merge request !149
```
  François C. authored Mar 20, 2022
  e0e9dc85 Browse Files
19 Mar, 2022 1 commit
- #2595 : Add barcode to associated member · 31c4a9c8
  François C. authored Mar 19, 2022
  
  31c4a9c8 Browse Files
14 Mar, 2022 3 commits
- Update forms.py · 49b9ab4c
  François C. authored Mar 14, 2022
  
  49b9ab4c Browse Files
- update modal and create · 2ce57329
  Thibault Grandjean authored Mar 14, 2022
  
  2ce57329 Browse Files
- update · b073169b
  Thibault Grandjean authored Mar 14, 2022
  
  b073169b Browse Files
11 Mar, 2022 20 commits
- fix display update after deleting shift template registration · 3795a517
  Damien Moulard authored Mar 11, 2022
  
  3795a517 Browse Files
- fix merge conflict · cc820c8f
  Damien Moulard authored Mar 11, 2022
  
  cc820c8f Browse Files
- delete shift template registration · 7ce5e25b
  Damien Moulard authored Mar 11, 2022
  
  7ce5e25b Browse Files
- remove logs · c87c1ccf
  Thibault Grandjean authored Mar 11, 2022
  
  c87c1ccf Browse Files
- 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
- WIP: delete shift template registration · c443f682
  Damien Moulard authored Mar 11, 2022
  
  c443f682 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
- change btn class · 9b7f05d2
  Thibault Grandjean authored Mar 11, 2022
  
  9b7f05d2 Browse Files
- add confirmation modal for create pair · 8b9bd260
  Thibault Grandjean authored Mar 11, 2022
  
  8b9bd260 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
- add confirmation for deletion and loading modal. · 50e242ce
  Thibault Grandjean authored Mar 11, 2022
  
  50e242ce 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 '2170-create-delete-binome' of… · 7ff5f591
```
Merge branch '2170-create-delete-binome' of https://gl.cooperatic.fr/cooperatic-foodcoops/third-party into 2170-create-delete-binome
```
  Thibault Grandjean authored Mar 11, 2022
  7ff5f591 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
- fix bool object is not subscriptable · 20abb761
  Thibault Grandjean authored Mar 11, 2022
  
  20abb761 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 7 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
- display member in shift template management · b6673825
  Damien Moulard authored Mar 10, 2022
  
  b6673825 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