Philippe GRAND
|
3464afe391
|
Update comment
|
2018-09-21 15:12:17 +02:00 |
|
Frédéric FRANCE
|
20e245108f
|
clean html donateur_code.php
|
2018-09-17 13:12:04 +02:00 |
|
Frédéric FRANCE
|
987fdbe73c
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 21:29:41 +02:00 |
|
Laurent Destailleur
|
b3dec042b5
|
Fix translation
|
2018-09-12 21:12:15 +02:00 |
|
Laurent Destailleur
|
056ef802e4
|
Fix syntax error
|
2018-09-12 19:49:57 +02:00 |
|
Laurent Destailleur
|
88192d1bae
|
Merge pull request #9456 from frederic34/stripeuser
add stripe user for actions
|
2018-09-12 18:37:31 +02:00 |
|
Laurent Destailleur
|
fb71edd35a
|
Update ipn.php
|
2018-09-12 18:37:24 +02:00 |
|
Frédéric FRANCE
|
3e71f4e6b0
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 18:36:49 +02:00 |
|
Laurent Destailleur
|
f5074f4962
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-12 18:12:17 +02:00 |
|
Laurent Destailleur
|
48ae4de47b
|
FIX Add paypal error message in alert email
|
2018-09-12 16:11:10 +02:00 |
|
Laurent Destailleur
|
016bc6851b
|
Fix generation of tpl
|
2018-09-10 23:37:51 +02:00 |
|
Frédéric FRANCE
|
afdf87603b
|
add stripe user for actions
|
2018-09-10 20:50:10 +02:00 |
|
Frédéric FRANCE
|
5f1b3fbc12
|
add stripe user for actions
|
2018-09-10 20:18:16 +02:00 |
|
Frédéric FRANCE
|
f02b2f0239
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-09 13:35:58 +02:00 |
|
Laurent Destailleur
|
700e3b9748
|
Standardize code for modulepart=mycompany like others modulepart.
|
2018-09-09 12:53:30 +02:00 |
|
Frédéric FRANCE
|
a558c3bdac
|
replace select_date
|
2018-09-09 11:25:59 +02:00 |
|
Frédéric FRANCE
|
4a7ea33008
|
replace select_date
|
2018-09-09 08:02:26 +02:00 |
|
Laurent Destailleur
|
ab8155f170
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
|
2018-09-04 21:35:43 +02:00 |
|
Laurent Destailleur
|
392f31abbd
|
FIX invert mime type and name
|
2018-09-04 00:21:48 +02:00 |
|
Laurent Destailleur
|
540999faa5
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/lib/company.lib.php
|
2018-09-03 14:06:51 +02:00 |
|
Laurent Destailleur
|
1249e597d4
|
Fix test param $id
|
2018-09-03 11:56:05 +02:00 |
|
Laurent Destailleur
|
3d3edb19d8
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/langs/en_US/commercial.lang
|
2018-09-02 15:48:26 +02:00 |
|
Laurent Destailleur
|
ada6d2c963
|
More logs
|
2018-09-01 17:27:14 +02:00 |
|
Laurent Destailleur
|
32baec1c9a
|
Fix logs
|
2018-09-01 17:10:47 +02:00 |
|
Laurent Destailleur
|
c17233a409
|
More logs
|
2018-09-01 16:51:40 +02:00 |
|
Laurent Destailleur
|
bcee0ef0ae
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/commande/dispatch.php
htdocs/societe/class/societe.class.php
htdocs/stripe/config.php
|
2018-09-01 14:16:57 +02:00 |
|
Laurent Destailleur
|
fc5ebc8099
|
Merge pull request #9340 from ptibogxiv/patch-49
Fix image if multicompany + no login in onlinesign
|
2018-09-01 12:32:38 +02:00 |
|
Laurent Destailleur
|
cbe89af8f3
|
Merge pull request #9339 from ptibogxiv/patch-48
add logo with multicompany
|
2018-09-01 12:31:56 +02:00 |
|
Laurent Destailleur
|
ae36469166
|
FIX #9337
|
2018-09-01 12:28:36 +02:00 |
|
Laurent Destailleur
|
59a27085fd
|
Merge pull request #9336 from ptibogxiv/patch-45
fix multicompany in public ticket page
|
2018-09-01 12:20:06 +02:00 |
|
Laurent Destailleur
|
bb22d5e083
|
Merge pull request #9341 from ptibogxiv/patch-50
header/footer uniformization in ticket public page
|
2018-09-01 12:19:18 +02:00 |
|
Laurent Destailleur
|
9b8be2f7db
|
Merge pull request #9343 from frederic34/patch-13
Create index.html
|
2018-09-01 12:07:54 +02:00 |
|
Laurent Destailleur
|
b89f69df79
|
Merge pull request #9345 from frederic34/patch-15
Create index.html
|
2018-09-01 12:07:20 +02:00 |
|
Frédéric FRANCE
|
663745b787
|
Create index.html
|
2018-08-30 08:09:03 +02:00 |
|
Frédéric FRANCE
|
82302e5516
|
Create index.html
|
2018-08-30 08:08:01 +02:00 |
|
Frédéric FRANCE
|
f34455291f
|
Create index.html
|
2018-08-30 08:06:46 +02:00 |
|
ptibogxiv
|
7a6df60cb0
|
header/footer uniformization in ticket public page
|
2018-08-30 02:38:50 +02:00 |
|
ptibogxiv
|
fc804d8eeb
|
Fix image if multicompany + no login in onlinesign
|
2018-08-30 02:37:11 +02:00 |
|
ptibogxiv
|
d2859276b5
|
add logo with multicompany
this fix push entity to viewimage.php
|
2018-08-30 02:35:42 +02:00 |
|
ptibogxiv
|
9cf67c4d5f
|
fix multicompany in public ticket page
|
2018-08-30 01:13:06 +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
|
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 |
|