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

Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php

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

..

ajax

Fix PHP error

2017-03-13 02:14:42 +01:00

boxes

Fix Better HTML5 compliant

2017-03-10 11:22:27 +01:00

class

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

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

db

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

2017-03-11 02:40:42 +01:00

filemanagerdol

Fix more then 30 security defects

2016-12-18 01:44:26 +01:00

js

Work on removal of jmobile

2017-02-23 00:45:27 +01:00

lib

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

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

login

FIX #6445

2017-03-10 14:49:17 +01:00

menus

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

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

modules

Uniformize css rules

2017-03-16 20:33:51 +01:00

tpl

Css enhancement

2017-03-15 11:41:15 +01:00

triggers

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

2017-03-02 14:29:22 +01:00

actions_builddoc.inc.php

NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class

2017-03-14 09:25:29 +01: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

Work on sorting/indexing upload files

2016-12-31 03:43:22 +01:00

actions_massactions.inc.php

fix the from e-mail on mass action

2017-03-17 17:55:25 +01:00

actions_printing.inc.php

…

actions_sendmails.inc.php

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

2017-03-02 14:29:22 +01:00

actions_setnotes.inc.php

…

antispamimage.php

…

datepicker.php

Fix more then 30 security defects

2016-12-18 01:44:26 +01:00

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 js errors

2017-02-23 02:51:26 +01:00

index.html

…

photos_resize.php

Work on sorting/indexing upload files

2016-12-31 03:43:22 +01:00

search_page.php

Work on module website

2017-02-24 21:13:40 +01:00

search.php

…

tools.php

…