Commit Graph

3924 Commits

Author SHA1 Message Date
Laurent Destailleur
c6c941e09a Fix phpcs 2020-02-13 15:42:41 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
ecb1f1f2d7 Responsive 2020-02-10 01:01:22 +01:00
Laurent Destailleur
8645fd8946 FIX CVE-2019–17223 FIX #13053 2020-02-09 18:28:57 +01:00
Laurent Destailleur
5e71366ff2 css 2020-02-06 18:06:36 +01:00
Laurent Destailleur
7411f6468b css 2020-02-05 21:47:41 +01:00
Laurent Destailleur
f5129c87d2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-05 19:38:52 +01:00
Laurent Destailleur
cca62dd8d3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-02-05 19:38:25 +01:00
Laurent Destailleur
1ef978ccc4 FIX #12966 2020-02-05 19:32:49 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
Laurent Destailleur
c015707cbc Fix Only dolibarr logos are in root of theme 2020-02-05 14:14:59 +01:00
Laurent Destailleur
ddd1ca26b9 CSS 2020-02-05 14:04:19 +01:00
Laurent Destailleur
9c8119def9 Fix phpcs 2020-02-04 18:03:32 +01:00
Laurent Destailleur
71d0ed0754 css 2020-02-04 16:44:46 +01:00
Laurent Destailleur
bb1c9a66dd Fix code alignement on modulebuilder 2020-02-04 16:37:30 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Laurent Destailleur
be9ac4f959 CSS 2020-02-02 18:10:28 +01:00
Laurent Destailleur
0db77c1de6 CSS 2020-01-31 14:52:43 +01:00
Laurent Destailleur
51c6540a56 WIP Advanced search 2020-01-30 23:28:50 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
c2c80bf40f Fix Look and feel v11 2020-01-28 02:44:41 +01:00
Laurent Destailleur
29853b5fbd Fix responsive for public interface of tickets 2020-01-27 14:01:35 +01:00
Laurent Destailleur
30a5ab479f Can choose text to show when there is no data 2020-01-25 22:43:24 +01:00
Laurent Destailleur
cc6b9269f9 Fix look and feel v11 2020-01-25 11:50:16 +01:00
Laurent Destailleur
8f3f34e1c0 Fix css 2020-01-24 20:11:07 +01:00
Laurent Destailleur
d5f2a793c0 CSS 2020-01-24 19:36:17 +01:00
Laurent Destailleur
3a7c0b63f1 css 2020-01-24 17:56:41 +01:00
Laurent Destailleur
5d7fa55759 css 2020-01-24 17:48:24 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +01:00
Laurent Destailleur
0456994f0d Responsive 2020-01-22 13:34:21 +01:00
Laurent Destailleur
54a0d97891 Fix responsive 2020-01-21 10:48:15 +01:00
Laurent Destailleur
cef38016bb Trans 2020-01-09 17:16:30 +01:00
Laurent Destailleur
d0739af8b4 Debug MRP 2020-01-08 19:04:00 +01:00
Laurent Destailleur
8384c5b03c css 2020-01-06 15:14:14 +01:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +01:00
Laurent Destailleur
b1a99c1e23 CSS 2019-12-23 13:28:20 +01:00
Laurent Destailleur
b525025f9d CSS 2019-12-23 13:13:59 +01:00
Laurent Destailleur
89528e46f1 css 2019-12-23 12:47:00 +01:00
Laurent Destailleur
2df9df2db0 Debug v11 2019-12-23 12:24:27 +01:00
Laurent Destailleur
78fa75c6b0 css 2019-12-22 21:58:08 +01:00
Laurent Destailleur
b52deb94d4 CSS 2019-12-22 13:25:58 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside
Fix var not defined
2019-12-22 13:19:14 +01:00
Laurent Destailleur
03649ea2c8 Fix pb with svg images 2019-12-19 19:10:23 +01:00
Laurent Destailleur
af9d34efca CSS v11 2019-12-18 21:49:28 +01:00
Scrutinizer Auto-Fixer
404ae0c209 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-17 02:00:52 +00:00
Laurent Destailleur
d22cd5c321 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/accountancy/bookkeeping/list.php
2019-12-16 19:09:53 +01:00
Laurent Destailleur
65abe7532c Fix error message not reported when deleting record in ledger. 2019-12-16 19:05:32 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
fdf4d86d81 Debug code 2019-12-16 12:38:51 +01:00