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
|
a31ad5af3d
|
standardize code
|
2018-08-17 17:55:00 +02:00 |
|
Laurent Destailleur
|
b515511ad6
|
Merge branch 'develop' into FunctionDeclaration
|
2018-08-16 00:52:55 +02:00 |
|
Laurent Destailleur
|
5c712a6cd3
|
Merge branch 'develop' into trimtrailing
|
2018-08-16 00:47:09 +02:00 |
|
Frédéric FRANCE
|
54a078149a
|
function declaration
|
2018-08-15 17:34:35 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Laurent Destailleur
|
ec56ad752c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
|
2018-08-15 14:26:38 +02:00 |
|
Frédéric FRANCE
|
2bb4c30aac
|
remove superfluous space
|
2018-08-14 15:59:15 +02:00 |
|
Frédéric FRANCE
|
c0478cb42f
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-14 15:54:40 +02:00 |
|
Frédéric FRANCE
|
5146ab9177
|
trim
|
2018-08-14 15:34:44 +02:00 |
|
Laurent Destailleur
|
fa4a12be41
|
Merge pull request #9208 from ptibogxiv/patch-33
fix connect mode for v8 release
|
2018-08-13 23:56:42 +02:00 |
|
ptibogxiv
|
d0666a9583
|
Fix incorrect entity
|
2018-08-13 14:34:54 +02:00 |
|
ptibogxiv
|
c6adeabb55
|
Fix dolibarr_set_const
|
2018-08-13 12:22:51 +02:00 |
|
Frédéric FRANCE
|
5d0d8d10fc
|
remove superfluous spaces
|
2018-08-13 09:00:22 +02:00 |
|
Frédéric FRANCE
|
82e8efe792
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-12 20:14:14 +02:00 |
|
Laurent Destailleur
|
9fc5d39d07
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:36 +02:00 |
|
Laurent Destailleur
|
dc8c4402ee
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-12 20:09:22 +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
|
69321c47be
|
correct space
|
2018-08-07 17:11:41 +02:00 |
|
Frédéric FRANCE
|
9025c452ef
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing
|
2018-08-07 16:40:03 +02:00 |
|
ptibogxiv
|
e84018ac15
|
Fix 3D secure
convett to dolibarr standard stripe payment metadata
|
2018-08-06 19:21:12 +02:00 |
|
ptibogxiv
|
e926efe022
|
fix connect mode for v8 release
|
2018-08-06 12:39:50 +02:00 |
|
Philippe GRAND
|
094fc6b699
|
Standardize
|
2018-08-06 11:53:33 +02:00 |
|
Juanjo Menent
|
37a9a2df56
|
Merge pull request #9167 from frederic34/include
Include and co are statements
|
2018-08-02 11:03:44 +02:00 |
|
Philippe GRAND
|
4eacad52f2
|
Clean and update code
|
2018-07-27 10:06:56 +02:00 |
|
Frédéric FRANCE
|
c991a4d204
|
trim trailing
|
2018-07-26 18:05:20 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
Philippe GRAND
|
efa6ad0659
|
Clean and update code
|
2018-07-25 19:05:40 +02:00 |
|
Laurent Destailleur
|
b992c4b260
|
Merge pull request #9117 from frederic34/patch-11
remove commented log
|
2018-07-24 17:37:46 +02:00 |
|
Laurent Destailleur
|
f419964c76
|
Fix Debug website module
|
2018-07-20 15:01:50 +02:00 |
|
Frédéric FRANCE
|
1a58a40f77
|
remove commented log
|
2018-07-17 16:48:34 +02:00 |
|
Laurent Destailleur
|
67a831ad5f
|
Merge pull request #9045 from hregis/8.0_multicompany
Fix: check if multicompany object exists
|
2018-07-06 14:23:59 +02:00 |
|
Laurent Destailleur
|
05ed721a8c
|
Fix name of constant for module TICKET
|
2018-07-06 13:09:07 +02:00 |
|
Maxime Kohlhaas
|
badcbd78d8
|
Rename ticketsup public directory
|
2018-07-05 15:20:38 +02:00 |
|
Regis Houssin
|
0bb7f84f87
|
Fix: check if multicompany object exists
|
2018-07-03 14:11:00 +02:00 |
|
Laurent Destailleur
|
9eaca045e4
|
Fix default message with online payment link must be hidden when no
online payment mode exists.
|
2018-06-27 11:34:40 +02:00 |
|
Laurent Destailleur
|
c0d4715bdb
|
Clean code
|
2018-06-15 16:29:26 +02:00 |
|
Laurent Destailleur
|
79cbdf7fd1
|
Code comment
|
2018-06-15 15:29:19 +02:00 |
|
Laurent Destailleur
|
25d656025a
|
Fix use of alternative aliases is ok now
|
2018-06-14 16:33:11 +02:00 |
|
Laurent Destailleur
|
4313e41580
|
Start to fix pb with 3DS
|
2018-06-12 13:47:28 +02:00 |
|
Laurent Destailleur
|
5ea1890f0c
|
Fix payments on contract line
|
2018-06-06 10:28:53 +02:00 |
|
Laurent Destailleur
|
87d073b5cd
|
Fix conflict with external ticketsup module
|
2018-06-04 21:49:29 +02:00 |
|
Laurent Destailleur
|
57664c5a26
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/list.php
htdocs/public/payment/newpayment.php
htdocs/public/paypal/newpayment.php
|
2018-05-29 12:47:42 +02:00 |
|
Frédéric FRANCE
|
d986909109
|
loadlangs
|
2018-05-26 23:52:52 +02:00 |
|
Laurent Destailleur
|
bf81b755f9
|
Fix state code for payment from indonesia
|
2018-05-25 16:21:13 +02:00 |
|
Laurent Destailleur
|
37dcfe4a46
|
FIX button to pay still visible when amount null used
|
2018-05-25 16:00:23 +02:00 |
|
Laurent Destailleur
|
4c9d3d9679
|
Code comment
|
2018-05-25 15:58:45 +02:00 |
|
Laurent Destailleur
|
53b5733fb4
|
Fix test
|
2018-05-12 13:40:53 +02:00 |
|