dolibarr/htdocs/core
Laurent Destailleur 0b045a2d96 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	htdocs/core/boxes/box_activity.php
	htdocs/filefunc.inc.php
2013-01-16 14:11:19 +01:00
..
ajax Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
boxes Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 14:11:19 +01:00
class Qual: A translation file must not be loaded into class constructors, but 2013-01-15 17:06:53 +01:00
db Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
filemanagerdol Fix: Remove last chackstyle errors 2012-12-21 11:59:55 +01:00
js Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
lib Merge remote-tracking branch 'origin/3.3' into develop 2013-01-15 12:06:41 +01:00
login Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
menus Merge remote-tracking branch 'origin/3.3' into develop 2013-01-16 14:11:19 +01:00
modules Qual: We can enable box by default because a warning is output to user. 2013-01-15 15:53:35 +01:00
tpl Add standard extrafield type : 2013-01-14 16:13:09 +01:00
triggers Updated demo trigger class with last changes in triggers 2012-12-31 05:30:09 +01:00
admin_extrafields.inc.php New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
antispamimage.php Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
datepicker.php Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
doxygen.php Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
index.php
photos_resize.php Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
tools.php Fix: change for a neutral email 2012-12-30 15:13:49 +01:00