Commit Graph

22973 Commits

Author SHA1 Message Date
Laurent Destailleur
8a481b297c Clean CSS, clean code 2020-05-21 13:06:36 +02:00
Philippe GRAND
c77a1be176 fix comment and add some translation 2020-05-21 11:35:32 +02:00
Frédéric FRANCE
def53338de add new rule 2020-05-21 09:07:10 +02:00
Frédéric FRANCE
ee6fadd0d5 add new rule 2020-05-21 01:41:27 +02:00
Frédéric FRANCE
416e6dd90d Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-21 01:11:45 +02:00
Frédéric FRANCE
ccadb1ec7a add new rule 2020-05-21 00:47:16 +02:00
Laurent Destailleur
15f3c97fff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:59:11 +02:00
Laurent Destailleur
036617570e Doc 2020-05-20 23:46:48 +02:00
Laurent Destailleur
92cbff7749 Clean code 2020-05-20 23:40:04 +02:00
Laurent Destailleur
64ebc665c7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:32:59 +02:00
Laurent Destailleur
de11fb2783 Fix phpcs 2020-05-20 23:32:13 +02:00
Laurent Destailleur
954d928467 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 20:11:13 +02:00
Laurent Destailleur
cce72ad8d6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/bills.lang
	htdocs/projet/class/project.class.php
2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/bills.lang
2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
Frédéric FRANCE
365f85dcea Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-20 18:28:55 +02:00
Laurent Destailleur
88c939562e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 12:39:01 +02:00
Laurent Destailleur
66df82f9e0 Better management of absolute url for canonical link tag 2020-05-20 12:38:38 +02:00
Laurent Destailleur
2f7786f50f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 10:37:43 +02:00
Laurent Destailleur
c5e341883d Fix popup of supplier invoice 2020-05-19 23:22:40 +02:00
Frédéric FRANCE
fd7a5473a7 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-19 21:08:15 +02:00
Laurent Destailleur
346082b153 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 19:59:24 +02:00
Laurent Destailleur
00d7947ee8 Fix link replaced twice 2020-05-19 19:55:28 +02:00
Laurent Destailleur
d89c9abcb6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 00:53:01 +02:00
Laurent Destailleur
7b29ce036a Fix input of virtual host and canonical url 2020-05-19 00:50:30 +02:00
Frédéric FRANCE
3e3cb05a57 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-18 22:43:41 +02:00
Laurent Destailleur
9f9dfb94f0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 22:40:52 +02:00
Laurent Destailleur
76663ae3e8 Fix canonical tag 2020-05-18 22:40:32 +02:00
Frédéric FRANCE
b6462462d7 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-18 22:27:32 +02:00
Laurent Destailleur
d60598b848 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-18 14:53:57 +02:00
Laurent Destailleur
d3ac33ce20 Fix json-ld file 2020-05-18 14:53:35 +02:00
Laurent Destailleur
729cc4fd6f Fix do not show full path 2020-05-18 13:26:33 +02:00
Frédéric FRANCE
54e2d72d8a Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-17 20:44:21 +02:00
Laurent Destailleur
02d4ecb21c Fix url for youtube 2020-05-17 20:08:01 +02:00
Laurent Destailleur
9370f71d01 Fix hardcoded value 2020-05-17 20:03:56 +02:00
Laurent Destailleur
bd564486ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-17 20:03:09 +02:00
Laurent Destailleur
8a6ae84fb0 Fix getStructuredData for organization 2020-05-17 20:02:01 +02:00
Laurent Destailleur
6be60efaba Fix bad link in json-ld 2020-05-17 19:09:22 +02:00
Laurent Destailleur
106fe7bde6 Clean conflict between direct debit and direct credit orders. 2020-05-17 15:06:09 +02:00
Laurent Destailleur
af46108cc4 Look and feel v12 2020-05-17 13:34:16 +02:00
Laurent Destailleur
783b71a9da Fix language set 2020-05-16 16:27:23 +02:00
Frédéric FRANCE
6d59b3f859 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-15 20:57:15 +02:00
Laurent Destailleur
ff07837053 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 19:01:54 +02:00
Laurent Destailleur
ff84fd8118 Fix default language of user. Must separate weblangs and pagelangs. 2020-05-15 19:01:12 +02:00
Frédéric FRANCE
62e0bfbb5f enhance free email 2020-05-15 18:53:59 +02:00
Frédéric FRANCE
76bb57bc6b enhance free email 2020-05-15 18:50:37 +02:00
Frédéric FRANCE
1bc8765291 enhance free email 2020-05-15 18:42:41 +02:00
Laurent Destailleur
3f5692c4d7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-15 18:42:08 +02:00
Laurent Destailleur
a73eccf70d FIX env of browser not loaded in website 2020-05-15 18:41:46 +02:00
Frédéric FRANCE
b9a082f774 Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-15 18:08:51 +02:00