Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
7c82b416ae
|
fix phpcs public/payment/newpayment.php
|
2019-02-05 20:56:34 +01:00 |
|
Laurent Destailleur
|
d49dd8d593
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-05 15:16:44 +01:00 |
|
Laurent Destailleur
|
fbed22050d
|
fix syntax error
|
2019-02-05 14:33:36 +01:00 |
|
Laurent Destailleur
|
4de122d1d4
|
Fix date format
|
2019-02-05 14:33:03 +01:00 |
|
Laurent Destailleur
|
e3d0cb1637
|
Fix css
|
2019-02-05 14:32:23 +01:00 |
|
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 |
|
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 |
|
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
|
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 |
|
Regis Houssin
|
89389baeac
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email
|
2018-11-09 15:37:29 +01:00 |
|
ptibogxiv
|
b34f781686
|
Fix ext_payment_site
|
2018-11-01 23:04:10 +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 |
|
Frédéric FRANCE
|
fbc5ce623e
|
payments
|
2018-10-20 17:17:21 +02:00 |
|
Laurent Destailleur
|
58240c8f1c
|
Merge pull request #9767 from ptibogxiv/patch-74
NEW Save external payment IDs into table of payment
|
2018-10-16 20:32:23 +02:00 |
|
Laurent Destailleur
|
2c1e8d6535
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/balance.php
htdocs/expedition/class/expeditionbatch.class.php
htdocs/public/payment/newpayment.php
htdocs/stripe/config.php
|
2018-10-16 18:47:11 +02:00 |
|
ptibogxiv
|
00f839e8b4
|
add external modepayment in payment
|
2018-10-16 16:57:16 +02:00 |
|
Laurent Destailleur
|
1e635cff1b
|
Fix new stripe API
|
2018-10-12 21:00:33 +02:00 |
|
Laurent Destailleur
|
d8edb1f6b8
|
Fix regression in online payment
|
2018-10-12 20:28:26 +02:00 |
|
Laurent Destailleur
|
6a363fd1ab
|
API Stripe 2018-09-24
|
2018-10-12 19:26:00 +02:00 |
|
Laurent Destailleur
|
fcf62744d7
|
Add ref in description
|
2018-10-10 16:23:00 +02:00 |
|
Laurent Destailleur
|
1204fb1e74
|
Fix online payments use id instead of ref into TAG
|
2018-10-10 16:16:17 +02:00 |
|
Laurent Destailleur
|
8f4b74733c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
|
2018-10-10 01:51:54 +02:00 |
|
Laurent Destailleur
|
b1289632e0
|
CSS
|
2018-10-10 01:27:31 +02:00 |
|
Laurent Destailleur
|
506ba30d5a
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-10-06 20:54:14 +02:00 |
|
Laurent Destailleur
|
a7d26409c7
|
FIX trackid into email sent from member module.
|
2018-10-06 20:51:35 +02:00 |
|
Laurent Destailleur
|
3e49935eac
|
Fix online payment
|
2018-10-06 15:48:47 +02:00 |
|