Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
Files
e81a2548d8bb55b22ccf75fa4b4eee1e03bf52cc
dolibarr-fork/htdocs
History
Laurent Destailleur e81a2548d8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-08 11:17:14 +01:00
..
accountancy
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
adherents
Merge pull request #10487 from frederic34/psr2squizwhite
2019-02-08 09:30:25 +01:00
admin
Merge pull request #10517 from frederic34/patch-18
2019-02-08 09:56:50 +01:00
api
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
asset
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
asterisk
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
barcode
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
blockedlog
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
bookmarks
clean missing spaces in the last merge
2019-02-02 08:51:30 +01:00
cashdesk
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
categories
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
collab
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
comm
Merge branch 'develop' into new_branch_04_02_2019
2019-02-08 09:42:18 +01:00
commande
update with html5 compliant code
2019-02-04 10:42:40 +01:00
compta
Merge branch 'develop' into new_branch_04_02_2019
2019-02-08 09:42:18 +01:00
conf
…
contact
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
contrat
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
core
Merge pull request #10514 from atm-florian/dev_defautselectcustomertype
2019-02-08 09:56:29 +01:00
cron
Fix css
2019-02-06 00:56:28 +01:00
custom
…
datapolicy
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
dav
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
don
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
ecm
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
emailcollector
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
expedition
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
expensereport
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
exports
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
externalsite
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
fichinter
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
fourn
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
ftp
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
holiday
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
hrm
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
imports
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
includes
…
install
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
langs
NEW: setup default thridparty type (customer or prospect/customer)
2019-02-06 10:54:11 +01:00
livraison
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-31 18:27:27 +01:00
loan
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
mailmanspip
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
margin
Update agentMargins.php
2019-02-08 09:50:45 +01:00
modulebuilder
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
multicurrency/class
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
opensurvey
Merge branch 'develop' into nospaceaftercomma
2019-01-30 16:00:11 +01:00
paybox
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
paypal
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
printing
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
product
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
projet
Merge pull request #10487 from frederic34/psr2squizwhite
2019-02-08 09:30:25 +01:00
public
fix phpcs public/payment/newpayment.php
2019-02-05 20:56:34 +01:00
reception
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
resource
Merge branch 'develop' into nospaceaftercomma
2019-02-03 19:27:16 +01:00
societe
Fix phpcs
2019-02-08 11:17:04 +01:00
stripe
wip
2019-01-30 22:53:47 +01:00
supplier_proposal
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-02-01 18:31:44 +01:00
support
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
takepos
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
theme
Update style.css.php
2019-02-08 10:19:59 +01:00
ticket
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
user
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
variants
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
webservices
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
website
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-02-05 15:24:14 +01:00
.gitignore
…
cache.manifest
…
document.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-31 18:27:27 +01:00
favicon.ico
…
filefunc.inc.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
index.php
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
main.inc.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
master.inc.php
Merge branch 'develop' into nospaceaftercomma
2019-01-30 18:27:35 +01:00
robots.txt
…
viewimage.php
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-31 18:27:27 +01:00