dolibarr/htdocs
Laurent Destailleur 7e6ba51780 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/tasks/comment.php
2018-03-07 13:06:29 +01:00
..
accountancy Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-07 13:06:29 +01:00
adherents Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-07 11:54:48 +01:00
admin Fix look and feel v7 2018-03-07 12:27:31 +01:00
api Merge pull request #8242 from hregis/develop_multicompany 2018-03-02 17:49:25 +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 FIX Subscription not correctly log in blockedlog 2018-03-06 09:08:45 +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-02-27 19:18:43 +01:00
collab Clean translation files 2017-11-03 14:38:00 +01:00
comm Standardize output 2018-03-07 12:03:40 +01:00
commande Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-07 13:03:40 +01:00
compta Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-07 11:54:48 +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 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
contrat Fix missing hook init 2018-03-02 17:32:54 +01:00
core Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-07 13:06:29 +01:00
cron NEW Add mass action enable/disable on cron job list 2018-03-01 15:24:50 +01:00
custom Fix doc 2017-09-04 11:22:53 +02:00
don Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-02 14:00:27 +01:00
ecm Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
expedition Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-06 09:20:45 +01:00
expensereport Fix oldcopy must be saved before update_extras 2018-02-23 16:11:00 +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 css 2018-03-01 23:51:06 +01:00
ftp Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
holiday FIX Missing restore_lastsearch_values 2018-02-26 21:16:40 +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 Don't check for windows/linux, just call soffice (without the extension) will work on windows too. 2018-02-15 14:38:21 +01:00
install Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-07 11:54:48 +01:00
langs Merge branch 'develop' into 8.0-a6_vat 2018-03-07 12:23:43 +01:00
livraison FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
loan Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-12-28 09:56:40 +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 include master 2018-03-02 14:46:00 +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 Fix cancel and template to record stock movement/correction 2018-03-06 09:07:39 +01:00
projet Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-07 13:06:29 +01:00
public NEW Online payment of invoice and subscription record the payment 2018-03-06 00:12:23 +01:00
resource Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
societe WIP Create payment of member subscription with paypal 2018-03-05 21:46:24 +01:00
stripe NEW Accept anonmymous events (no user assigned) 2018-03-04 19:39:46 +01:00
supplier_proposal Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-06 09:20:45 +01:00
support Fix debian package 2018-02-16 18:21:18 +01:00
theme Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-07 11:54:48 +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 Fix back link of look and feel v7 2018-02-26 09:20:05 +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