lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fe3f701928
dolibarr/htdocs
History
Laurent Destailleur fe3f701928 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	htdocs/expedition/list.php
	htdocs/filefunc.inc.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/user/class/user.class.php
2015-05-16 17:09:42 +02:00
..
accountancy [Qual] Fixed HTML select form selected attribute 2015-05-07 14:21:14 +02:00
adherents Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2015-05-16 02:53:36 +02:00
admin Fix css 2015-05-16 03:11:08 +02:00
api Renamed readme file 2015-05-12 22:59:17 +02:00
asterisk Provide NotFound and Error return values 2015-05-13 11:20:06 +10:00
barcode [Qual] Use jQuery property instead of attribute to test and set disabled 2015-05-12 14:53:01 +02:00
bookmarks Change generic and setup image title 2015-04-18 23:13:48 +02:00
cashdesk [Qual] Fixed HTML select form selected attribute 2015-05-07 14:21:14 +02:00
categories Css fixes 2015-05-14 20:49:22 +02:00
comm Merge pull request #2817 from GPCsolutions/jqueryfixes 2015-05-12 22:36:12 +02:00
commande Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 17:37:31 +02:00
compta Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2015-05-16 02:53:36 +02:00
conf Delete phpinfo.php 2015-04-01 18:57:54 +02:00
contact Minor cosmetic changes 2015-05-15 02:34:57 +02:00
contrat [Qual] Fixed deprecated HTML nowrap attribute to class 2015-05-12 15:37:35 +02:00
core Fix problem with multicompany on new feature Product propal merge PDF 2015-05-15 17:39:28 +02:00
cron [Qual] Fixed HTML select form selected attribute 2015-05-07 14:21:14 +02:00
custom
don NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
ecm [Qual] Fixed HTML select form selected attribute 2015-05-07 14:21:14 +02:00
expedition Merge remote-tracking branch 'origin/3.7' into develop 2015-05-16 17:09:42 +02:00
expensereport Debug of module expense report 2015-05-15 03:52:29 +02:00
exports Minor fixes 2015-05-13 07:46:12 +02:00
externalsite Change generic and setup image title 2015-04-18 23:13:48 +02:00
fichinter NEW Forms are using the tab look, even in creation mode. 2015-05-13 17:53:25 +02:00
fourn Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 17:37:31 +02:00
ftp Change generic and setup image title 2015-04-18 23:13:48 +02:00
holiday Fight against valign="top". Minor css fixes. 2015-05-14 16:47:15 +02:00
imports Minor fixes 2015-05-13 07:46:12 +02:00
includes Minor cosmetic changes 2015-05-15 02:34:57 +02:00
install Insert option to use old system storage photos only if the first 2015-05-16 16:19:51 +02:00
langs Better translation 2015-05-16 03:07:29 +02:00
livraison Copyright 2015-04-18 20:50:03 +02:00
loan Code fixes 2015-05-07 20:07:47 +02:00
mailmanspip
margin FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
opensurvey [Qual] Fixed HTML input form disabled attribute 2015-05-07 14:21:14 +02:00
paybox Change generic and setup image title 2015-04-18 23:13:48 +02:00
paypal Fix: PHPCS 2015-04-08 00:14:44 +02:00
printing Change generic and setup image title 2015-04-18 23:13:48 +02:00
product Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-15 17:37:31 +02:00
projet Css fixes 2015-05-14 20:49:22 +02:00
public Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2015-05-16 02:53:36 +02:00
resource [Qual] Fixed HTML select form selected attribute 2015-05-07 14:21:14 +02:00
societe Merge pull request #2771 from aternatik/api_rest 2015-05-12 19:39:37 +02:00
support
theme Merge remote-tracking branch 'origin/3.7' into develop 2015-05-16 17:09:42 +02:00
user Merge remote-tracking branch 'origin/3.7' into develop 2015-05-16 17:09:42 +02:00
webservices FIX : remove deprecated property 'libelle' on product object 2015-05-04 03:03:24 +02:00
.gitignore
cache.manifest
disabled.php
document.php
favicon.ico
filefunc.inc.php Merge remote-tracking branch 'origin/3.7' into develop 2015-05-16 17:09:42 +02:00
index.php NEW Can edit list of prospect status for customers/prospects. Add a new 2015-05-06 23:13:07 +02:00
main.inc.php [Qual] Fix form label id reference 2015-05-07 14:21:13 +02:00
master.inc.php
robots.txt
viewimage.php