Laurent Destailleur e95160c218 Merge remote-tracking branch 'origin/3.7' into develop ...

Conflicts:
	htdocs/user/agenda_extsites.php

2014-12-08 17:51:36 +01:00

..

accountancy

Merge pull request #2103 from grandoc/develop

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

adherents

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

2014-12-05 20:21:40 +01:00

admin

Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5

2014-12-08 00:09:01 +01:00

asterisk

…

barcode

Bad var

2014-12-04 01:36:53 +01:00

bookmarks

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

2014-12-04 14:52:34 +01:00

cashdesk

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

2014-12-05 21:12:35 +01:00

categories

Replace <center> tags

2014-11-25 20:13:43 +01:00

comm

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

2014-12-08 17:51:36 +01:00

commande

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

2014-12-04 14:52:34 +01:00

compta

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

2014-12-04 14:52:34 +01:00

conf

…

contact

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

2014-12-07 19:19:48 +01:00

contrat

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

2014-11-28 02:26:40 +01:00

core

Fixed: Pb of wrapping login page

2014-12-08 02:41:21 +01:00

cron

Correct

2014-11-25 20:40:00 +01:00

ecm

Merge pull request #2102 from aspangaro/develop-center

2014-11-27 23:58:44 +01:00

expedition

Fix: Maxi debug of module productbatch.

2014-12-05 16:04:37 +01:00

exports

Correct

2014-11-25 20:40:00 +01:00

externalsite

Fix: syntax error

2014-12-04 01:23:39 +01:00

fichinter

Replace <center> tags

2014-11-25 20:13:43 +01:00

fourn

Fix: phpcheckstyle

2014-12-04 01:11:13 +01:00

ftp

Correct

2014-11-25 20:40:00 +01:00

holiday

Fixed [ bug #1691 ] Don't think the ID should be displayed in holiday module

2014-11-28 01:02:44 +01:00

imports

Replace <center> tags

2014-11-25 20:13:43 +01:00

includes

Start to work on new generation combo box.

2014-12-05 13:26:47 +01:00

install

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

2014-12-07 19:19:48 +01:00

langs

Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5

2014-12-08 00:09:01 +01:00

livraison

…

mailmanspip

…

margin

Merge remote-tracking branch 'origin/3.6' into 3.7

2014-11-23 16:51:25 +01:00

opensurvey

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

2014-12-07 19:19:48 +01:00

paybox

Replace <center> tags

2014-11-25 20:13:43 +01:00

paypal

Replace <center> tags

2014-11-25 20:13:43 +01:00

printipp

Fixed a lot of bugs into PrintIPP module. Seems to be stable enough now

2014-12-04 13:20:56 +01:00

product

Fix: Maxi debug of module productbatch.

2014-12-05 16:04:37 +01:00

projet

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

2014-12-07 23:52:02 +01:00

public

Work on select2 prototype.

2014-12-07 23:51:36 +01:00

resource

Fix: Miscellaneous fixes for multicompany

2014-12-06 14:41:56 +01:00

societe

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

2014-12-08 17:51:36 +01:00

support

Fixed: missing css

2014-12-08 02:51:26 +01:00

theme

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

2014-12-08 17:51:36 +01:00

user

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

2014-12-08 17:51:36 +01:00

webservices

Merge pull request #2102 from aspangaro/develop-center

2014-11-27 23:58:44 +01:00

.gitignore

…

cache.manifest

…

disabled.php

…

document.php

…

favicon.ico

…

filefunc.inc.php

Prepare 3.8 dev

2014-12-03 17:06:44 +01:00

index.php

…

main.inc.php

Merge branch 'develop-html5' of https://github.com/aspangaro/dolibarr into aspangaro-develop-html5

2014-12-08 00:09:01 +01:00

master.inc.php

…

robots.txt

…

viewimage.php

…