Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Laurent Destailleur
|
ebe30f7a0e
|
FIX error report not returned
|
2019-02-01 19:19:23 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Philippe GRAND
|
1501ce2c9f
|
update with html5 compliant code
|
2019-01-31 13:34:32 +01:00 |
|
Frédéric FRANCE
|
ff39491f15
|
wip
|
2019-01-27 23:31:37 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
4f9f0fd7b5
|
Merge branch 'develop' into elseif
|
2019-01-27 17:54:06 +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 |
|
Frédéric FRANCE
|
6e91b3cefc
|
PSR2 usage of else if is discouraged
|
2019-01-27 10:49:34 +01:00 |
|
Philippe GRAND
|
4668052f95
|
update with html5 compliant code
|
2019-01-22 14:04:33 +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 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Laurent Destailleur
|
5ec9a1ca7f
|
Remove deprecated parameter
|
2018-12-11 10:15:13 +01:00 |
|
Laurent Destailleur
|
434cf2e046
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-11 09:58:14 +01:00 |
|
Laurent Destailleur
|
a107d16338
|
Revert "clean and update code"
This reverts commit 68de0ba93b.
|
2018-12-11 09:52:00 +01:00 |
|
Laurent Destailleur
|
b47e7b2267
|
Work on new unsubscribe process
|
2018-12-11 09:49:46 +01:00 |
|
Frédéric FRANCE
|
731d19a29b
|
add tooltip to butActionRefused
|
2018-11-13 21:40:17 +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 |
|
Philippe GRAND
|
da951e61f2
|
Update and standardize code
|
2018-08-17 22:29:21 +02:00 |
|
Philippe GRAND
|
c48211ad70
|
Update and standardize code
|
2018-08-17 19:31:22 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Frédéric FRANCE
|
6f74ecceaf
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-12 18:21:59 +02:00 |
|
Frédéric FRANCE
|
9025c452ef
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-07 16:40:03 +02:00 |
|
Philippe GRAND
|
68de0ba93b
|
clean and update code
|
2018-08-07 10:56:59 +02:00 |
|
Philippe GRAND
|
d1f100b0c9
|
standardize
|
2018-07-29 17:17:29 +02:00 |
|
Frédéric FRANCE
|
b90d125fda
|
trim trailing
|
2018-07-26 20:19:52 +02:00 |
|
Philippe GRAND
|
442ffb95ba
|
clean and update code
|
2018-07-23 17:57:11 +02:00 |
|
Laurent Destailleur
|
4beca8d989
|
Fix restore look and feel
|
2018-07-18 13:00:38 +02:00 |
|
Philippe Grand
|
e913d854d0
|
Fix PR
|
2018-07-16 11:00:39 +02:00 |
|
Laurent Destailleur
|
8693775fc5
|
Fix phpunit
|
2018-06-24 18:15:49 +02:00 |
|
Laurent Destailleur
|
459fe7189d
|
Fix phpunit
|
2018-06-24 17:55:03 +02:00 |
|
Laurent Destailleur
|
af9d2c3b5a
|
Merge pull request #9008 from grandoc/new_branch_22_06_2018
clean and update code
|
2018-06-24 13:47:26 +02:00 |
|
Philippe Grand
|
21ca374c27
|
Update cibles.php
Fixes
|
2018-06-24 10:57:53 +02:00 |
|
Philippe Grand
|
b528368a8b
|
Update cibles.php
|
2018-06-24 10:56:06 +02:00 |
|
Laurent Destailleur
|
5829014218
|
Merge branch 'develop' into NEW_advance_targer_filter_everywhere
|
2018-06-24 10:24:26 +02:00 |
|
Philippe GRAND
|
afda5288a8
|
clean and update code
|
2018-06-22 16:27:11 +02:00 |
|
atm-quentin
|
d53aa71673
|
NEW advance target filtering can be used everywhere with tpl and fk_element
|
2018-06-22 10:54:00 +02:00 |
|
Philippe GRAND
|
4f554ab52a
|
clean and update code
|
2018-06-20 12:09:47 +02:00 |
|
Laurent Destailleur
|
4a5fd35e11
|
Look and feel v8
|
2018-06-13 22:57:41 +02:00 |
|
Frédéric FRANCE
|
30a3b95368
|
loadlangs
|
2018-05-26 20:32:23 +02:00 |
|
Frédéric FRANCE
|
f24a6ed4d6
|
loadlangs
|
2018-05-26 19:03:41 +02:00 |
|
florian HENRY
|
22cdbffb0a
|
new : add adv targt emailing amdin with main feature level 1
|
2018-05-21 10:58:16 +02:00 |
|
Laurent Destailleur
|
63ed5dcccc
|
Fix securekey for new online payment form
|
2018-05-12 11:23:40 +02:00 |
|
Laurent Destailleur
|
461ae46cc4
|
FIX When on a high page and searching for a small result, list was not
visible.
|
2018-04-24 11:37:57 +02:00 |
|
Laurent Destailleur
|
69adf73f4f
|
Clean code from $var = True
|
2018-04-22 19:27:37 +02:00 |
|
Laurent Destailleur
|
ccd9aa8059
|
Fight against dolibarr warnings
|
2018-04-21 12:16:12 +02:00 |
|
Laurent Destailleur
|
bbfc4a3e17
|
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
|
2018-04-18 03:26:15 +02:00 |
|
Laurent Destailleur
|
8fbde88872
|
Look and feel v8
|
2018-04-15 17:37:49 +02:00 |
|
Laurent Destailleur
|
86112f0096
|
Syntax error
|
2018-04-13 14:15:33 +02:00 |
|
Laurent Destailleur
|
d4cd5a0d95
|
Fix syntax error
|
2018-04-13 13:37:43 +02:00 |
|
Laurent Destailleur
|
1521b0595b
|
Clean code
|
2018-04-13 11:03:03 +02:00 |
|
Laurent Destailleur
|
4d94327ead
|
Look and feel v8
|
2018-04-07 16:17:40 +02:00 |
|
Marc de Lima Lucio
|
c2d3e2a701
|
NEW: generalize button to create object from list, for the remaining lists
|
2018-04-03 15:28:12 +02:00 |
|
Laurent Destailleur
|
191a1e9350
|
Fix css
|
2018-03-02 11:18:29 +01:00 |
|
Laurent Destailleur
|
c67e57836e
|
Code comment
|
2018-01-29 12:58:33 +01:00 |
|
Laurent Destailleur
|
0a11d52d53
|
Fix info on email sent
|
2018-01-29 12:46:07 +01:00 |
|
Laurent Destailleur
|
ba0a96c882
|
Missing param limit
|
2018-01-26 15:37:23 +01:00 |
|
Laurent Destailleur
|
c5307e5cac
|
Fix option MAILING_LIMIT_SENDBYWEB
|
2018-01-26 15:12:40 +01:00 |
|
Laurent Destailleur
|
53b36435d0
|
Fix on smartphone
|
2018-01-12 20:50:18 +01:00 |
|
Laurent Destailleur
|
a44363ce3d
|
Fix responsive
|
2018-01-12 14:41:57 +01:00 |
|
Laurent Destailleur
|
af1028576d
|
Fix on search all (trim search + search from smartphone).
|
2017-12-12 11:31:30 +01:00 |
|
Laurent Destailleur
|
ce32da6217
|
Fix debugs APIs
|
2017-12-01 15:39:18 +01:00 |
|
Laurent Destailleur
|
ff9a62e519
|
Fix trackid from emailings
|
2017-11-21 11:15:33 +01:00 |
|
Laurent Destailleur
|
c479efa480
|
Fix encoding with select2
|
2017-11-03 16:29:23 +01:00 |
|
Laurent Destailleur
|
2b55fb81b9
|
Standardize substition keys.
|
2017-10-13 10:35:21 +02:00 |
|
Laurent Destailleur
|
084dc7798d
|
Standardize use of function getCommonSubstitutionArray
|
2017-10-09 14:51:42 +02:00 |
|
Laurent Destailleur
|
252f038468
|
Mutualize code of substitutions for emails
|
2017-09-22 14:34:31 +02:00 |
|
Laurent Destailleur
|
1e33495f42
|
Fix remove warnings
|
2017-09-19 00:31:51 +02:00 |
|
Laurent Destailleur
|
ab5724e7ff
|
Mutualize code for forms to send emails. Remove thousand line of code.
|
2017-09-17 17:12:14 +02:00 |
|
Laurent Destailleur
|
e56b41c1ae
|
Clean code
|
2017-09-16 13:28:13 +02:00 |
|
Laurent Destailleur
|
5e34b121dd
|
Add more robust php unit to detect not escaped sql. Fix not escaped sql
|
2017-09-15 15:41:07 +02:00 |
|
Laurent Destailleur
|
1a78e2a055
|
Mutualize/share code of all payments modes
|
2017-09-15 13:43:16 +02:00 |
|
Laurent Destailleur
|
e254554461
|
Code comment
|
2017-09-15 11:28:21 +02:00 |
|
Laurent Destailleur
|
1ffcb5d94e
|
FIX background color not visible in emailing view
|
2017-09-15 11:24:32 +02:00 |
|
Laurent Destailleur
|
0ade500535
|
Better support of text editor when no js available.
|
2017-09-15 11:19:56 +02:00 |
|
Laurent Destailleur
|
0873260b8a
|
USe second parameter in GETPOST
|
2017-09-15 10:50:50 +02:00 |
|
Laurent Destailleur
|
3b40c95107
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/categories/class/categorie.class.php
|
2017-09-14 21:57:14 +02:00 |
|
Laurent Destailleur
|
c52e593ea8
|
Fix this->db
|
2017-09-14 21:27:14 +02:00 |
|
Laurent Destailleur
|
939d33cce7
|
Fix bug reported by scrutinizer
|
2017-09-12 19:12:39 +02:00 |
|
Laurent Destailleur
|
47d2350ad4
|
Fix bugs reported by scrutinizer
|
2017-09-12 19:03:12 +02:00 |
|
Laurent Destailleur
|
259cca0230
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/dict.php
htdocs/admin/mails_templates.php
|
2017-09-08 13:30:54 +02:00 |
|
Laurent Destailleur
|
03fe9d4e97
|
Escape all status
|
2017-09-08 13:23:12 +02:00 |
|
Laurent Destailleur
|
61cf69f2bb
|
NEW Include a color syntaxed HTML editor for emailing edition.
|
2017-09-01 13:09:13 +02:00 |
|
Laurent Destailleur
|
a60cd49fb0
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/actions_sendmails.inc.php
htdocs/core/class/CMailFile.class.php
htdocs/filefunc.inc.php
|
2017-08-28 12:53:02 +02:00 |
|
Laurent Destailleur
|
075a138e14
|
Fix substitution of __EMAIL__
|
2017-08-28 12:49:57 +02:00 |
|
Laurent Destailleur
|
54cc1ac800
|
Merge emailing target selectors.
|
2017-08-25 21:20:27 +02:00 |
|
Laurent Destailleur
|
d108d04add
|
NEW Can filter on the "other" column on emailing target list
|
2017-08-25 19:26:48 +02:00 |
|
Laurent Destailleur
|
5b1f5b0f20
|
Fix translation done twice into field title of array
|
2017-08-02 13:31:53 +02:00 |
|
Laurent Destailleur
|
bdfb0b7561
|
FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes
|
2017-07-26 21:22:53 +02:00 |
|
Laurent Destailleur
|
58ce8eaf46
|
Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing
Fix AdvtargetEmailing
|
2017-07-13 14:26:23 +02:00 |
|
Laurent Destailleur
|
2870798d07
|
Fix remove warnings
|
2017-07-13 00:35:10 +02:00 |
|
florian HENRY
|
816283d1e5
|
fix SQL
|
2017-07-12 17:51:32 +02:00 |
|
florian HENRY
|
c85bf18f0e
|
Fix AdvtargetEmailing
|
2017-07-11 14:47:37 +02:00 |
|
Laurent Destailleur
|
a96362e2f9
|
Fix #formmailbeforetitle not supported everywhere
|
2017-06-11 11:40:01 +02:00 |
|
Laurent Destailleur
|
e93cefbbf0
|
FIX #6985
|
2017-06-11 10:37:58 +02:00 |
|
Laurent Destailleur
|
7c0de18ac1
|
Fix code comment
|
2017-06-10 12:56:28 +02:00 |
|
Laurent Destailleur
|
b441c62e1d
|
Fix syntax error
|
2017-06-08 14:55:12 +02:00 |
|
Laurent Destailleur
|
b1f93ccb0c
|
Fix security
|
2017-06-08 14:33:46 +02:00 |
|
Regis Houssin
|
2b36135641
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
|
2017-06-07 20:14:03 +02:00 |
|
Laurent Destailleur
|
1820649175
|
Maxi debug of v6
|
2017-06-07 19:28:31 +02:00 |
|
Regis Houssin
|
bfd6116e5b
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc
|
2017-06-06 15:03:36 +02:00 |
|