#
# ChangeLog for branches/2.4
#
# Generated by Trac 1.2.3
# Apr 25, 2024, 3:18:06 AM

Mon, 02 Jul 2012 10:54:15 GMT mistic100 [16276]
	* branches/2.4/install/db/121-database.php (modified)

	Merged revision(s) 16275 from trunk:
	bug 2669: cancel migration task 121


Mon, 02 Jul 2012 07:46:35 GMT plg [16273]
	* branches/2.4/include/constants.php (modified)

	next version is 2.4.1


Sun, 01 Jul 2012 04:18:34 GMT rvelices [16242]
	* branches/2.4/admin/include/image.class.php (modified)

	bug 2672: invalid option sampling-factor for old versions of ...


Fri, 29 Jun 2012 22:23:49 GMT plg [16210]
	* branches/2.4/admin/include/image.class.php (modified)

	bug 2672: deactivate sampling-factor (for now)


Fri, 29 Jun 2012 15:10:09 GMT mistic100 [16180]
	* branches/2.4/admin/include/languages.class.php (modified)
	* branches/2.4/admin/include/plugins.class.php (modified)
	* branches/2.4/admin/include/themes.class.php (modified)
	* branches/2.4/admin/include/updates.class.php (modified)

	merge r16179 from trunk
	bug 2671: use get_branch_from_version() to ...


Fri, 29 Jun 2012 14:31:29 GMT mistic100 [16178]
	* branches/2.4/admin/include/plugins.class.php (modified)

	merge r16177 from trunk
	incompatible plugins check doesn't work ...


Fri, 29 Jun 2012 04:26:22 GMT rvelices [16168]
	* branches/2.4/admin/configuration.php (modified)
	* branches/2.4/admin/include/functions.php (modified)

	bug 2668 - fix php warnings on glob function (merge from trunk to
	2.4)


Thu, 28 Jun 2012 18:47:34 GMT mistic100 [16147]
	* branches/2.4/admin/include/image.class.php (modified)

	merge r16146 from trunk
	check if ilog() exists before using it, ...


Wed, 27 Jun 2012 07:01:01 GMT plg [16083]
	* branches/2.4/include/ws_protocols/rest_encoder.php (modified)

	tabulation is not the expected indentation


Wed, 27 Jun 2012 04:20:29 GMT rvelices [16077]
	* branches/2.4/admin/include/image.class.php (modified)

	correctly log errors when external imagick fails (merge from trunk)


Wed, 27 Jun 2012 04:09:54 GMT rvelices [16075]
	* branches/2.4/include/ws_protocols/rest_encoder.php (modified)

	bug 2666 Fix invalid xml on web service output with xml format (merge ...


Wed, 27 Jun 2012 03:55:48 GMT rvelices [16073]
	* branches/2.4/i.php (modified)

	bug 2655 avoid php warning in safe_mode merge from trunk to 2.4


Mon, 25 Jun 2012 06:35:27 GMT riopwg [16028]
	* branches/2.4/language/it_IT/admin.lang.php (modified)

	Merged revision 16027 from trunk: Update language IT


Fri, 22 Jun 2012 21:42:52 GMT mistic100 [15951]
	* branches/2.4/admin/configuration.php (modified)
	* branches/2.4/language/en_UK/admin.lang.php (modified)
	* branches/2.4/language/fr_FR/admin.lang.php (modified)

	merge r15950 from trunk
	bug 2659: Possible misconfiguration of ORDER ...


Fri, 22 Jun 2012 08:57:49 GMT plg [15936]
	* branches/2.4/include/constants.php (modified)

	next release is 2.4.0


Fri, 22 Jun 2012 08:56:58 GMT plg [15935]
	* branches/2.4/include/config_default.inc.php (modified)

	change default configuration settings for a stable branch. Developers ...


Fri, 22 Jun 2012 08:50:29 GMT plg [15934]
	* branches/2.4 (copied)

	Create branch 2.4 from trunk r15931


Thu, 21 Jun 2012 19:45:48 GMT TranslationTeam [15931]
	* trunk/plugins/LocalFilesEditor/language/tr_TR/plugin.lang.php (modified)

	[localfileseditor] Update tr_TR, thanks to : LazBoy