Frédéric FRANCE
|
57fb3dc2f4
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-09-01 13:52:51 +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
|
3b1cf41823
|
Fix eol
|
2018-09-01 12:17:52 +02:00 |
|
Laurent Destailleur
|
c7020d4243
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-01 12:11:13 +02:00 |
|
Laurent Destailleur
|
b863b5176d
|
Merge pull request #9322 from grandoc/new_branch_29_08_2018
New branch 29 08 2018
|
2018-09-01 12:11:01 +02:00 |
|
Laurent Destailleur
|
c791f37da9
|
Doc
|
2018-09-01 12:09:40 +02:00 |
|
Laurent Destailleur
|
c47d65702f
|
Merge pull request #9334 from frederic34/patch-10
Update config for blockedlog.lang
|
2018-09-01 12:09:12 +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 |
|
Laurent Destailleur
|
14a64e438e
|
Merge pull request #9344 from frederic34/patch-14
Create index.html
|
2018-09-01 12:07:09 +02:00 |
|
Laurent Destailleur
|
482ddd548a
|
Merge pull request #9332 from frederic34/functionClosingBrace
PSR2 FunctionClosingBrace
|
2018-09-01 12:06:08 +02:00 |
|
Laurent Destailleur
|
28fe74bf13
|
FIX #9371
|
2018-09-01 11:57:18 +02:00 |
|
Laurent Destailleur
|
bb2f5ad588
|
Fix missing migration
|
2018-09-01 11:30:14 +02:00 |
|
Laurent Destailleur
|
7b1a705be4
|
Clean duplicate code
|
2018-08-31 13:50:58 +02:00 |
|
Laurent Destailleur
|
e7d4956f5b
|
Clean not used function
|
2018-08-31 11:29:30 +02:00 |
|
Laurent Destailleur
|
9cc6533d11
|
Fix td alignement
|
2018-08-30 18:57:30 +02:00 |
|
Laurent Destailleur
|
d14bd829fb
|
FIX trans on null object
|
2018-08-30 17:01:22 +02:00 |
|
Philippe Grand
|
b3c84ac3bc
|
Merge branch 'develop' into new_branch_29_08_2018
|
2018-08-30 12:09:40 +02:00 |
|
Frédéric FRANCE
|
5100b8b7b0
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-30 10:42:47 +02:00 |
|
Frédéric FRANCE
|
57207794c2
|
tabs added
|
2018-08-30 10:30:52 +02:00 |
|
Frédéric FRANCE
|
1bdc33f286
|
tabs added
|
2018-08-30 10:02:31 +02:00 |
|
Frédéric FRANCE
|
4196febb67
|
tabs added
|
2018-08-30 09:40:04 +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
|
9cf67c4d5f
|
fix multicompany in public ticket page
|
2018-08-30 01:13:06 +02:00 |
|
Frédéric FRANCE
|
76d08ab7f5
|
Update config
|
2018-08-29 23:05:09 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Laurent Destailleur
|
3e0b2d0281
|
Fix phpcs
|
2018-08-29 21:51:49 +02:00 |
|
Laurent Destailleur
|
2cf37f621c
|
Merge pull request #9267 from torvista/develop
Installer: set protocol of autofill of main url to match installer protocol
|
2018-08-29 21:47:31 +02:00 |
|
Laurent Destailleur
|
872273ef95
|
Update fileconf.php
|
2018-08-29 21:46:39 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Laurent Destailleur
|
c071e751f7
|
Merge pull request #9329 from ptibogxiv/patch-44
FIX deletion of stripe customer
|
2018-08-29 21:12:53 +02:00 |
|
Laurent Destailleur
|
489e766cbf
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2018-08-29 20:24:01 +02:00 |
|
Laurent Destailleur
|
3ebfb23407
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/product/fournisseurs.php
htdocs/ticket/class/ticket.class.php
|
2018-08-29 20:22:50 +02:00 |
|
Laurent Destailleur
|
d40e1a0d0b
|
FIX #9258
|
2018-08-29 20:12:38 +02:00 |
|
Laurent Destailleur
|
8b291b2053
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
README.md
|
2018-08-29 19:55:10 +02:00 |
|
Laurent Destailleur
|
46fe19bed5
|
Code comment
|
2018-08-29 18:56:57 +02:00 |
|
Laurent Destailleur
|
0c11007e34
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
README.md
htdocs/comm/propal/card.php
|
2018-08-29 18:53:39 +02:00 |
|
Laurent Destailleur
|
e317b0847a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
README.md
|
2018-08-29 18:50:00 +02:00 |
|
Laurent Destailleur
|
7af083f1ec
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-29 18:49:08 +02:00 |
|
Frédéric FRANCE
|
cbdc669ba9
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-29 18:45:36 +02:00 |
|
Laurent Destailleur
|
34ceec7067
|
FIX #9328
|
2018-08-29 18:40:12 +02:00 |
|
Laurent Destailleur
|
4e7e290624
|
FIX #9328
|
2018-08-29 18:38:58 +02:00 |
|
Laurent Destailleur
|
428354303c
|
FIX #9328
|
2018-08-29 18:29:42 +02:00 |
|
Laurent Destailleur
|
d8bd76b8ce
|
FIX #9328
|
2018-08-29 18:27:39 +02:00 |
|
Laurent Destailleur
|
275b9a9960
|
Merge pull request #9325 from frederic34/patch-12
Fix allow barcode with special char
|
2018-08-29 18:01:15 +02:00 |
|
Laurent Destailleur
|
86d8513138
|
Merge pull request #9309 from frederic34/trimtrailing2
last trimtrailing
|
2018-08-29 17:57:05 +02:00 |
|