dolibarr/htdocs
Laurent Destailleur c175fbd697 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/website/class/website.class.php
	htdocs/website/index.php
2020-06-09 22:09:57 +02:00
..
accountancy Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 23:04:55 +02:00
adherents Merge pull request #14041 from bb2a/VCARD 2020-06-06 20:58:37 +02:00
admin Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-07 19:55:48 +02:00
api add new rule 2020-05-21 15:05:19 +02:00
asset Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 14:28:20 +02:00
asterisk add new rule 2020-05-21 09:35:30 +02:00
barcode Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-03 01:06:27 +02:00
blockedlog add new rule 2020-05-21 15:05:19 +02:00
bom Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
bookmarks Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:07:18 +02:00
cashdesk add new rule 2020-05-21 15:05:19 +02:00
categories NEW Add mass action to set category on a list of website pages. 2020-05-26 22:29:46 +02:00
collab add new rule 2020-05-21 15:05:19 +02:00
comm Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-31 00:31:14 +02:00
commande Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-03 01:06:27 +02:00
compta Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-08 20:36:54 +02:00
conf
contact Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 23:04:55 +02:00
contrat add new rule 2020-05-21 16:00:12 +02:00
core Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-09 22:09:57 +02:00
cron add new rule 2020-05-21 15:05:19 +02:00
custom
datapolicy Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
dav add new rule 2020-05-21 15:05:19 +02:00
debugbar Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-27 23:38:46 +02:00
don add new rule 2020-05-21 15:05:19 +02:00
ecm Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 11:57:31 +02:00
emailcollector add new rule 2020-05-21 15:05:19 +02:00
expedition Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
expensereport Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
exports add new rule 2020-05-21 15:05:19 +02:00
externalsite add new rule 2020-05-21 15:05:19 +02:00
fichinter Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-31 00:31:14 +02:00
fourn Merge pull request #13678 from TobiasSekan/cleanupUserRightsForunCommandeCard 2020-05-28 21:12:23 +02:00
ftp add new rule 2020-05-21 15:05:19 +02:00
holiday Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
hrm Debug establishment management 2020-05-29 21:45:50 +02:00
imports Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-31 00:31:14 +02:00
includes fix : personnal font file within tcpdf 2020-05-23 15:01:40 +02:00
install Migration 2020-06-08 11:43:00 +02:00
langs Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-09 22:09:57 +02:00
livraison add new rule 2020-05-21 15:05:19 +02:00
loan Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
mailmanspip add new rule 2020-05-21 15:05:19 +02:00
margin add new rule 2020-05-21 15:05:19 +02:00
modulebuilder Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-07 19:55:48 +02:00
mrp Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-09 22:09:57 +02:00
multicurrency/class Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:08 +02:00
opensurvey phpcs 2020-05-28 20:04:30 +02:00
paybox add new rule 2020-05-21 15:05:19 +02:00
paypal add new rule 2020-05-21 15:05:19 +02:00
printing add new rule 2020-05-21 15:05:19 +02:00
product Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-08 20:36:54 +02:00
projet Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-08 20:36:54 +02:00
public [NEW] Ticket message notifications from public interface 2020-05-27 11:39:06 +02:00
reception add new rule 2020-05-21 15:05:19 +02:00
resource add new rule 2020-05-21 15:05:19 +02:00
salaries add new rule 2020-05-21 15:05:19 +02:00
societe Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-08 20:36:54 +02:00
stripe add new rule 2020-05-21 15:05:19 +02:00
supplier_proposal Fixing style errors. 2020-05-25 22:33:02 +00:00
support add new rule 2020-05-21 15:05:19 +02:00
takepos FIX end div for responsive table 2020-06-05 14:20:38 +02:00
theme Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-08 20:36:54 +02:00
ticket Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 11:57:31 +02:00
user Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 23:04:55 +02:00
variants Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:08 +02:00
webservices Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-28 21:36:08 +02:00
website Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-09 22:09:57 +02:00
zapier add new rule 2020-05-21 09:12:18 +02:00
.gitignore
cache.manifest Fix use SVG logo instead of PNG 2020-05-15 12:43:48 +02:00
document.php add new rule 2020-05-21 15:13:31 +02:00
favicon.ico
filefunc.inc.php Prepare v12 2020-06-06 22:52:36 +02:00
index.php Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-07 19:55:48 +02:00
main.inc.php Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-31 00:31:14 +02:00
master.inc.php add new rule 2020-05-21 15:05:19 +02:00
opcachepreload.php
robots.txt
viewimage.php add new rule 2020-05-21 15:13:31 +02:00