ldc-qrcollector-back

forge-joniko/ldc-qrcollector-back

Fork 0

Commit graph

d07a6b13f1 Merge branch 'trunk' master K Muller 2026-10-23 13:25:25 +02:00
8e5bfbfb03 Merge branch 'develop' into trunk trunk K Muller 2026-10-23 13:25:13 +02:00
3ee706c80b fix: 🐛 change pid develop K Muller 2026-10-23 13:24:58 +02:00
9f46b6cb08 fix: 🐛 error with composer.lock K Muller 2026-10-23 11:09:43 +02:00
827573c07c Merge branch 'trunk' K Muller 2026-10-23 09:26:50 +02:00
ebbf947f6e Merge branch 'develop' into trunk K Muller 2026-10-23 09:26:35 +02:00
0c8bcc9937 fix: 🐛 error with composer.lock in master branch K Muller 2026-10-23 09:26:13 +02:00
cfd7252311 fix: 🐛 resolve conflict + pass in php8.5 for cve patch K Muller 2026-10-23 09:11:42 +02:00
de92761b82 Merge branch 'develop' into trunk K Muller 2026-10-23 09:00:54 +02:00
93673a9034 fix: 🐛 pass into php 8.5 for patch CVE K Muller 2026-10-23 08:59:40 +02:00
76728fdf13 Merge branch 'issue-21' into 'master' Karl M'muller 2026-07-29 09:33:33 +00:00
e41f3e8a67 fix 🐛 error sentry on version 7.3 Abdel LAMRANI 2026-07-17 16:46:22 +02:00
1ddba0d8f2 docs: 📝 Added rgpd.md 17-rgpd Noah Lancien 2026-06-26 15:56:14 +02:00
03883bdc8a Merge branch 'develop' into trunk K Muller 2026-06-25 14:26:03 +02:00
f8c4c03941 Merge branch '19-url-validation' into 'develop' Karl M'muller 2026-06-25 12:25:47 +00:00
de078eb142 fix: 🐛 validate urls as urls instead of strings Noah Lancien 2026-06-25 12:32:32 +02:00
7219701f4b Merge branch 'develop' into trunk K Muller 2026-06-25 11:43:31 +02:00
14b28365bc Merge branch 'issue-18' into 'develop' Karl M'muller 2026-06-25 09:43:08 +00:00
ac738c02e0 fix: 🐛 overload Helper and trait from package to accept SVG and fix if image not send Abdel LAMRANI 2026-06-22 15:58:24 +02:00
9d081727bc feat: ✨ config upload image for take SVG Abdel LAMRANI 2026-06-19 17:27:21 +02:00
f8d6f74b17 Merge branch 'develop' into trunk K Muller 2026-06-18 17:48:31 +02:00
7369d3c820 Merge branch '14-fixes' into 'develop' karl.muller 2026-06-18 15:48:07 +00:00
479cb39cc0 feat: ✨ Remove relation between stats and urls Noah Lancien 2026-06-18 10:59:44 +02:00
5262941eab fix: 🐛 Updated utlstats policies + fixed activitylogs + fixed brand deletion Noah Lancien 2026-06-18 10:12:54 +02:00
25dc69673f Merge branch 'develop' into trunk K Muller 2026-06-11 15:39:19 +02:00
c7577c9d1b Merge branch '14-marketing-access-fix' into 'develop' karl.muller 2026-06-11 13:38:56 +00:00
69e1d855de fix: 🐛 Added handmade admin-secure Noah Lancien 2026-05-28 15:03:21 +02:00
00be8d0d7f Merge branch 'develop' into trunk K Muller 2026-05-21 10:22:49 +02:00
bacb71185c Merge branch '16-missing-translations' into 'develop' karl.muller 2026-05-21 07:56:37 +00:00
cb192d46dc Merge branch '12-duplicate-fix' into 'develop' karl.muller 2026-05-21 07:56:28 +00:00
a10d9f5979 fix: 🐛 500 on urls create Noah Lancien 2026-05-13 12:23:05 +02:00
eecbb56d6c fix: 🐛 Added missing script for submit clone button in cruds Noah Lancien 2026-05-13 11:33:58 +02:00
d367b1d086 fix: 🐛 restrict access in controllers Noah Lancien 2026-05-13 11:32:01 +02:00
9c09746f79 fix: 🐛 use session for pagination instead of cache to match the package method Noah Lancien 2026-05-13 10:55:15 +02:00
8488b8a51c fix: 🐛 Added missing button to duplicate url Noah Lancien 2026-05-13 10:35:30 +02:00
91c42d7dc6 fix: 🐛 Added missing translations Noah Lancien 2026-05-13 09:21:17 +02:00
366ba81e34 Merge branch 'develop' into trunk Noah Lancien 2026-04-23 11:44:12 +02:00
57692c4eae ci: 👷 Added @uwil npm config in Dockerfile Noah Lancien 2026-04-23 11:43:59 +02:00
e4fe50d0c3 Merge branch 'develop' into trunk Noah Lancien 2026-04-23 10:55:03 +02:00
fd82054d0a Merge branch 'bump-php84' into 'develop' Noix 2026-04-23 08:38:13 +00:00
f077ae0c28 Merge branch '5-period-to-enums' into 'bump-php84' Vincent BRIDIER 2026-04-13 12:32:00 +00:00
2c8507829b fix: 🐛 conceptor with no brands couldn't edit an url Noah Lancien 2026-04-13 12:37:27 +02:00
a87a61386d feat: ✨ replaced string by enums for statis periods Noah Lancien 2026-04-13 12:36:48 +02:00
078894c577 Merge branch '11-transparency' into 'bump-php84' Vincent BRIDIER 2026-04-13 07:02:04 +00:00
f0fa683a37 feat: ✨ Added Vue3ColorPicker to others color fields Noah Lancien 2026-04-10 17:16:17 +02:00
fc49072916 feat: ✨ Added transaprency to qr generator Noah Lancien 2026-04-10 17:07:47 +02:00
31e585b5a1 Merge branch '14-open-bo' into 'bump-php84' Vincent BRIDIER 2026-04-08 14:34:14 +00:00
04049ea4c3 fix: 🐛 updated some policies Noah Lancien 2026-04-08 15:06:41 +02:00
43d9d846cf feat: ✨ Added marketing role Noah Lancien 2026-04-08 09:42:05 +02:00
6f40f7f3a7 feat: ✨ Added admin-secure Noah Lancien 2026-04-08 09:31:26 +02:00
2c86d0094e Merge branch '12-duplicate-qrcode' into 'bump-php84' noah.lancien 2026-04-08 13:10:39 +00:00
fee8a3ec10 feat: ✨ support duplication for url models Noah Lancien 2026-04-03 14:14:40 +02:00
f830e07f3e feat: ✨ added commit lint with husky Noah Lancien 2026-04-03 14:13:58 +02:00
951fa0311e clean: eslint errors Noah Lancien 2026-04-02 16:59:24 +02:00
dad597ba87 chore: bump php8.4 + laravel12 Noah Lancien 2026-02-12 16:09:21 +01:00
c5a963ec54 Merge branch 'develop' into trunk Noah Lancien 2026-01-09 10:42:33 +01:00
73e6dd5194 ci: added ci variables to define pod resources Noah Lancien 2026-01-09 10:39:33 +01:00
4fe4030f57 Merge branch 'trunk' Vincent BRIDIER 2025-11-27 09:53:12 +01:00
c3f11e5061 Merge branch 'develop' into trunk Vincent BRIDIER 2025-11-27 09:35:37 +01:00
f21567e028 Fix: revert port on manifet Vincent BRIDIER 2025-11-27 09:35:23 +01:00
b57189277f Merge branch 'trunk' Vincent BRIDIER 2025-11-27 09:22:06 +01:00
139efff5d7 Merge branch 'develop' into trunk Vincent BRIDIER 2025-11-27 09:10:39 +01:00
57554f4156 feat: Add DB_HOST and DB_PORT into manifest.yaml Vincent BRIDIER 2025-11-27 09:10:26 +01:00
046695112a Merge branch 'issue-8' into 'develop' noah.lancien 2025-07-16 12:58:20 +00:00
576bfc8b32

refactor: ♻️ refactoring of all methods to obtain chartjs #8 Alexis Gousseau 2023-12-19 15:24:31 +01:00
bfb579eb26 Merge branch 'trunk' Noah Lancien 2025-02-24 15:58:10 +01:00
ae2acc7135 Merge branch 'develop' into trunk Noah Lancien 2025-02-24 15:57:30 +01:00
13532c05ae Merge branch 'issue-13' into 'develop' noah.lancien 2025-02-24 14:54:41 +00:00
49cac11412 fix: 🔥 remove all reference to APP_URL_FRONT Nicolas Demangeat 2025-02-24 15:52:16 +01:00
3f81a0b3f6 feat: 🔥 remove APP_APP_URL_FRONT reference in manifest Nicolas Demangeat 2025-02-24 11:03:28 +01:00
0dcc78ff15

Merge branch 'trunk' Vincent BRIDIER 2025-02-10 14:28:09 +01:00
90540ec61b

Merge branch 'develop' into trunk Vincent BRIDIER 2025-02-07 18:48:13 +01:00
76cd500aa8 Update manifest Vincent BRIDIER 2025-02-07 17:47:46 +00:00
e79789868b Merge branch 'develop' into trunk Karl Muller 2025-02-06 08:46:02 +00:00
5bbf4e531d Merge branch 'unify-projects' into 'develop' karl.muller 2025-02-06 08:43:32 +00:00
a0ca50ad4e ci: Updated manifest.yaml Noah Lancien 2025-02-05 18:06:00 +01:00
058979eb04 clean: use firstOrNew instead of condition Noah Lancien 2025-02-05 16:53:19 +01:00
483c415d4d feat: Moved redirections and stats incrementation from front project Noah Lancien 2025-02-04 11:06:42 +01:00
dabe7313d5 Merge branch 'trunk' Karl Muller 2025-01-14 09:06:59 +00:00
a8a7c09ac2 Merge branch 'develop' into trunk Karl Muller 2025-01-14 09:00:31 +00:00
737d69e94f fix: last update was in php 8.3, put it back in 7.3 Karl Muller 2025-01-14 09:00:09 +00:00
57aa99ce10 Merge branch 'develop' into trunk Karl Muller 2025-01-14 08:44:28 +00:00
7adb1d5005 fix: change manifest for cron issue Karl Muller 2025-01-14 08:44:01 +00:00
bf69010694 Merge branch 'trunk' into 'master' Thibault Raquet 2024-06-27 10:09:53 +00:00
f412bebed5 Merge branch 'develop' into 'trunk' Thibault Raquet 2024-06-27 10:09:25 +00:00
564de0d2bd Merge branch 'prod-migration' into 'develop' Thibault Raquet 2024-06-27 10:08:59 +00:00
d43c223101 Prod migration Thibault Raquet 2024-06-27 10:08:59 +00:00
04c702a161

Merge branch 'trunk' Jérémy Munsch 2024-04-26 13:57:07 +02:00
5e06b6b95e

Merge branch 'develop' into trunk Jérémy Munsch 2024-04-26 13:57:01 +02:00
c0f82c577d

makesure to cast http to https in specific condition for api request signature Jérémy Munsch 2024-04-26 13:56:39 +02:00
e7f989e392 Merge branch 'fix-signature' into 'develop' Jérémy Munsch 2024-04-26 11:53:41 +00:00
5af7cddaf9 fix signature http/https Noah Lancien 2024-04-26 13:52:19 +02:00
48a8252c80

Merge branch 'trunk' Jérémy Munsch 2024-04-25 10:14:49 +02:00
97c27f8eb6

Merge branch 'develop' into trunk Jérémy Munsch 2024-04-25 10:14:15 +02:00
69a51c2f07 Merge branch 'issue-7' into 'develop' Jérémy Munsch 2024-04-25 07:19:05 +00:00
e06d3d7d25 Merge branch 'api' into 'develop' Jérémy Munsch 2024-04-25 07:15:28 +00:00
e9d09e0693 Fixed replaced files Noah Lancien 2024-04-24 16:19:02 +02:00
ff0eb7aedb Updated the api autentication Noah Lancien 2024-04-23 14:29:01 +02:00
221e44fe2f Fixed url stats requests Noah Lancien 2024-04-08 16:49:48 +02:00
4e2038f82a add title on urls - issue #7 Alexis Gousseau 2023-12-18 16:37:25 +01:00