lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1af74b4c42
dolibarr/htdocs
History
Laurent Destailleur 1af74b4c42 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/skeleton_list.php
	htdocs/admin/perms.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/product/class/product.class.php
	htdocs/product/class/service.class.php
	htdocs/product/index.php
	htdocs/product/list.php
	htdocs/public/members/new.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2017-06-09 12:50:56 +02:00
..
accountancy Fix syntax error 2017-06-08 14:55:12 +02:00
adherents Fix syntax error 2017-06-08 14:55:12 +02:00
admin Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
api Merge pull request #6899 from hregis/develop_bug_restapi 2017-05-29 10:50:43 +02:00
asterisk New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
barcode Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
bookmarks Fix syntax error 2017-06-08 14:55:12 +02:00
cashdesk New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
categories Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-06-07 20:14:03 +02:00
collab Fix var not sanitized 2017-05-16 13:27:32 +02:00
comm Fix syntax error 2017-06-08 14:55:12 +02:00
commande Fix syntax error 2017-06-08 14:55:12 +02:00
compta Fix syntax error 2017-06-08 14:55:12 +02:00
conf New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
contact Fix syntax error 2017-06-08 14:55:12 +02:00
contrat Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
core Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
cron Fix syntax error 2017-06-08 14:55:12 +02:00
custom Start to work to have custom dir available and active by default. 2016-04-30 17:11:48 +02:00
don Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-06-07 20:14:03 +02:00
ecm Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
expedition Fix syntax error 2017-06-08 14:55:12 +02:00
expensereport Fix syntax error 2017-06-08 14:55:12 +02:00
exports Better tooltip for computed field 2017-05-09 17:00:07 +02:00
externalsite Fix var not sanitized 2017-05-16 13:27:32 +02:00
fichinter Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
fourn Fix syntax error 2017-06-08 14:55:12 +02:00
ftp FIX #6945 2017-06-06 10:53:53 +02:00
holiday Merge branch 'develop' into develop_transverse 2017-06-08 10:25:04 +02:00
hrm Fix look and feel v6 2017-05-19 16:32:23 +02:00
imports NEW Can import users 2017-04-17 04:22:53 +02:00
includes Update swagger to 2.0.24 2017-05-24 15:12:45 +02:00
install Fix missing thumbs images for products 2017-06-09 00:27:44 +02:00
langs Fix statistics on products 2017-06-09 10:38:06 +02:00
livraison New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
loan FIX #6945 2017-06-06 10:53:53 +02:00
mailmanspip
margin Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
modulebuilder Fix syntax error 2017-06-08 14:55:12 +02:00
multicurrency/class New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
opensurvey Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-06 15:03:36 +02:00
paybox Look and feel v6 2017-05-15 10:39:14 +02:00
paypal Look and feel v6 2017-05-15 10:39:14 +02:00
printing Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
product Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
projet Fix syntax error 2017-06-08 14:55:12 +02:00
public Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
resource Fix syntax error 2017-06-08 14:55:12 +02:00
societe Fix syntax error 2017-06-08 14:55:12 +02:00
stripe Look and feel v6 2017-05-15 10:39:14 +02:00
supplier_proposal Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 2017-06-07 20:14:03 +02:00
support Use function top_httphead to include headers in pages. 2017-05-09 21:46:57 +02:00
theme Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
user Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-09 12:50:56 +02:00
variants New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
webservices New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
websites New: getEntity function use true $shared value by default 2017-05-30 18:50:54 +02:00
.gitignore Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-05-29 10:25:07 +02:00
cache.manifest Fix missing translation of page "disabled" and "offline". 2016-12-02 17:49:39 +01:00
document.php Fix var not sanitized 2017-05-16 13:27:32 +02:00
favicon.ico Update favicon 2012-09-05 15:35:26 +02:00
filefunc.inc.php New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
index.php New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
main.inc.php NEW Introduction option MAIN_HTTP_CONTENT_SECURITY_POLICY 2017-05-29 15:20:50 +02:00
master.inc.php New: big refactorization of multicompany transverse mode 2017-06-06 10:23:33 +02:00
robots.txt
viewimage.php Fix var not sanitized 2017-05-16 13:27:32 +02:00