dolibarr/htdocs/core
Laurent Destailleur a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
2019-03-02 18:30:17 +01:00
..
ajax update with html5 compliant code 2019-02-19 17:38:14 +01:00
boxes add visibility 2019-02-28 20:48:07 +01:00
class Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2019-03-02 18:30:17 +01:00
db add visibility 2019-03-01 19:24:06 +01:00
filemanagerdol update with html5 compliant code 2019-02-19 17:42:12 +01:00
js wip 2019-03-02 10:16:13 +01:00
lib Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2019-03-02 18:30:17 +01:00
login Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
menus add visibility 2019-02-28 20:48:07 +01:00
modules Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
tpl Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-27 01:28:12 +01:00
triggers Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-28 20:48:23 +01:00
actions_addupdatedelete.inc.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
actions_builddoc.inc.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
actions_changeselectedfields.inc.php PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
actions_comments.inc.php Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
actions_dellink.inc.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
actions_extrafields.inc.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
actions_fetchobject.inc.php Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-26 12:10:13 +01:00
actions_lineupdown.inc.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
actions_linkedfiles.inc.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
actions_massactions.inc.php PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
actions_printing.inc.php FIX missing print button for delivery form 2018-10-23 22:11:39 +02:00
actions_sendmails.inc.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
actions_setmoduleoptions.inc.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
actions_setnotes.inc.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
antispamimage.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
commonfieldsinexport.inc.php
datepicker.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
doxygen.php FIX change my deprecated email 2018-10-27 14:43:12 +02:00
extrafieldsinexport.inc.php
get_info.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
get_menudiv.php Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION 2019-02-20 04:55:35 +01:00
index.html
photos_resize.php Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
search_page.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
search.php Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
tools.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
website.inc.php PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00