Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Laurent Destailleur
|
5a4960f7ae
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/takepos/takepos.php
|
2019-10-20 15:30:28 +02:00 |
|
c3do
|
4fb0d03500
|
NEW Add API to get Country by code and iso
|
2019-10-20 15:25:18 +02:00 |
|
Laurent Destailleur
|
49c101bb77
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-10-20 15:16:51 +02:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Laurent Destailleur
|
8ce6197314
|
Update commondocgenerator.class.php
|
2019-10-20 14:37:15 +02:00 |
|
Laurent Destailleur
|
1b3d6d749a
|
Merge pull request #12175 from Shnoulle/develop
Close #12098 : allow usage of AUTH LOGIN in smtp
|
2019-10-20 13:48:24 +02:00 |
|
Laurent Destailleur
|
e95861c361
|
Update smtps.class.php
|
2019-10-20 13:48:01 +02:00 |
|
Laurent Destailleur
|
3b5e62947d
|
Update smtps.class.php
|
2019-10-20 13:44:28 +02:00 |
|
Laurent Destailleur
|
84f6fd64a9
|
Merge pull request #12176 from Ahuahuachi/develop
Translation of some function documentation
|
2019-10-20 13:31:25 +02:00 |
|
Laurent Destailleur
|
9e7476cd1f
|
Merge pull request #12171 from grandoc/new_branch_18_10_2019
Standardization
|
2019-10-20 13:30:40 +02:00 |
|
Laurent Destailleur
|
62a8523ccf
|
Merge pull request #12178 from frederic34/patch-18
Update functions2.lib.php
|
2019-10-20 12:40:34 +02:00 |
|
Laurent Destailleur
|
ff30274a59
|
Merge pull request #12177 from frederic34/patch-17
Update box_produits.php
|
2019-10-20 12:40:10 +02:00 |
|
stickler-ci
|
66a2dc4994
|
Fixing style errors.
|
2019-10-20 09:18:55 +00:00 |
|
Frédéric FRANCE
|
33c35780e0
|
wip
|
2019-10-20 11:17:54 +02:00 |
|
Frédéric FRANCE
|
360bf55f5b
|
clean indent
|
2019-10-20 01:09:11 +02:00 |
|
Alfredo Altamirano
|
9d9961e936
|
Translate documentation
|
2019-10-19 16:55:27 -05:00 |
|
Alfredo Altamirano
|
1ede09c21a
|
Fix typo
|
2019-10-19 11:17:53 -05:00 |
|
Frédéric FRANCE
|
f0a3d1a1c4
|
Update functions2.lib.php
|
2019-10-18 23:20:34 +02:00 |
|
Frédéric FRANCE
|
486047c357
|
Update box_produits.php
|
2019-10-18 23:14:43 +02:00 |
|
Alfredo Altamirano
|
71f9b4f36b
|
Translation of parameter documentation
|
2019-10-18 12:55:21 -05:00 |
|
Denis Chenu
|
88100a53aa
|
Close #12098 : allow usage of AUTH LOGIN in smtp
Global variable MAIL_SMTP_AUTH_TYPE can be used to PLIAN to allow AUTH PLAIN authentification. Default still AUTH LOGIN.
|
2019-10-18 17:35:52 +02:00 |
|
Laurent Destailleur
|
becd3f7d2f
|
FIX Missing status and paid flag in export or expense report
|
2019-10-18 15:35:25 +02:00 |
|
Philippe GRAND
|
a07ab341f8
|
Standardization
|
2019-10-18 13:00:31 +02:00 |
|
Philippe GRAND
|
41d2cb2c29
|
Standardization
|
2019-10-18 12:56:40 +02:00 |
|
Philippe GRAND
|
f43d51bfec
|
Standardization
|
2019-10-18 12:51:49 +02:00 |
|
Philippe GRAND
|
731f4587e2
|
Merge remote-tracking branch 'origin/new_branch_18_10_2019' into new_branch_18_10_2019
|
2019-10-18 12:44:40 +02:00 |
|
Philippe GRAND
|
18b183f516
|
Standardization
|
2019-10-18 12:43:25 +02:00 |
|
stickler-ci
|
0c61e798a6
|
Fixing style errors.
|
2019-10-18 09:42:15 +00:00 |
|
Philippe GRAND
|
3b56d91727
|
Standardization
|
2019-10-18 11:41:18 +02:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Laurent Destailleur
|
de396dc9b3
|
Clean code for order of modules
|
2019-10-17 19:21:30 +02:00 |
|
Laurent Destailleur
|
87ec1de78e
|
Start to work on solution to sort permissions by module
|
2019-10-17 18:43:07 +02:00 |
|
Laurent Destailleur
|
40fdcfac7e
|
Merge branch 'develop' into 10.0_closure2
|
2019-10-17 18:16:57 +02:00 |
|
Laurent Destailleur
|
4d9c285126
|
Merge pull request #12163 from sadlig/fix-stock-movement-right
Fix Stock movement user's right (Fixes #11967)
|
2019-10-17 17:53:17 +02:00 |
|
Laurent Destailleur
|
f85899742b
|
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-17 17:48:42 +02:00 |
|
Laurent Destailleur
|
25fe861f9b
|
Merge pull request #12151 from tuxgasy/10_Product_import_duplicate_volumUnits
Fix width unit label in product import
|
2019-10-17 17:47:31 +02:00 |
|
Laurent Destailleur
|
f71423b3fd
|
Merge pull request #12160 from grandoc/new_branch_17_10_2019
Internationalization
|
2019-10-17 17:42:44 +02:00 |
|
Laurent Destailleur
|
c64a537bfd
|
Merge pull request #12155 from frederic34/patch-14
Update html.formticket.class.php
|
2019-10-17 17:42:30 +02:00 |
|
Laurent Destailleur
|
9397407f23
|
Merge pull request #12149 from grandoc/new_branch_16_10_2019
internationalization
|
2019-10-17 17:41:51 +02:00 |
|
Laurent Destailleur
|
40a9b95696
|
Merge pull request #12148 from homer8173/patch-7
use current local time on Now button
|
2019-10-17 17:41:16 +02:00 |
|
Gildas
|
132ea56a59
|
Fix Stock movement user's right (Fixes #11967)
|
2019-10-17 17:06:38 +02:00 |
|
Philippe GRAND
|
2efeeb0ad8
|
Internationalization
|
2019-10-17 14:47:03 +02:00 |
|
Laurent Destailleur
|
084ab53b4b
|
Fix translation
|
2019-10-17 12:14:38 +02:00 |
|
Frédéric FRANCE
|
46d2bf3317
|
Update html.formticket.class.php
|
2019-10-16 23:18:14 +02:00 |
|
Frédéric FRANCE
|
219a4b4374
|
Update html.formticket.class.php
|
2019-10-16 23:08:04 +02:00 |
|
Frédéric FRANCE
|
701afc99e9
|
Update html.formticket.class.php
|
2019-10-16 23:03:59 +02:00 |
|
Frédéric FRANCE
|
4bc0a6db2d
|
Update html.formticket.class.php
|
2019-10-16 22:56:29 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
8a7a0b80e2
|
Fix remove warnings
|
2019-10-16 19:08:31 +02:00 |
|