Laurent Destailleur 2a853329e5 Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/core/class/doleditor.class.php
	htdocs/main.inc.php
	htdocs/product/class/product.class.php

2014-03-08 14:25:59 +01:00

..

accountancy

…

adherents

Merge pull request #1437 from marcosgdf/invoice-types

2014-02-27 11:11:19 +01:00

admin

New: Update ckeditor to version 4 (part 2)

2014-03-08 13:17:20 +01:00

asterisk

…

barcode

anglicized

2014-02-27 09:42:00 +01:00

bookmarks

…

boutique

…

cashdesk

Replacing invoice integer types with Facture constants

2014-02-26 00:56:36 +01:00

categories

Uniformize fields shown

2014-02-19 02:19:54 +01:00

comm

Fix: Readonly mode does not need to use a specific toolbar with ckeditor

2014-03-08 13:46:17 +01:00

commande

Qual: Uniformize search date for lists.

2014-03-06 17:02:27 +01:00

compta

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

2014-03-06 18:04:19 +01:00

conf

…

contact

Uniformize code to prepare mass update

2014-02-27 10:37:23 +01:00

contrat

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-03 19:38:02 +01:00

core

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-08 14:25:59 +01:00

cron

Fix: path to image must not be hardcoded but use dol_buildpath or img_picto with param src=1

2014-01-13 10:10:17 +01:00

ecm

Fix: Missing loading lang files.

2014-01-26 18:43:30 +01:00

expedition

Start to work on a mass send remind feature.

2014-02-19 20:23:02 +01:00

exports

Merge remote-tracking branch 'origin/3.5' into develop

2014-02-26 15:49:29 +01:00

externalsite

…

fichinter

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-03 19:38:02 +01:00

fourn

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-03 19:38:02 +01:00

ftp

…

holiday

Fix: Number of day calculation. Add PHPUnit case.

2014-03-05 20:52:27 +01:00

imports

fix misspelled words

2014-02-05 17:53:30 +01:00

includes

New: Update ckeditor to version 4 (part 1)

2014-03-08 12:11:01 +01:00

install

Merge pull request #1452 from KreizIT/develop

2014-03-06 18:24:27 +01:00

langs

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

2014-03-06 18:27:09 +01:00

livraison

…

mailmanspip/class

…

margin

Fix: Bad management of date.

2014-02-16 17:07:17 +01:00

opensurvey

Clean database. Fix with firefox.

2014-03-05 12:15:47 +01:00

paybox

…

paypal

…

printipp

…

product

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-08 14:25:59 +01:00

projet

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-08 14:25:59 +01:00

public

Merge remote-tracking branch 'origin/3.5' into develop

2014-01-31 10:12:41 +01:00

societe

fix english misspelling

2014-03-05 09:57:36 +01:00

support

…

theme

Fix css for ckeditor 4.

2014-03-08 13:36:42 +01:00

user

fix english misspelling

2014-03-05 09:57:36 +01:00

webservices

Qual : phpdoc

2014-02-20 01:41:45 +01:00

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

Fix: Pb of file upload and download.

2014-02-08 02:02:01 +01:00

favicon.ico

…

filefunc.inc.php

Prepare version 3.5.1

2014-02-08 13:56:28 +01:00

index.php

Fix: miscellaneous css problems

2014-01-26 18:30:45 +01:00

main.inc.php

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-08 14:25:59 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

Work on barcode number generation.

2014-01-30 18:21:04 +01:00