Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

1248 Commits

Author SHA1 Message Date
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
ptibogxiv
b34f781686 Fix ext_payment_site 2018-11-01 23:04:10 +01:00
ptibogxiv
263e8ed4af Fix payout 2018-11-01 20:45:08 +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
1d80e16ad1 Merge pull request #9831 from frederic34/payment 
payments
 2018-10-24 03:25:01 +02:00
Frédéric FRANCE
85a94ec577 Update view.php 2018-10-22 22:40:18 +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
b0569de166 Work on multilang support 2018-10-14 18:44:29 +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
Laurent Destailleur
36b75031f5 Merge pull request #9681 from ptibogxiv/patch-70 
Fix metadata for charge.php
 2018-10-06 12:44:16 +02:00
Laurent Destailleur
5045bbc3bd Update newpayment.php 2018-10-06 12:44:06 +02:00
Laurent Destailleur
835ca4e4a5 Update newpayment.php 2018-10-06 12:42:14 +02:00
Laurent Destailleur
429b078708 Typo 2018-10-05 13:42:30 +02:00