Commit Graph

624 Commits

Author SHA1 Message Date
Laurent Destailleur
ebe30f7a0e FIX error report not returned 2019-02-01 19:19:23 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
a107d16338 Revert "clean and update code"
This reverts commit 68de0ba93b.
2018-12-11 09:52:00 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
46db246273 Look and feel v9: Autofocus on create forms 2018-11-07 13:04:43 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
d9ccc7624b Standardize code 2018-09-23 16:09:25 +02:00
Laurent Destailleur
6c814b32bd Standardize cod 2018-09-23 15:58:33 +02:00
Frédéric FRANCE
65b74ad30f Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe GRAND
707f8b7312 fix merge 2018-09-04 14:49:56 +02:00
Frédéric FRANCE
03a5aba8a2 move phpcs:ignore 2018-09-02 18:49:23 +02:00
Frédéric FRANCE
4ea582ad4a move phpcs:ignore 2018-09-02 11:12:07 +02:00
Frédéric FRANCE
47879d44bc move phpcs:ignore 2018-09-02 09:57:19 +02:00
Frédéric FRANCE
57fb3dc2f4 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
b863b5176d Merge pull request #9322 from grandoc/new_branch_29_08_2018
New branch 29 08 2018
2018-09-01 12:11:01 +02:00
Philippe Grand
b3c84ac3bc Merge branch 'develop' into new_branch_29_08_2018 2018-08-30 12:09:40 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
cbdc669ba9 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Frédéric FRANCE
0e512cbc36 Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00
Frédéric FRANCE
7b2bfb28c2 Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 12:48:12 +02:00
Philippe Grand
0ab593fdb1 Merge branch 'develop' into new_branch_29_08_2018 2018-08-29 12:47:01 +02:00
Laurent Destailleur
b648a28893 Fix regression 2018-08-29 11:57:43 +02:00
Frédéric FRANCE
846778657f fix syntax error 2018-08-29 11:44:26 +02:00
Philippe GRAND
5b0425706c try to fix space errors 2018-08-29 11:39:38 +02:00
Philippe GRAND
84a9ca3f68 fix : Parse error: ./htdocs/comm/mailing/cibles.php:644 2018-08-29 10:40:30 +02:00
Frédéric FRANCE
fe4260a014 Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864 trimtrailing 2018-08-28 08:33:02 +02:00
Laurent Destailleur
9a14611d55 Merge pull request #8996 from grandoc/new_branch_20_06_2018
clean and update code
2018-08-28 02:35:59 +02:00
Laurent Destailleur
7219bac0b2 Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
2306f8a7c2 Merge pull request #9265 from grandoc/new_branch_18_08_2018
Typo
2018-08-28 02:25:24 +02:00
Philippe GRAND
2fa82edd39 Standardize and update code 2018-08-23 17:07:27 +02:00
Philippe Grand
f98d2078e2 Merge branch 'develop' into new_branch_20_06_2018 2018-08-23 10:41:34 +02:00
Philippe Grand
9b2e754b46 Update advtargetemailing.class.php 2018-08-22 22:41:22 +02:00
Philippe GRAND
449ef9c464 Update and standardize code 2018-08-22 18:12:44 +02:00
Philippe GRAND
6542dcf0bd Update and standardize code 2018-08-22 12:04:50 +02:00
Philippe GRAND
e0462b975b Update and standardize code 2018-08-22 11:48:26 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00
Frédéric FRANCE
6b6daf178f Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
0fbccce9a7 Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e Fix coding style 2018-08-21 19:08:11 +02:00
Frédéric FRANCE
aba69b94b2 Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Laurent Destailleur
0799970804 Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80 Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +02:00
Philippe Grand
ccdae4c597 Update html.formadvtargetemailing.class.php 2018-08-18 19:15:25 +02:00
Philippe GRAND
c8c8af55a0 Typo 2018-08-18 15:56:23 +02:00