Commit Graph

83748 Commits

Author SHA1 Message Date
Laurent Destailleur
058524ff82 Comment 2020-02-10 02:29:09 +01:00
Laurent Destailleur
9f75c10a13 Stale workflow 2020-02-10 02:23:31 +01:00
Laurent Destailleur
6367fff240
Rename greetings.yml to greetings-pr.yml 2020-02-10 02:15:18 +01:00
Laurent Destailleur
1728fff247
Create stale-issues.yml 2020-02-10 02:14:23 +01:00
Laurent Destailleur
9c4ba1c5d2 Update greetings.yml 2020-02-10 01:50:32 +01:00
Laurent Destailleur
dbffaf3c1e
Create greetings file for new PR submiters 2020-02-10 01:50:13 +01:00
Laurent Destailleur
3baf0e66b9 Trans 2020-02-10 01:11:52 +01:00
Laurent Destailleur
ecb1f1f2d7 Responsive 2020-02-10 01:01:22 +01:00
Laurent Destailleur
70c19fedeb Responsive 2020-02-10 00:47:44 +01:00
Laurent Destailleur
f70dd8ec06 Clean code. Load thirdparty for correct lang before generating doc 2020-02-10 00:22:53 +01:00
Laurent Destailleur
07fbaa02d1 FIX #13050 2020-02-09 19:36:12 +01:00
Laurent Destailleur
d49943ab37 FIX #13019 2020-02-09 18:38:27 +01:00
Laurent Destailleur
94d6fa06dc FIX #13022 2020-02-09 18:34:53 +01:00
Laurent Destailleur
d789dd0366 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-09 18:29:09 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
c7736dde41 FIX CVE-2019–17223 2020-02-09 18:28:34 +01:00
Laurent Destailleur
6badf724cf FIX Mail smtps truncated if content has a line with single .
Conflicts:
	htdocs/core/class/CMailFile.class.php
2020-02-09 16:38:19 +01:00
Laurent Destailleur
53f740c60e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-09 16:37:19 +01:00
Laurent Destailleur
5c000159c1 FIX Mail smtps truncated if content has a line with single . 2020-02-09 16:36:38 +01:00
Laurent Destailleur
18d332994f FIX Mail smtps truncated if content has a line with single . 2020-02-09 15:51:43 +01:00
Laurent Destailleur
5d04775164 Fix missing categorie class 2020-02-09 15:14:01 +01:00
andreubisquerra
37e815183e
Add time tags 2020-02-09 14:06:02 +01:00
andreubisquerra
bc8d9e6c7e
Add langs tags 2020-02-09 14:04:22 +01:00
Laurent Destailleur
6daa10b499 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-08 19:10:52 +01:00
Laurent Destailleur
c2830f9e79 FIX Look and feel v11 2020-02-08 18:18:41 +01:00
Laurent Destailleur
0a912f4e8a Fix missing class 2020-02-08 18:18:22 +01:00
Laurent Destailleur
1ee959a11f Generic graph 2020-02-08 17:46:41 +01:00
Laurent Destailleur
33addfab01 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:21:17 +01:00
Laurent Destailleur
3852ba0655 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:16:25 +01:00
Laurent Destailleur
81df5cd9ab Merge pull request #13032 from atm-florianm/FIX_11.0_select_extrafield_filtering
FIX 11.0 - default filtering for 'select' extrafields should use "=", not "LIKE"
2020-02-08 17:16:01 +01:00
Laurent Destailleur
aed3ea25cb Code comment 2020-02-08 17:14:04 +01:00
Laurent Destailleur
3dfe7161cf Merge pull request #13035 from Dolibarr/scrutinizer-patch-2
Scrutinizer Auto-Fixes
2020-02-08 17:09:25 +01:00
Laurent Destailleur
59e0ab9e04 Fix AT-BASE 2020-02-08 17:08:45 +01:00
Laurent Destailleur
4599c5557d
Merge pull request #13066 from homer8173/patch-18
accounting austrian
2020-02-08 16:28:47 +01:00
Laurent Destailleur
665876ffa4
Merge pull request #13061 from andreubisquerra/develop
Add and finish receipt printer tags
2020-02-08 16:19:44 +01:00
pnueda
c083458adf Update html.formfile.class.php
Corrects a bug that adds a second '?' in the url string. When strpos returns 0 as the initial position for '?', it is (mis)taken as FALSE value, and then replaced by a second '?' in the list of get parameters, resulting in something like:
/compta/facture/card.php?facid=397?action=remove_file...
instead of 
/compta/facture/card.php?facid=397&action=remove_file...
2020-02-08 16:18:52 +01:00
Laurent Destailleur
c9f7dacda1
Merge pull request #13060 from pnueda/patch-1
Update html.formfile.class.php
2020-02-08 16:18:17 +01:00
Laurent Destailleur
102428a503 Merge pull request #13056 from atm-lena/FIX_cabyprodlist_filter
FIX CA by prod list filter
2020-02-08 16:09:18 +01:00
Laurent Destailleur
5fccbcc469
Merge pull request #13054 from hregis/10.0_mc
FIX missing hook parameter
2020-02-08 16:08:13 +01:00
Laurent Destailleur
8bcff9a0f1
Merge pull request #13052 from fappels/11_fix_expedition_ceate_line
FIX expedition ceate line new parameter is not required.
2020-02-08 16:07:36 +01:00
Laurent Destailleur
ee29c3efdd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 16:02:23 +01:00
Laurent Destailleur
5f507b2df5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/tva/card.php
2020-02-08 16:01:41 +01:00
Laurent Destailleur
716f765ce1 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
2020-02-08 16:00:06 +01:00
Laurent Destailleur
c27260869b FIX #13046 More complete 2020-02-08 15:59:08 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
2020-02-08 15:42:35 +01:00
Laurent Destailleur
b01e1e7724 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-02-08 15:30:16 +01:00
Laurent Destailleur
4b6276ff92 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2020-02-08 15:28:59 +01:00
Laurent Destailleur
14531bf160 Fix #13046 - Bad parenthesis on test 2020-02-08 15:28:40 +01:00
Laurent Destailleur
1a167aa5b4 Update card.php
Conflicts:
	htdocs/compta/tva/card.php
2020-02-08 15:12:55 +01:00
Laurent Destailleur
9b9101dc2f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/tools/export_files.php
2020-02-08 15:09:24 +01:00