dolibarr/htdocs/core
Laurent Destailleur 97fce71218 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
..
ajax Qual: Removed useless assignment from void method 2014-04-23 18:23:54 +02:00
boxes Update box_ficheinter.php 2014-03-26 10:57:07 +01:00
class Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
db Qual: Moved duplicate method to base method 2014-04-23 12:15:18 +02:00
filemanagerdol Qual: Wrong type in method documentation 2014-04-23 18:23:58 +02:00
js Removed a function we should not have. 2014-04-25 20:18:26 +02:00
lib Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
login Add multicompany->enabled test 2013-12-16 09:45:38 +01:00
menus Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2014-04-25 20:29:29 +02:00
modules Merge remote-tracking branch 'origin/3.5' into develop 2014-04-26 22:35:35 +02:00
tpl Merge remote-tracking branch 'origin/3.5' into develop 2014-03-19 22:29:18 +01:00
triggers Automatic events for project tasks 2014-04-22 15:30:10 +02:00
actions_extrafields.inc.php Fix: sql error with postgres when creating extrafield with an upper cas 2014-02-25 15:48: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
actions_setnotes.inc.php Qual: Mutualize code for actions of editing notes 2014-01-11 13:33:30 +01:00
antispamimage.php
datepicker.php
doxygen.php
get_menudiv.php Fix: Var not initialized 2013-06-01 23:46:36 +02:00
index.php
photos_resize.php Fix: Image always fit into window when using cropping feature even if 2014-03-18 23:24:00 +01:00
search_page.php Qual: Missing variable declaration 2014-04-23 18:24:11 +02:00
tools.php Fix: Permissions on files 2013-08-06 00:36:21 +02:00