Commit graph

607 commits

Author SHA1 Message Date
Noah Lancien
7ccd63db5f Merge branch 'trunk' 2025-07-08 16:59:29 +02:00
Noah Lancien
5758a1d40c Merge branch 'develop' into trunk 2025-07-08 16:44:51 +02:00
noah.lancien
4485340355 Merge branch 'issue-67-export' into 'develop'
feat: export file optimization

See merge request ldc-web/projets/boutique-cnc-sable!72
2025-07-08 14:42:03 +00:00
Corentin Huet
e83b77d985 feat: export file optimization 2025-07-08 15:36:23 +02:00
Vincent BRIDIER
ae9ab52f4d Merge branch 'issue-66' into 'develop'
fix: 🐛 error on removeFromCart

See merge request ldc-web/projets/boutique-cnc-sable!71
2025-07-01 14:05:18 +00:00
Karl
dc8fa4da0b fix: 🐛 error on removeFromCart 2025-07-01 15:44:02 +02:00
Vincent BRIDIER
28448a34a7
Merge branch 'trunk' 2025-05-12 15:35:00 +02:00
Karl Muller
f984799a02 Merge branch 'develop' into trunk 2025-04-28 14:46:33 +00:00
karl.muller
3ede971217 Merge branch 'issue-60' into 'develop'
feat: ✨ re-add the stat before the date result on the dashbaord

See merge request ldc-web/projets/boutique-cnc-sable!69
2025-04-28 14:46:07 +00:00
Karl Muller
8118d5a3f9 feat: ✨ re-add the stat before the date result on the dashbaord 2025-04-28 13:03:22 +00:00
Karl Muller
a94589fb13 Merge branch 'develop' into trunk 2025-04-02 08:34:54 +00:00
karl.muller
268ce12f07 Merge branch 'issue-62-division-by-zero' into 'develop'
fix: prevent division by zero in membership rate calculation

See merge request ldc-web/projets/boutique-cnc-sable!68
2025-04-02 08:34:26 +00:00
karl.muller
3656e33e64 Merge branch 'issue-57-laravel-secure' into 'develop'
feat: added admin secure #57

See merge request ldc-web/projets/boutique-cnc-sable!67
2025-04-02 08:34:05 +00:00
Noah Lancien
2bd16742dd clean: rewrite condition to prevent division by zero 2025-04-01 09:43:01 +02:00
Noah Lancien
f27ed8f354 fix: prevent division by zero in membership rate calculation 2025-03-31 16:14:40 +02:00
Corentin Huet
fa3b38ac98 feat: added admin secure 2025-03-31 15:44:32 +02:00
Noah Lancien
24cfb976f6 Merge branch 'develop' into trunk 2025-02-24 15:31:41 +01:00
noah.lancien
7d1f60cfae Merge branch 'issue-52-dashboard-stats' into 'develop'
fix: Display the correct count of employee in the dashboard

See merge request ldc-web/projets/boutique-cnc-sable!66
2025-02-24 14:29:22 +00:00
Noah Lancien
c07ff0dd57 fix: Display the correct count of employee in the dashboard 2025-02-24 15:22:14 +01:00
Noah Lancien
931a79444b Merge branch 'develop' into trunk 2025-02-14 16:20:47 +01:00
Noah Lancien
de4b49495a style: fix z-index in order page 2025-02-14 16:20:28 +01:00
Noah Lancien
c287334426 Merge branch 'develop' into trunk 2025-02-13 15:07:20 +01:00
Noah Lancien
5c91bb5c0f chore: composer update to fix CVE 2025-02-13 15:07:13 +01:00
Noah Lancien
7547491e46 Merge branch 'develop' into trunk 2025-02-13 15:02:00 +01:00
noah.lancien
49ab623187 Merge branch 'issue-51-feedback' into 'develop'
fix: feedback on user basket

See merge request ldc-web/projets/boutique-cnc-sable!65
2025-02-13 14:01:40 +00:00
Noah Lancien
a3b4a4bbca fix: feedback on user basket 2025-02-13 12:46:34 +01:00
Karl Muller
79d9061bc9 fix: 🐛 user->id null on SalarieExportJob + add public holiday with cron + condition on public holiday's calendar 2025-02-12 10:29:03 +00:00
Karl Muller
b14f3ec15e Merge branch 'trunk' 2025-02-06 10:28:17 +00:00
Karl Muller
fa6d969673 Merge branch 'develop' into trunk 2025-02-06 10:27:54 +00:00
Karl Muller
898104d041 fix: 🐛 delete ldcweb:statuschecker from the kernel 2025-02-06 10:26:31 +00:00
Noah Lancien
d3a74682aa Merge branch 'trunk' 2025-02-04 15:32:15 +01:00
Noah Lancien
daa998d721 Merge branch 'develop' into trunk 2025-02-04 15:32:04 +01:00
Noah Lancien
902298519b ci: remove limit resources 2025-02-04 15:31:56 +01:00
Noah Lancien
cd10674138 Merge branch 'trunk' 2025-02-04 15:19:57 +01:00
Vincent BRIDIER
d1babe43f6
Merge branch 'develop' into trunk 2025-01-27 16:04:45 +01:00
Vincent BRIDIER
2687f58217
fix: Remove piece of 💩 2025-01-27 16:04:25 +01:00
Vincent BRIDIER
4fb9363555
feat: Add Laravel K8S 2025-01-27 15:01:08 +01:00
Vincent BRIDIER
0610ca76f0
Merge branch 'develop' into trunk 2025-01-27 10:46:29 +01:00
Vincent BRIDIER
a93d191441
feat: Update queue connection in manifest 2025-01-24 17:27:49 +01:00
Vincent BRIDIER
43fc273663
feat: Update uploads files folder in controllers 2025-01-24 16:44:17 +01:00
Vincent BRIDIER
be698072d0
feat: move uploads file in storage/app/public instead of public/ 2025-01-24 16:34:53 +01:00
Vincent BRIDIER
ed5b2e0077
feat: Add missing newsletters folder 2025-01-24 16:19:51 +01:00
Vincent BRIDIER
9333185e4d
feat: Clean and add CICD for K8S migration 2025-01-24 15:32:29 +01:00
Vincent BRIDIER
7dc3289019
Merge branch 'develop' into trunk 2025-01-23 16:27:11 +01:00
Vincent BRIDIER
ba6380fb94
feat: Issue #49 feedback 2025-01-23 16:25:42 +01:00
Vincent BRIDIER
bab3bef403
feat: Issue #55 feedback 2025-01-23 15:45:05 +01:00
Vincent BRIDIER
f6e06ecd67
feat: Issue #52 feedback 2025-01-23 15:43:53 +01:00
Vincent BRIDIER
0366644c4f
fix: Fix check on salarie and customer relation 2025-01-23 15:35:17 +01:00
Vincent BRIDIER
0efe549f67
Merge branch 'develop' into trunk 2025-01-16 14:35:04 +01:00
Vincent BRIDIER
2da57afa29 Merge branch 'issue-51' into 'develop'
style: 💄 upgrade view of recap basket by component #51

See merge request ldc-web/projets/boutique-cnc-sable!63
2025-01-16 11:16:00 +00:00