dolibarr/htdocs
Laurent Destailleur 64f21b8a3c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/card.php
2018-03-11 00:10:13 +01:00
..
accountancy Merge pull request #8276 from ATM-Consulting/develop_atm 2018-03-08 20:06:37 +01:00
adherents fix scrutinizer 2018-03-10 00:13:41 +01:00
admin Merge pull request #8317 from frederic34/swifmailer 2018-03-10 18:48:08 +01:00
api Fix: REST API must be enabled for all entities 2018-03-09 12:54:34 +01:00
asterisk
barcode Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-22 12:17:25 +01:00
blockedlog Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
bookmarks Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
cashdesk Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
categories Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-08 16:37:17 +01:00
collab Clean translation files 2017-11-03 14:38:00 +01:00
comm NEW hidden conf to set nb weeks to show into user view 2018-03-10 16:46:57 +01:00
commande Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
compta Fix bad space 2018-03-10 22:42:28 +01:00
conf NEW Add param $dolibarr_main_restrict_ip in config file to limit ips 2018-02-15 19:49:50 +01:00
contact Add phone search 2018-03-09 23:48:50 +01:00
contrat fix scrunitizer 2018-03-10 10:34:11 +01:00
core Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
cron NEW Add mass action enable/disable on cron job list 2018-03-01 15:24:50 +01:00
custom
don Fix: syntax error 2018-03-08 11:57:38 +01:00
ecm Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
expedition Merge pull request #8276 from ATM-Consulting/develop_atm 2018-03-08 20:06:37 +01:00
expensereport Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
exports NEW Can export leave requests 2018-02-09 16:08:28 +01:00
externalsite Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
fichinter Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
fourn Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
ftp Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
holiday Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
hrm Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
imports Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-25 12:21:10 +01:00
includes Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
install Fix migration 2018-03-09 23:44:00 +01:00
langs Merge pull request #8325 from inoveaconseil/develop 2018-03-10 22:11:58 +01:00
livraison FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
loan Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
mailmanspip
margin Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
modulebuilder fix good write to add 2018-03-10 11:18:05 +01:00
multicurrency/class
opensurvey Fix for multicompany 2018-02-06 10:57:53 +01:00
paybox NEW Accept anonmymous events (no user assigned) 2018-03-04 19:39:46 +01:00
paypal NEW Online payment of invoice and subscription record the payment 2018-03-06 00:12:23 +01:00
printing Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
product Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
projet Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-08 16:37:17 +01:00
public Fix php code 2018-03-10 23:50:41 +01:00
resource Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
societe Add phone research 2018-03-09 23:45:28 +01:00
stripe Merge branch 'develop' into ptibogxiv-stripe 2018-03-10 22:05:18 +01:00
supplier_proposal Fix: compatibility with multicompany dictionnary sharing 2018-03-09 09:37:23 +01:00
support Fix debian package 2018-02-16 18:21:18 +01:00
theme CSS 2018-03-07 14:13:55 +01:00
user Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-07 13:06:29 +01:00
variants Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-11 00:10:13 +01:00
webservices Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-27 19:18:43 +01:00
website Fix scrutinizer errors 2018-03-04 11:09:53 +01:00
.gitignore
cache.manifest
document.php fetched from dolibarr/dolibarr 2018-02-15 16:02:13 +01:00
favicon.ico
filefunc.inc.php Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-17 01:19:17 +01:00
index.php CSS 2018-03-04 10:47:35 +01:00
main.inc.php Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:59:40 +01:00
master.inc.php Fix constant MAIN_LANG_DEFAULT not used 2017-12-19 00:24:38 +01:00
robots.txt
viewimage.php fetched from dolibarr/dolibarr 2018-02-15 16:02:13 +01:00