Laurent Destailleur c7ef0b7c57 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/societe/consumption.php		2014-01-07 16:41:00 +01:00
..
ajax	Fix: The delete button into ecm module does not work when ajax disabled.	2014-01-05 18:37:26 +01:00
boxes	Merge remote-tracking branch 'origin/3.5' into develop	2013-12-16 00:09:29 +01:00
class	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-07 16:41:00 +01:00
db	Removed some FIXME	2013-12-15 14:26:27 +01:00
filemanagerdol	Merge remote-tracking branch 'origin/3.4' into 3.5	2013-12-14 01:30:15 +01:00
js	Doc: More comments	2013-11-16 18:12:13 +01:00
lib	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-07 16:41:00 +01:00
login	Add multicompany->enabled test	2013-12-16 09:45:38 +01:00
menus	Fix: W3C.	2014-01-06 17:17:57 +01:00
modules	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-07 16:41:00 +01:00
tpl	Merge remote-tracking branch 'origin/3.5' into develop	2014-01-07 16:41:00 +01:00
triggers	Fix: Trigger name conflicts and reference file was not matching real	2013-12-14 20:48:34 +01:00
actions_extrafields.inc.php	[ task #1127 ] Add feature filter on extrafield type : select for table	2013-11-04 19:21:13 +01:00
actions_sendmails.inc.php	Fix: Sending email from thirdparty must add event into agenda if option	2013-09-25 21:36:40 +02:00
antispamimage.php
datepicker.php
doxygen.php
get_menudiv.php
index.php
photos_resize.php
search_page.php
tools.php	Fix: Permissions on files	2013-08-06 00:36:21 +02:00