Vincent BRIDIER
|
09371ec005
|
Merge branch 'trunk'
|
2024-12-04 10:15:44 +01:00 |
|
Vincent BRIDIER
|
a0d9daaac5
|
merge develop into trunk
|
2024-12-04 10:14:27 +01:00 |
|
Vincent BRIDIER
|
184da0204b
|
feat: Replace Regate EAI order transfert by email
|
2024-11-29 16:49:59 +01:00 |
|
Vincent BRIDIER
|
e7baad6c14
|
feat: Authorize all BO roles for user import - ts-2165
|
2024-11-28 08:33:54 +01:00 |
|
Vincent BRIDIER
|
8ee5a940c4
|
fix: Update matricule format
|
2024-11-26 13:02:16 +01:00 |
|
Vincent BRIDIER
|
c332696024
|
feat: Make the fu**ing Salarie import works again
|
2024-11-26 12:56:39 +01:00 |
|
Vincent BRIDIER
|
8e8f7463b7
|
Merge branch 'trunk'
|
2024-10-24 16:25:32 +02:00 |
|
Vincent BRIDIER
|
c3034481a9
|
Merge branch 'develop' into trunk
|
2024-10-24 16:25:18 +02:00 |
|
Vincent BRIDIER
|
7f53f2abf8
|
feat: Make the fu**ing Salarie import works again
|
2024-10-24 16:25:12 +02:00 |
|
Vincent BRIDIER
|
f156dd62ef
|
feat: 💩 Update Matricule format on employees import and order export
|
2024-10-18 16:29:55 +02:00 |
|
Vincent BRIDIER
|
895843eccf
|
feat: 💩 Update SalarieSite Enum and Salarie Magasin model method
|
2024-10-18 15:36:57 +02:00 |
|
Vincent BRIDIER
|
27618d98d6
|
Merge branch 'trunk'
|
2024-09-10 09:55:05 +02:00 |
|
Vincent BRIDIER
|
a7bdd1f7e8
|
Merge branch 'develop' into trunk
|
2024-09-10 09:54:57 +02:00 |
|
Vincent BRIDIER
|
683e7fd037
|
fix: Clean and fix cookie notice implementation
|
2024-09-10 09:54:49 +02:00 |
|
Vincent BRIDIER
|
0fa1a32cd2
|
Merge branch 'trunk'
|
2024-09-10 09:38:58 +02:00 |
|
Vincent BRIDIER
|
b4cb0fffdb
|
Merge branch 'develop' into trunk
|
2024-09-10 09:03:26 +02:00 |
|
Vincent BRIDIER
|
52f8757f67
|
Merge branch 'issue-40' into 'develop'
add cookies v3.1.2 - issue #40
See merge request ldc-web/projets/boutique-cnc-sable!56
|
2024-09-09 15:33:04 +00:00 |
|
Vincent BRIDIER
|
97ebaee7dd
|
Merge branch 'orders-filter' into 'develop'
feat: ✨ Closes #46
See merge request ldc-web/projets/boutique-cnc-sable!58
|
2024-09-09 15:31:49 +00:00 |
|
Jérémy Munsch
|
3a3d993d7c
|
feat: ✨ Closes #46
Add orders filter with: a search bar, date filters
|
2024-05-15 16:58:17 +02:00 |
|
Jérémy Munsch
|
f64e2269cf
|
Merge branch 'trunk'
|
2024-04-22 10:37:46 +02:00 |
|
Jérémy Munsch
|
d2dff69570
|
Merge branch 'develop' into trunk
|
2024-04-22 10:37:32 +02:00 |
|
Jérémy Munsch
|
f15e722588
|
VAlidate salarie import
|
2024-04-22 10:37:22 +02:00 |
|
Jérémy Munsch
|
87a72048d1
|
Merge branch 'trunk'
|
2024-04-22 10:00:44 +02:00 |
|
Jérémy Munsch
|
a33c397227
|
Merge branch 'trunk'
|
2024-04-22 14:27:16 +02:00 |
|
Jérémy Munsch
|
8dddfdb05c
|
Merge branch 'develop' into trunk
|
2024-04-22 14:26:56 +02:00 |
|
Jérémy Munsch
|
603b40f1ab
|
Fix home slider trying to print nullable picture
|
2024-04-22 14:26:46 +02:00 |
|
Jérémy Munsch
|
a5405bedc0
|
Merge branch 'trunk'
|
2024-04-22 12:12:45 +02:00 |
|
Jérémy Munsch
|
42a4701767
|
Merge branch 'develop' into trunk
|
2024-04-22 12:11:57 +02:00 |
|
Jérémy Munsch
|
68cb937a60
|
Fixex #43 import CSV
|
2024-04-22 12:11:15 +02:00 |
|
Jérémy Munsch
|
f495fbf8ca
|
Merge branch 'develop' into trunk
|
2024-04-22 10:00:39 +02:00 |
|
Jérémy Munsch
|
f7dbd18583
|
rewrite salarie import
|
2024-04-22 10:00:22 +02:00 |
|
Alexis Gousseau
|
5d0bd6ab1c
|
add cookies v3.1.2 - issue #40
|
2023-12-18 16:03:20 +01:00 |
|
Vincent BRIDIER
|
c53eae5c4a
|
Merge branch 'trunk'
|
2023-10-17 15:36:29 +02:00 |
|
Vincent BRIDIER
|
bc40a141f7
|
Merge branch 'develop' into trunk
|
2023-10-17 15:35:18 +02:00 |
|
Vincent BRIDIER
|
9b81a85258
|
Merge branch '36-month-octobre-nok' into 'develop'
fix octobre
See merge request ldc-web/projets/boutique-cnc-sable!55
|
2023-10-17 13:33:20 +00:00 |
|
Vincent BRIDIER
|
88682869eb
|
Merge branch 'issue-35' into 'develop'
Added method to unsubscribe a crm customer from newsletter
See merge request ldc-web/projets/boutique-cnc-sable!54
|
2023-10-17 13:32:23 +00:00 |
|
noah.lancien
|
c63f332e15
|
Added method to unsubscribe a crm customer from newsletter Close #35
|
2023-10-17 13:32:23 +00:00 |
|
Nicolas Demangeat
|
2bf570a254
|
fix octobre
|
2023-10-16 15:21:11 +02:00 |
|
Vincent BRIDIER
|
f98ca987c2
|
Merge branch 'trunk'
|
2023-09-05 16:09:23 +02:00 |
|
Vincent BRIDIER
|
5320c56a68
|
Merge branch 'develop' into trunk
|
2023-09-05 16:09:10 +02:00 |
|
Vincent BRIDIER
|
7523852d70
|
Merge branch 'issue-30' into 'develop'
Replaced kwaadpepper/exception-handler by sentry
See merge request ldc-web/projets/boutique-cnc-sable!50
|
2023-08-30 09:01:51 +00:00 |
|
noah.lancien
|
d802f19f40
|
Replaced kwaadpepper/exception-handler by sentry
|
2023-08-30 09:01:51 +00:00 |
|
Vincent BRIDIER
|
38431cde79
|
Merge branch 'issue-19' into 'develop'
Issue 19 - Step 1 : calculs
See merge request ldc-web/projets/boutique-cnc-sable!32
|
2023-08-30 08:03:04 +00:00 |
|
noah.lancien
|
995e1f9eb5
|
Issue 19 - Add dashboard stats
|
2023-08-30 08:03:04 +00:00 |
|
Vincent BRIDIER
|
3e5a1526ef
|
Merge branch 'align-faq-left' into 'develop'
Faq questions are now aligned to the left
See merge request ldc-web/projets/boutique-cnc-sable!53
|
2023-08-30 07:53:53 +00:00 |
|
Vincent BRIDIER
|
6d2c2ea95e
|
Merge branch 'fix-negative-basket' into 'develop'
Fixed : Negative basket threw a 500 error
See merge request ldc-web/projets/boutique-cnc-sable!51
|
2023-08-30 07:53:09 +00:00 |
|
Vincent BRIDIER
|
8d25999c0c
|
Merge branch 'issue-32' into 'develop'
Escaped the hyphen in regex
See merge request ldc-web/projets/boutique-cnc-sable!49
|
2023-08-30 07:50:48 +00:00 |
|
Vincent BRIDIER
|
65c7818ae3
|
Merge branch 'issue-31' into 'develop'
Fixed sitemap error and updated the package version
See merge request ldc-web/projets/boutique-cnc-sable!48
|
2023-08-30 07:48:12 +00:00 |
|
Noah Lancien
|
a77a80245a
|
Faq questions are now aligned to the left
|
2023-08-17 12:28:46 +02:00 |
|
Noah Lancien
|
a4a41422ba
|
Fixed : Negative basket threw a 500 error
|
2023-08-16 16:35:47 +02:00 |
|