Fab
|
389d8df85a
|
Merge branch 'develop'
|
3 years ago |
Fab
|
7bbd628d09
|
[backend] page user
|
3 years ago |
Fab
|
6c5e9a490f
|
[backend] page user
|
3 years ago |
Fab
|
de7bfda612
|
Merge branch 'feature/backend/pageUser' into develop
|
3 years ago |
Fab
|
3cfa73ceb7
|
[Backend] Page user
|
3 years ago |
Guillaume
|
6dba2c2804
|
Merge branch 'master' of https://gitea.laclic.fr/Laclic/LcShopBundle
|
3 years ago |
Guillaume
|
5202eae2dd
|
Merge branch 'develop'
|
3 years ago |
Fab
|
c7d98075c1
|
[Backend] Classement des utilisateurs
|
3 years ago |
Guillaume
|
a487ea89b3
|
Merge branch 'develop'
|
3 years ago |
Fab
|
f31a8367ca
|
[Backend] Découpage et recherche sur champ user name/firstname/email
|
3 years ago |
Fab
|
bb51988559
|
[Backend] Découpage et recherche sur champ user name/firstname/email
|
3 years ago |
Guillaume
|
cc415b9650
|
Correctif Captcha
|
3 years ago |
Guillaume
|
5ec9e02b56
|
Merge branch 'develop'
|
3 years ago |
Guillaume
|
0fe2d9f752
|
Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop
|
3 years ago |
Guillaume
|
117243f02d
|
[Backend] Produits : correctif recherche par catégorie parente
|
3 years ago |
Guillaume
|
bc027266ed
|
Merge branch 'master' of https://gitea.laclic.fr/Laclic/LcShopBundle
|
3 years ago |
Guillaume
|
1e9e4c32ee
|
Merge branch 'develop'
|
3 years ago |
Fab
|
72caa20bf6
|
Merge branch 'master' of https://gitea.laclic.fr/Laclic/LcShopBundle
|
3 years ago |
Fab
|
a95cdc4102
|
Merge branch 'develop'
|
3 years ago |
Fab
|
d9805447d8
|
[Backend] Mise en mémoire des filtres
|
3 years ago |
Guillaume
|
601753e9a3
|
Merge branch 'develop'
|
3 years ago |
Fab
|
3b14e6b782
|
Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop
|
3 years ago |
Fab
|
e98510a960
|
[Backend] Mise en mémoire des filtres
|
3 years ago |
Guillaume
|
dc98ad3655
|
Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop
|
3 years ago |
Guillaume
|
3920aba9cb
|
ProductFamilyRepository : status = 1
|
3 years ago |
Fab
|
c19053500a
|
[Backend] Mise en mémoire des filtres
|
3 years ago |
Fab
|
d24fc88eb4
|
[Backend] Mise en mémoire des filtres
|
3 years ago |
Guillaume
|
f5cf858d98
|
Merge branch 'develop'
|
3 years ago |
Guillaume
|
d841c1d2b2
|
Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop
|
3 years ago |
Guillaume
|
ab3ac7ee6d
|
Merge branch 'feature/tableau_edition_avancee' into develop
# Conflicts:
# ShopBundle/Model/ProductFamily.php
# ShopBundle/Resources/public/css/backend/custom.css
# ShopBundle/Resources/views/backend/default/list.html.twig
# ShopBundle/Resources/views/backend/productfamily/edit.html.twig
# ShopBundle/Resources/views/backend/productfamily/form.html.twig
|
3 years ago |
Fab
|
ae186b8de2
|
Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop
|
3 years ago |
Fab
|
6f73e857bd
|
[Backend] filtre sauvegardé
|
3 years ago |
Guillaume
|
989a3229ce
|
Merge branch 'master' of https://gitea.laclic.fr/Laclic/LcShopBundle
|
3 years ago |
Guillaume
|
c31fba0e6d
|
Merge branch 'develop'
|
3 years ago |
Fab
|
b93d378e70
|
Merge branch 'master' of https://gitea.laclic.fr/Laclic/LcShopBundle
|
3 years ago |
Fab
|
fa1278580e
|
Merge branch 'develop'
|
3 years ago |
Fab
|
73461779b1
|
[Frontend] Ordre des éléments home
|
3 years ago |
Guillaume
|
14cb988525
|
Merge branch 'develop'
|
3 years ago |
Fab
|
0710c081c8
|
[Backend] Ordre de tri et affichage des commandes du midi
|
3 years ago |
Guillaume
|
3a4e7b24cd
|
Merge branch 'master' of https://gitea.laclic.fr/Laclic/LcShopBundle
|
3 years ago |
Guillaume
|
9b9e79140b
|
Merge branch 'develop'
|
3 years ago |
Guillaume
|
8718381f96
|
ProductCategory : Correctif toString / displaySpecificDay
|
3 years ago |
Guillaume
|
ec1f94fbd6
|
Merge module traiteur v1
|
3 years ago |
Fab
|
265542cd66
|
[Backend] Liste commandes midi, boutton retrait client
|
3 years ago |
Fab
|
37e659edbc
|
[Backend] nombre éléments listes + sauvegardes attributs
|
3 years ago |
Guillaume
|
abe5d6a895
|
CartController : ajout mailUtils
|
3 years ago |
Fab
|
0c72796dfb
|
[Backend] Easyadmin refactoring
|
3 years ago |
Guillaume
|
b2e7b812f8
|
Repas du midi : correctifs
|
3 years ago |
Fab
|
296fc93feb
|
[FrontEnd] Probème ordre des catégories sous-menu
|
3 years ago |
Fab
|
eb0c629d99
|
Merge branch 'develop'
|
3 years ago |