Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
Files
dbaa43f3be37d30eea93611f1631b05215ec801f
dolibarr-fork/htdocs
History
Laurent Destailleur dbaa43f3be Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/holiday/card.php
	htdocs/holiday/list.php
	htdocs/user/card.php
2016-01-23 11:45:39 +01:00
..
accountancy
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-12-23 14:01:16 +01:00
adherents
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
admin
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-22 03:25:30 +01:00
api
…
asterisk
…
barcode
I continue bug war week-end
2016-01-09 00:44:06 +01:00
bookmarks
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-23 11:45:39 +01:00
cashdesk
Fix several warnings
2015-12-17 19:37:24 +01:00
categories
Fix text color for category tags
2016-01-10 00:11:49 +01:00
comm
Merge pull request #4469 from aspangaro/3.9-p8
2016-01-22 04:15:22 +01:00
commande
Fix select2 component go over parent container so we introduce option to
2016-01-08 23:17:45 +01:00
compta
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-22 03:25:30 +01:00
conf
Fix no ?> at end of php files
2016-01-02 00:32:22 +01:00
contact
Fix delete of image
2015-12-21 17:32:20 +01:00
contrat
Fix totalnboflines not correctly managed
2015-12-28 00:20:48 +01:00
core
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-23 11:45:39 +01:00
cron
FIX #4314
2016-01-08 15:45:23 +01:00
custom
…
don
Fix select2 component go over parent container so we introduce option to
2016-01-08 23:17:45 +01:00
ecm
…
expedition
FIX Bug: Delivery order and date are not displayed #4372
2016-01-13 20:56:20 +01:00
expensereport
Fix: link to add at wrong place
2016-01-23 11:30:06 +01:00
exports
…
externalsite
…
fichinter
Fix bad tab on bad home area page
2016-01-13 13:54:11 +01:00
fourn
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-23 11:45:39 +01:00
ftp
…
holiday
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-23 11:45:39 +01:00
hrm
Fix: When a payment mode was disabled, it was not visible on old
2015-12-21 13:56:59 +01:00
imports
…
includes
FIX #4207
2015-12-27 18:46:21 +01:00
install
Install style match application style
2016-01-08 22:23:57 +01:00
langs
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-22 03:25:30 +01:00
livraison
FIX Bug: Delivery order and date are not displayed #4372
2016-01-13 20:41:32 +01:00
loan
Fix: When a payment mode was disabled, it was not visible on old
2015-12-21 13:56:59 +01:00
mailmanspip
…
margin
Merge remote-tracking branch 'origin/3.8' into develop
2015-12-27 19:15:20 +01:00
opensurvey
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-22 03:25:30 +01:00
paybox
…
paypal
…
printing
…
product
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-23 11:45:39 +01:00
projet
Fix link on project ref on task list must jump to tab task
2016-01-21 15:15:26 +01:00
public
FIX #4314
2016-01-08 15:45:23 +01:00
resource
fix travis
2015-12-28 11:47:12 +01:00
societe
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-22 03:25:30 +01:00
supplier_proposal
Fix several bugs on css, translation or look
2016-01-01 23:44:23 +01:00
support
…
theme
Fix css
2016-01-09 03:00:12 +01:00
user
Merge remote-tracking branch 'origin/3.8' into 3.9
2016-01-23 11:45:39 +01:00
webservices
[Qual] Uniformize code
2015-12-21 22:59:12 +01:00
.gitignore
Add ignore
2016-01-08 13:06:38 +01:00
cache.manifest
…
disabled.php
…
document.php
…
favicon.ico
…
filefunc.inc.php
Merge remote-tracking branch 'origin/3.7' into 3.8
2015-12-27 19:06:31 +01:00
index.php
Fix bad management of option SOCIETE_DISABLE_PROSPECTS and
2016-01-14 12:49:23 +01:00
main.inc.php
Merge remote-tracking branch 'origin/3.8' into develop
2016-01-08 14:49:00 +01:00
master.inc.php
…
robots.txt
…
viewimage.php
Merge remote-tracking branch 'origin/3.8' into develop
2016-01-08 14:49:00 +01:00