Alexandre SPANGARO aa924bf010 Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal ...

# Conflicts:
#	htdocs/install/mysql/migration/5.0.0-6.0.0.sql

2017-03-27 22:35:06 +02:00

..

accountancy

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-27 00:49:24 +02:00

adherents

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-19 11:26:49 +01:00

admin

Hidden for the moment because option specific to one theme only.

2017-03-26 13:11:01 +02:00

api

…

asterisk

…

barcode

…

bookmarks

NEW Can use dol_fiche_end without showing bottom border.

2017-03-15 11:13:30 +01:00

cashdesk

Page societe/soc.php and compta/facture.php was renamed into card.php

2017-03-20 21:29:22 +01:00

categories

FIX #6535

2017-03-16 22:49:02 +01:00

comm

Start to move search bar before table titles

2017-03-27 00:48:50 +02:00

commande

Start to move search bar before table titles

2017-03-27 00:48:50 +02:00

compta

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-27 00:49:24 +02:00

conf

…

contact

Start to move search bar before table titles

2017-03-27 00:48:50 +02:00

contrat

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-23 12:52:19 +01:00

core

Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal

2017-03-27 22:35:06 +02:00

cron

…

custom

…

don

…

ecm

…

expedition

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-27 00:49:24 +02:00

expensereport

Merge pull request #6543 from laudeco/feature/expenseNoteFusionPdf

2017-03-24 22:50:54 +01:00

exports

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-19 11:26:49 +01:00

externalsite

…

fichinter

Page societe/soc.php and compta/facture.php was renamed into card.php

2017-03-20 21:29:22 +01:00

fourn

Update list.php

2017-03-24 23:53:32 +01:00

ftp

…

holiday

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-27 00:49:24 +02:00

hrm

Fix closing boxes

2017-03-15 11:58:13 +01:00

imports

…

includes

NEW Add function dolMd2Html

2017-03-21 16:03:13 +01:00

install

Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal

2017-03-27 22:35:06 +02:00

langs

Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input

2017-03-24 22:52:39 +01:00

livraison

…

loan

Bad parasite caracters

2017-03-25 23:48:30 +01:00

mailmanspip

…

margin

Remove border-bottom useless

2017-03-23 13:06:38 +01:00

multicurrency/class

…

opensurvey

NEW Add function ajax_autoselect

2017-03-23 11:16:30 +01:00

paybox

…

paypal

NEW Add function ajax_autoselect

2017-03-23 11:16:30 +01:00

printing

…

product

Update note.php

2017-03-25 10:52:03 +01:00

projet

Start to move search bar before table titles

2017-03-27 00:48:50 +02:00

public

…

resource

…

societe

Start to move search bar before table titles

2017-03-27 00:48:50 +02:00

supplier_proposal

FIX : supplier default condition not retrived on create

2017-03-25 12:06:02 +01:00

support

…

theme

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-27 00:49:24 +02:00

user

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-23 11:38:46 +01:00

variants

Uniformize code

2017-03-12 17:10:32 +01:00

webservices

…

websites

…

.gitignore

…

cache.manifest

…

document.php

…

favicon.ico

…

filefunc.inc.php

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-03-19 11:26:49 +01:00

index.php

Start to move search bar before table titles

2017-03-27 00:48:50 +02:00

main.inc.php

Fix document_preview is possible on files with + chars inside.

2017-03-24 17:32:38 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

…