Index: branches/5.2.x/core/ckeditor/ckfinder/changelog.txt
===================================================================
diff -u -N -r15042 -r15316
--- branches/5.2.x/core/ckeditor/ckfinder/changelog.txt	(.../changelog.txt)	(revision 15042)
+++ branches/5.2.x/core/ckeditor/ckfinder/changelog.txt	(.../changelog.txt)	(revision 15316)
@@ -1,8 +1,62 @@
 CKFinder Changelog
 ==================
 http://ckfinder.com
-Copyright (C) 2007-2011, CKSource - Frederico Knabben. All rights reserved.
+Copyright (C) 2007-2012, CKSource - Frederico Knabben. All rights reserved.
 
+### Version 2.2.1
+- Fixed: finder.popup() does not work in Chrome 18.
+
+### Version 2.2
+Security Release: fixed filtering of unsafe characters for IIS6 web server.
+- HTML5 multiple file uploads introduced.
+- Files can now be uploaded by using the drag&drop in Firefox and Chrome.
+- Added a read-only mode (config.readOnly), which if enabled, lets the user browse the files but not upload or modify them.
+- CKFinder now supports common lightbox plugins by default when viewing files, and will use Colorbox to show images if no other lightbox plugin is loaded.
+- "Upload" button in the toolbar now remains active after a file has been uploaded if the Upload Pane is still open.
+- Improved formatting of file sizes.
+- Dialog window definition now contains a new connectorResponse property which can use raw data sent from the server inside plugins.
+- Added support for full URLs in the SetupCKEditor() method.
+- Configuration objects passed to the SetupCKEditor() method are now in fact being used.
+- Improved support for Android and iOS tablets.
+- Updated translations: Slovak; minor updates in all other localizations.
+- Fixed: Permission denied to set property Window.onbeforeunload.
+- Fixed: ckfinder_v1.js: SetupCKEditor() and SetupFCKeditor() methods are causing a JavaScript error.
+- Fixed: IE, Opera: Double clicking a file causes CKFinder to try to close the browser tab.
+- Fixed: IE, Opera: CKFinder closes the browser tab after the tab which linked to it was closed.
+- Fixed: IE, Opera: CKFinder tries to close the browser tab after pressing the F5 key (Refresh).
+- Fixed: When CKFinder is integrated with CKEditor, the URL that is sent back from the Upload tab after a successful file upload is not being encoded properly.
+- Fixed: It is impossible to view a file with a special character in its name.
+- Fixed: IE8: Selecting a file requires a double click instead of a single one.
+- Fixed High Contrast mode detection.
+- Fixed: Flash uploader is unable to deal with unexpected errors.
+[PHP] - Fixed: Incorrect encoding of file names returned after the file upload.
+[PHP] - Added: Support full URLs in resolveUrl() to resolve to correct $baseDir.
+
+### Version 2.1.1
+- Sorting by file extension is now available.
+- Clear Basket button is now only active when applicable.
+- Added support for skins in custom paths (config.skin).
+- Added a new API method to destroy an instance (api.destroy()).
+- Added an option to specify additional parameters for server requests (config.connectorInfo).
+- Added new translations: Bulgarian, Croatian, Esperanto, Gujarati, Hindi, Romanian, Vietnamese, Welsh.
+- Updated translations: Brazilian Portuguese, Chinese Simplified, Czech, Dutch, Estonian, Finnish, French, German, Greek, Hebrew, Italian, Lithuanian, Norwegian Bokmål, Norwegian Nynorsk, Persian, Polish, Russian, Slovenian, Spanish, Swedish, Turkish.
+- Added Czech version of CKFinder User's Guide ("Help").
+- A callback function (config.callback) can now also be defined in the configuration file.
+- Added RTL support for skins.
+- Improved RTL support in the Flash upload component.
+- Fixed: The Flash uploader used wrong URL to send files when CKFinder had an ID attribute assigned (as a result, the upload was never marked as completed).
+- Fixed: Added protection against thumbnail caching. CKFinder was displaying an old thumbnail when a user deleted a file and then a file with the same name was uploaded.
+- Fixed: [Opera] Double clicking on a folder opens the browser's context menu.
+- Fixed: It was impossible to re-enable a disabled context menu command.
+- Fixed: config.id is now available for reading within custom configuration.
+- Fixed: [Firefox] JavaScript error when reloading the page where CKFinder is used as a popup.
+- Fixed: [IE, Chrome] Focus is lost after closing a dialog window.
+- Fixed: The startupPath option did not work.
+- Fixed: Unable to use CKFinder inside modal dialogs due to inability to properly destroy the previous instance.
+[PHP] - Fixed: When cookie contains an array, clicking the Upload button resulted in an error.
+[PHP] - Fixed: The Watermark plugin (and the AfterFileUpload hook) did not work.
+[PHP] - Fixed: Uploading files did not work when memory_limit was set to -1.
+
 ### Version 2.1
 - Added support for multiple uploads using the Flash component.
 - Improved rendering of thumbnails. Thumbnails are now loaded dynamically, only when the file is visible.