2
0
forked from Wavyzz/dolibarr
Commit Graph

1173 Commits

Author SHA1 Message Date
Laurent Destailleur
541f6e537e Fix link to pay membership renewal 2019-02-05 14:05:39 +01:00
Laurent Destailleur
e5827f77cb Fix link to pay membership renewal 2019-02-05 14:03:35 +01:00
Laurent Destailleur
6d09c85231 Fix missing button 2019-02-05 14:01:32 +01:00
Laurent Destailleur
d6501d996c Missing trans 2019-02-05 13:56:55 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6 Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
2019-01-30 16:17:09 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
77747ac2a3 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-28 16:35:12 +01:00
Laurent Destailleur
273c396fb9 Fix bad function 2019-01-28 02:47:03 +01:00
Laurent Destailleur
31f4513a7e Fix bad function 2019-01-28 02:46:31 +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
f30a3d59ba Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +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
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +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
Laurent Destailleur
1e79781cba Clean parameters 2019-01-08 11:54:08 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2018-12-26 19:43:01 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
2018-12-22 19:06:58 +01:00
Laurent Destailleur
fc3fcc5455 FIX CVE-2018-19993 2018-12-22 16:59:30 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
57c41bac56 Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
Laurent Destailleur
527ad04ae8 FIX Mandatory field feature should works on textarea
Conflicts:
	htdocs/core/lib/functions.lib.php
2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52 FIX Mandatory field feature should works on textarea 2018-12-15 18:11:40 +01:00
Alexandre SPANGARO
60f56fcf8d Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
d0fd00c4e9 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-11 18:15:13 +01:00
Laurent Destailleur
4aff0b6471 Fix opensurvey 2018-12-11 10:52:59 +01:00
Laurent Destailleur
b47e7b2267 Work on new unsubscribe process 2018-12-11 09:49:46 +01:00
Laurent Destailleur
b27ec54379 A better way to manage unsubscribed emails 2018-12-10 14:35:33 +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
Juanjo Menent
7d4553179d Fix #9929 2018-12-01 15:48:46 +01:00
ptibogxiv
e8bdb580ab Fix trans 2018-11-29 14:00:27 +01:00
Laurent Destailleur
163bc3784e Merge pull request #10076 from ptibogxiv/patch-96
Fix retrieve Donation newpayment.php
2018-11-29 11:14:33 +01:00
Philippe GRAND
8722ccef82 fix typo error 2018-11-26 14:35:29 +01:00
ptibogxiv
d401974028 Fix retrieve Donation newpayment.php 2018-11-24 15:33:48 +01:00
Laurent Destailleur
b5d1a34080 Update newpayment.php 2018-11-24 11:08:05 +01:00
ptibogxiv
e8ba8814cd Update newpayment.php 2018-11-23 12:45:37 +01:00
ptibogxiv
6a232a8754 Update newpayment.php 2018-11-23 12:27:24 +01:00
ptibogxiv
1cc6763950 Fix order billed online payment 2018-11-23 11:40:38 +01:00
Laurent Destailleur
966a0b7ec7 Fix message content and language 2018-11-20 20:13:16 +01:00
Alexandre SPANGARO
cf0c4a5ce0 Add in public area 2018-11-18 22:03:32 +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
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
c988e2e681 Fix phpcs 2018-11-05 10:44:37 +01:00
Laurent Destailleur
ccf6554f76 Merge pull request #9941 from ptibogxiv/patch-87
Fix various fix cmail, payout, const, connect
2018-11-05 09:38:41 +01:00
ptibogxiv
d5a910841f Fix various fix cmail, payout, const, connect 2018-11-01 23:20:28 +01:00