Laurent Destailleur a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php		2017-08-28 12:53:02 +02:00
..
ajax	Clean ecm code	2017-08-20 23:16:20 +02:00
boxes	Fix links	2017-08-23 18:52:03 +02:00
class	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-28 12:53:02 +02:00
db
filemanagerdol	Fix use command standard @... to mark a change in official code	2017-07-17 20:20:38 +02:00
js	Remove log	2017-08-22 13:15:56 +02:00
lib	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-28 12:53:02 +02:00
login
menus	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-01 10:22:37 +02:00
modules	Code comment	2017-08-27 19:40:43 +02:00
tpl	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-28 12:53:02 +02:00
triggers	Do some TODO on modulebuilder module.	2017-07-16 13:00:35 +02:00
actions_builddoc.inc.php
actions_changeselectedfields.inc.php
actions_dellink.inc.php
actions_extrafields.inc.php	Can set language file to use for label key of extra field	2017-08-27 12:52:26 +02:00
actions_fetchobject.inc.php	Enhance modulebuilder	2017-07-25 12:44:55 +02:00
actions_lineupdown.inc.php
actions_linkedfiles.inc.php
actions_massactions.inc.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-28 12:53:02 +02:00
actions_printing.inc.php
actions_sendmails.inc.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-28 12:53:02 +02:00
actions_setmoduleoptions.inc.php	Enhance modulebuilder	2017-08-26 15:22:13 +02:00
actions_setnotes.inc.php
antispamimage.php
commonfieldsinexport.inc.php	Can export Websites pages.	2017-07-28 14:54:13 +02:00
datepicker.php
doxygen.php
extrafieldsinexport.inc.php	Can export Websites pages.	2017-07-28 14:54:13 +02:00
get_menudiv.php
index.html
photos_resize.php
search_page.php
search.php
tools.php
website.inc.php	Fix pb of recursive include in website module	2017-07-20 16:49:20 +02:00