Commit graph

842 commits

Author SHA1 Message Date
Karl Muller
0da4a6fa13 Merge branch 'trunk' 2025-01-13 13:56:41 +00:00
Karl Muller
b6720bae3d Merge branch 'develop' into trunk 2025-01-13 13:46:09 +00:00
Karl Muller
a58bf2ff3b fix: change manifest for cron issue 2025-01-13 13:45:04 +00:00
Noah Lancien
2b94d780b6 Merge branch 'trunk' 2024-11-26 09:18:29 +01:00
Noah Lancien
74edc5c785 Merge branch 'develop' into trunk 2024-11-26 09:17:42 +01:00
Noah Lancien
4de7a0c5ca fix: remove brackets for Invoice->tasks 2024-11-26 09:17:19 +01:00
Noah Lancien
781161c5e4 Merge branch 'trunk' 2024-11-25 17:19:55 +01:00
Noah Lancien
2d70ff9f29 Merge branch 'develop' into trunk 2024-11-25 17:18:41 +01:00
Noah Lancien
27258558a7 chore: composer update to fix some CVE 2024-11-25 17:18:25 +01:00
Noah Lancien
17a01e1f7a Merge branch 'trunk' 2024-11-25 17:12:45 +01:00
Karl Muller
e3d828a9e5 Merge branch 'develop' into trunk 2024-11-25 15:50:32 +00:00
karl.muller
9a1f23b85f Merge branch 'issue-70' into 'develop'
feat: 💄 improve invoice pdf

See merge request ldc-web/projets/support-web!90
2024-11-25 15:48:53 +00:00
Nicolas Demangeat
260e109ba1 feat: 💄 improve invoice pdf 2024-11-25 15:58:56 +01:00
Noah Lancien
d17678342e Merge branch 'trunk' 2024-11-12 14:32:29 +01:00
Noah Lancien
b646cb41fe Merge branch 'develop' into trunk 2024-11-12 14:07:35 +01:00
Noah Lancien
8f690473f8 chore: phpcs 2024-11-12 14:06:31 +01:00
noah.lancien
cc7a9b54e5 Merge branch 'issue-67' into 'develop'
Issue 67

See merge request ldc-web/projets/support-web!88
2024-11-12 13:02:58 +00:00
Noah Lancien
5e459a6571 fix: some elements crashed since the inscrease of files in tickets and messages 2024-11-12 12:52:21 +01:00
Vincent BRIDIER
2f80eb5853 Update README 2024-08-19 07:53:58 +00:00
Vincent BRIDIER
0ebdc9a984 Update README 2024-08-19 07:53:38 +00:00
Noah Lancien
5bd7673a18 Merge branch 'trunk' 2024-07-31 12:21:21 +02:00
Noah Lancien
2faf043f68 Merge branch 'develop' into trunk 2024-07-31 12:12:17 +02:00
noah.lancien
a44ee6f83c Merge branch 'issue-68' into 'develop'
fix: deleted user management for estimation

See merge request ldc-web/projets/support-web!89
2024-07-31 10:10:40 +00:00
Nicolas Demangeat
6ae38392ea fix: deleted user management for estimation 2024-07-31 12:02:15 +02:00
Nicolas Demangeat
c770d5d80e feat: you can set the amout by 0.5hours now, improve display in invoice show blade 2024-07-29 15:20:57 +02:00
Nicolas Demangeat
e7c1acf8a4 feat: can add 3 files for messages and 5 for tickets 2024-07-29 14:23:37 +02:00
Nicolas Demangeat
23e296978d wip: mimes type for ticket files 2024-07-29 08:47:28 +02:00
Vincent BRIDIER
66c889b02a
Merge branch 'trunk' 2024-07-26 15:33:24 +02:00
Vincent BRIDIER
74600ef3a7
Merge branch 'develop' into trunk 2024-07-26 15:06:54 +02:00
Vincent BRIDIER
889ee1e7f4
Update SP management for SAML 2024-07-26 15:06:30 +02:00
Vincent BRIDIER
738cfb7aea
PHPCS 2024-07-26 15:05:16 +02:00
Vincent BRIDIER
35e18112b9
Merge branch 'develop' into trunk 2024-07-25 17:29:35 +02:00
Vincent BRIDIER
b024dbd007
Fix SAML without CSP on login + idp pem loading 2024-07-25 17:29:19 +02:00
Nicolas Demangeat
a4d0b131a4 feat: wip, validation tickets and messages request 2024-07-23 13:44:51 +02:00
Nicolas Demangeat
c23e2289e5 feat: wip issue 67 2024-07-22 11:32:03 +02:00
Vincent BRIDIER
f10b46a012
Merge branch 'trunk' 2024-07-20 23:18:59 +02:00
Vincent BRIDIER
523715a3c1
Merge branch 'develop' into trunk 2024-07-20 23:01:04 +02:00
Vincent BRIDIER
2eacc46be0
Add SAML deps for IDP feature 2024-07-20 23:00:34 +02:00
Vincent BRIDIER
c8b4f97c88
Merge branch 'trunk' 2024-07-10 15:23:32 +02:00
Vincent BRIDIER
65b92edc99
Merge branch 'develop' into trunk 2024-07-10 15:23:17 +02:00
Vincent BRIDIER
0874e9202c Merge branch 'issue-64' into 'develop'
fix: InvoiceTasksComponent and invoice.blade

See merge request ldc-web/projets/support-web!87
2024-07-10 09:06:39 +00:00
nicolas.demangeat
ae68ce0f16 fix: InvoiceTasksComponent and invoice.blade
Close #64
2024-07-10 09:06:38 +00:00
Thibault Raquet
2ee245be4c Merge branch 'trunk' into 'master'
Trunk

See merge request ldc-web/projets/support-web!86
2024-06-27 08:58:58 +00:00
Thibault Raquet
766a990361 Merge branch 'develop' into 'trunk'
Develop

See merge request ldc-web/projets/support-web!85
2024-06-27 08:58:33 +00:00
Thibault Raquet
dc47b8d6e2 Merge branch 'prod-migration' into 'develop'
Prod migration

See merge request ldc-web/projets/support-web!84
2024-06-27 08:58:01 +00:00
Thibault Raquet
fad9d1207f Prod migration 2024-06-27 08:58:01 +00:00
Vincent BRIDIER
a23509fa09
Merge branch 'trunk' 2024-06-11 10:22:48 +02:00
Vincent BRIDIER
6c8cc25bae
Merge branch 'develop' into trunk 2024-06-11 10:07:26 +02:00
Vincent BRIDIER
af4509c7ca Merge branch 'fixed-invoices-new-lines' into 'develop'
Fix: Invoices new lines are now displayed

See merge request ldc-web/projets/support-web!83
2024-06-11 08:06:42 +00:00
Vincent BRIDIER
58280dd384 Merge branch 'invoice-search' into 'develop'
Invoice search

See merge request ldc-web/projets/support-web!81
2024-06-11 08:06:16 +00:00