Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
128,454 Commits 36 Branches 190 Tags
8e6674ff6f24fde80485b8d29b70fccff3eaa3d4
Commit Graph

421 Commits

Author SHA1 Message Date
Laurent Destailleur
8e6674ff6f Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-04-04 17:56:06 +02:00
Benjamin Falière
8156fbfea3 FIX: Ticket new message notification sent twice 2024-04-04 11:44:22 +02:00
Laurent Destailleur
dd5d70ad5d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 
Conflicts:
	htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
	htdocs/public/ticket/create_ticket.php
	htdocs/public/ticket/index.php
	htdocs/public/ticket/list.php
	htdocs/public/ticket/view.php
	htdocs/ticket/agenda.php
	htdocs/ticket/card.php
	htdocs/ticket/class/ticket.class.php
	htdocs/ticket/contact.php
	htdocs/ticket/document.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
	htdocs/ticket/messaging.php
	htdocs/ticket/stats/index.php
 2024-03-20 02:25:58 +01:00
Laurent Destailleur
a7223719a5 Merge pull request #28446 from rycks/18.0-ticket_code_review 
18.0 fix links error on dedicated virtualhost and ticket code review
 2024-03-20 01:55:57 +01:00
Laurent Destailleur
43a3f449c4 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-19 17:07:51 +01:00
Laurent Destailleur
b705dd8094 NEW Support Reply-To tracking in emails sending (tickets only for the 
moment)

Conflicts:
	htdocs/core/class/CMailFile.class.php
	htdocs/ticket/class/ticket.class.php
 2024-03-19 16:42:27 +01:00
Laurent Destailleur
78d49e6713 Update ticket.class.php 2024-03-16 15:51:21 +01:00
Laurent Destailleur
e72671bf50 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0 2024-03-11 13:39:04 +01:00
Charles
23723289c2 Update ticket.class.php update function (#28722) 
Default value for status to zero(0) instead of "null"
 2024-03-09 01:05:58 +01:00
Eric Seigne
a2fb7884f9 precommit cleanup 2024-02-28 08:00:12 +01:00
Eric Seigne
9d24025496 use TICKET_URL_PUBLIC_INTERFACE 2024-02-27 00:24:22 +01:00
Frédéric FRANCE
39d8732879 fix missing status if unread (status = 0) (#28443) 2024-02-27 00:14:22 +01:00
Eric Seigne
5ec5369289 conver conf->global to getDolGlobalString 2024-02-27 00:09:35 +01:00
William Mead
43ec918e63 FIX #27670 Qual clean ticket libstatut method (#28025) 
* Fixed empty labelStatus. Refactored logic.

* Added contributor details

* Cleaned PHPDoc
 2024-02-08 02:07:05 +01:00
Laurent Destailleur
5d6448a8a2 css 2024-02-07 23:54:30 +01:00
Laurent Destailleur
9acceb8e8e Debug v19 2024-02-07 23:52:03 +01:00
Laurent Destailleur
acfbc74f06 Debug v19 2024-01-02 15:17:57 +01:00
Laurent Destailleur
b28ae5d8d3 Clean code 2023-12-27 12:12:20 +01:00
Laurent Destailleur
7f5df80efd Debug v19 2023-12-19 11:51:48 +01:00
MDW
b0414dd078 Fix utf8_encoding/decoding (rather than creating new function replacements) 2023-12-07 03:37:05 +01:00
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
619155f65e Fix with php-cs-fixer 2023-12-04 13:53:48 +01:00
Frédéric FRANCE
53c8a3acf8 clean phpdoc for phpstan (#26905) 2023-12-01 19:51:32 +01:00
Laurent Destailleur
075ee02901 Fix php8.2 warnings 2023-11-27 12:08:48 +01:00
Laurent Destailleur
e6eb34a8db Fiw warnings: The private array ->status_short, ->statuts and 
->status_long are now array ->labelStatusShort and ->labelStatus
everywhere.
 2023-11-24 10:10:24 +01:00
HENRY Florian
70a5a85eac fix: various getDol, display error on public page (#26652) 
* fix: various getDol, display error on public page

* fix: various getDol, display error on public page
 2023-11-17 11:39:16 +01:00
Laurent Destailleur
69642e1048 Fix missing the src type and id when uploading a file as a message of 
ticket
 2023-11-13 12:36:38 +01:00
Laurent Destailleur
4cd4221a52 Debug v19. Remove some TODO. 2023-11-09 10:56:13 +01:00
MDW
c0c5eccfb5 Fix some phan notices (not critical) (#26265) 2023-10-20 02:22:07 +02:00
Laurent Destailleur
2cfa9f8290 Debug v19 2023-10-17 15:43:56 +02:00
Laurent Destailleur
c2bdb3be90 Fix php8.2 warnings 2023-10-15 18:41:39 +02:00
Benjamin Falière
b220e1acbd NEW Assign contact to a ticket message (#24735) 
* NEW Assign contact to a ticket message

* FIX conflict

---------

Co-authored-by: Benjamin Falière <benjamin.faliere@altairis.fr>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-11 03:36:15 +02:00
Laurent Destailleur
3cb78be3ac Clean code 2023-09-29 16:27:07 +02:00
Charles
72b995d568 Update ticket.class.php - SQL Syntax Error 
Function "loadCacheCategoriesTickets" query had two WHERE clauses.  Change the second "WHERE" to "AND".
 2023-09-28 00:31:45 +02:00
Charles
8377b8f3f0 Update ticket.class.php - SQL Syntax Error 
Function "loadCacheCategoriesTickets" query had two WHERE clauses.  Change the second "WHERE" to "AND".
 2023-09-27 14:14:03 -05:00
Laurent Destailleur
7bbc3bab05 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-27 17:17:41 +02:00
Regis Houssin
be9adbec41 FIX uniformize getEntity sql request 2023-09-27 00:05:36 +02:00
Regis Houssin
5fccbcb9ae FIX add field "entity" only in $tabfieldinsert 2023-09-23 10:05:36 +02:00
Laurent Destailleur
0c3e516e57 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-13 03:08:46 +02:00
Laurent Destailleur
bf3c0e9d4a FIX Avoid duplicate popup when popup setup to work as ajax 2023-09-12 10:52:15 +02:00
Laurent Destailleur
e40a5063a9 Clean code 2023-09-11 19:02:03 +02:00
Laurent Destailleur
91fa48199a Fix warnings 2023-09-10 17:41:22 +02:00
Laurent Destailleur
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +02:00
Laurent Destailleur
99406caa3a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-08 15:26:21 +02:00
Laurent Destailleur
5a9b2ce8de Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-08 14:45:09 +02:00
Laurent Destailleur
ec28a40d53 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-08 14:43:32 +02:00
Laurent Destailleur
1995ee7a03 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-09-08 14:29:30 +02:00
tnegre
ab7ab5c817 FIX : message order in ticket public view is not coherent with tickets events tab 2023-09-05 16:19:20 +02:00
Laurent Destailleur
40e739dab6 Clean dead code 2023-09-01 00:08:31 +02:00
Laurent Destailleur
3263982b24 Merge pull request #25616 from frederic34/develop-1 
remove debug
 2023-08-11 13:19:41 +02:00