Laurent Destailleur c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang

2016-12-16 13:56:55 +01:00

..

ajax

Fix style fo ECM module

2016-12-13 01:19:33 +01:00

boxes

Fix bank account box

2016-12-11 14:01:04 +01:00

class

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

2016-12-16 13:56:55 +01:00

db

Update doc

2016-11-07 03:18:53 +01:00

filemanagerdol

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

2016-11-11 15:03:05 +01:00

js

Move button to link to, in same part of code than code to output links.

2016-08-05 15:30:28 +02:00

lib

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

2016-12-16 13:56:55 +01:00

login

Code comment

2016-09-19 00:49:29 +02:00

menus

Merge pull request #6064 from defrance/patch-48

2016-12-01 21:47:21 +01:00

modules

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

2016-12-11 16:20:46 +01:00

tpl

Empty inputs when editing line

2016-12-11 10:48:49 +01:00

triggers

Fix dead code

2016-10-25 21:04:49 +02:00

actions_builddoc.inc.php

Fix sepa mandate translation

2016-10-14 17:56:22 +02:00

actions_changeselectedfields.inc.php

…

actions_dellink.inc.php

NEW Link between objects can be done on both side and on all objects

2016-08-04 11:57:37 +02:00

actions_extrafields.inc.php

Fix option unique of extrafields not saved

2016-10-11 12:20:14 +02:00

actions_fetchobject.inc.php

…

actions_lineupdown.inc.php

…

actions_linkedfiles.inc.php

Add file scheme to allowed URIs schemes for links

2016-10-22 01:57:25 +02:00

actions_massactions.inc.php

Backport a file to make migration easier

2016-11-17 19:28:19 +01:00

actions_printing.inc.php

…

actions_sendmails.inc.php

NEW #5896 More complete data on event sent by email (name in title,

2016-10-24 02:02:30 +02:00

actions_setnotes.inc.php

…

antispamimage.php

…

datepicker.php

…

doxygen.php

Use https links

2016-07-30 11:40:55 +02:00

extrafieldsinexport.inc.php

FIX : Do not include separate extrafields into export cause "separate"

2016-12-09 17:17:58 +01:00

get_menudiv.php

FIX Menu users not visible on dolidroid.

2016-09-30 10:56:35 +02:00

index.html

…

photos_resize.php

Fix #6106 error message when cancel pic resize

2016-12-10 12:27:11 +01:00

search_page.php

FIX quick search boxes when nojs or when using smartphone

2016-09-03 12:56:49 +02:00

search.php

…

tools.php

…