Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
73,753 Commits 36 Branches 190 Tags
81f2f99db5f2372e13da8bec64acd61c19f90cb1
Commit Graph

88 Commits

Author SHA1 Message Date
Frédéric FRANCE
81f2f99db5 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +01:00
Laurent Destailleur
8014d72dd5 progress before status 2019-02-11 18:12:27 +01:00
Laurent Destailleur
9b8a13cfe6 Dolibarrize module ticket 2019-02-11 15:41:07 +01:00
Laurent Destailleur
5eceeef3aa Dolibarrize module ticket 2019-02-11 14:51:45 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
daa2fccd73 Fix delete of ticket 2019-01-21 16:42:34 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Regis Houssin
1a15698f96 FIX replace deprecated "print_titre" with "load_fiche_titre" 
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
 2018-12-25 08:36:42 +01:00
Laurent Destailleur
919443a101 Fix merge lost 2018-12-11 18:23:45 +01:00
Laurent Destailleur
024e1673e3 Fix merge lost 2018-12-11 18:18:47 +01:00
Laurent Destailleur
bbcb2aa983 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-10 00:15:54 +01:00
Laurent Destailleur
ff8f235b7e Fix regression when disabling table 2018-12-10 00:15:22 +01:00
Laurent Destailleur
21b3bbc2e6 Merge 2018-12-08 11:55:27 +01:00
Laurent Destailleur
eaa7fe5d14 Removed deprecated code 2018-12-08 11:41:55 +01:00
Laurent Destailleur
a44dca7e71 Removed deprecated table 2018-12-08 11:37:47 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Philippe GRAND
bbf3b3baac fix :#9967 2018-12-01 16:27:14 +01:00
Laurent Destailleur
35419fa206 Dolibarize code 2018-11-11 15:06:08 +01:00
Frédéric FRANCE
c2ee9ba9db Update actions_ticket.class.php 2018-11-10 07:38:55 +01:00
Frédéric FRANCE
2514cf4a96 Update actions_ticket.class.php 2018-11-10 07:32:22 +01:00
Laurent Destailleur
7430a35533 Merge pull request #9966 from madx666/contrib 
Fix public ticket website
 2018-11-08 19:54:36 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
madx666
2ff69bb3fc Fix viewTicketMessages for ticket module 2018-11-07 10:11:28 +01:00
madx666
c76c2e0d3e Fix newMessagePublic for ticket module 2018-11-07 10:08:38 +01:00
Laurent Destailleur
4bdde9ad56 Update ticketlogs.class.php 2018-10-19 12:51:14 +02:00
Frédéric FRANCE
456bdb5b8c do not trim int 2018-10-17 20:04:48 +02:00
ptibogxiv
0e6d3a0f48 FIX delete dictionnary in ticket API 2018-10-16 20:59:06 +02:00
Philippe GRAND
ba40ad4aab Standardize and update code 2018-10-12 12:23:45 +02:00
Philippe GRAND
b183054073 Standardize and update code 2018-09-28 15:57:13 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
bdcac95761 Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 15:15:23 +02:00
Philippe GRAND
42565e722e Standardize and update code 2018-09-04 13:37:00 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Laurent Destailleur
dc5d1432b1 Fix code not reachable 2018-09-04 01:23:46 +02:00
Frédéric FRANCE
e4946cc8eb move phpcs:ignore 2018-09-03 00:03:17 +02:00
Frédéric FRANCE
489074af5c move phpcs:ignore 2018-09-02 23:25:10 +02:00
Philippe GRAND
bb18982f78 Standardize and Update code 2018-09-01 23:24:59 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Frédéric FRANCE
10200374ef Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
d8e6492e93 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 13:07:30 +02:00
Laurent Destailleur
5604f3b0c3 Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00