Skip to content

Commit

Permalink
Merge branch 't/12817'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Jan 15, 2015
2 parents 89e2c9b + ffb9e58 commit 9aa583c
Show file tree
Hide file tree
Showing 3,978 changed files with 4,069 additions and 4,069 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion LICENSE.md
Expand Up @@ -2,7 +2,7 @@ Software License Agreement
==========================

CKEditor - The text editor for Internet - http://ckeditor.com
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.

Licensed under the terms of any of the following licenses at your
choice:
Expand Down
4 changes: 2 additions & 2 deletions adapters/jquery.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down Expand Up @@ -371,4 +371,4 @@
};
} );
}
} )( window.jQuery );
} )( window.jQuery );
2 changes: 1 addition & 1 deletion ckeditor.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion config.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
4 changes: 2 additions & 2 deletions contents.css
@@ -1,5 +1,5 @@
/*
Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down Expand Up @@ -131,4 +131,4 @@ a > img {
margin: 1px;
border: none;
outline: 1px solid #0782C1;
}
}
2 changes: 1 addition & 1 deletion core/_bootstrap.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/ckeditor.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/ckeditor_base.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/ckeditor_basic.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/command.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/commanddefinition.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/config.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/creators/inline.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/creators/themedui.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dataprocessor.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/comment.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/document.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/documentfragment.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/domobject.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/element.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/elementpath.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/event.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/iterator.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/node.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/nodelist.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/range.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/rangelist.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/text.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/walker.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dom/window.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/dtd.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
4 changes: 2 additions & 2 deletions core/editable.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down Expand Up @@ -2271,4 +2271,4 @@
* @param {String} data.dialog The dialog window to be opened. If set by the listener,
* the specified dialog window will be opened.
* @member CKEDITOR.editor
*/
*/
4 changes: 2 additions & 2 deletions core/editor.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down Expand Up @@ -1799,4 +1799,4 @@ CKEDITOR.ELEMENT_MODE_INLINE = 3;
* @since 4.3
* @event contentDomInvalidated
* @param {CKEDITOR.editor} editor This editor instance.
*/
*/
2 changes: 1 addition & 1 deletion core/editor_basic.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/env.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/event.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/eventInfo.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/filter.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/focusmanager.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/htmldataprocessor.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/htmlparser.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/htmlparser/basicwriter.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/htmlparser/cdata.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/htmlparser/comment.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/htmlparser/element.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
4 changes: 2 additions & 2 deletions core/htmlparser/filter.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down Expand Up @@ -404,4 +404,4 @@
/**
* @class CKEDITOR.htmlParser.filterRulesDefinition
* @abstract
*/
*/
2 changes: 1 addition & 1 deletion core/htmlparser/fragment.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/htmlparser/node.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/htmlparser/text.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down
2 changes: 1 addition & 1 deletion core/keystrokehandler.js
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/

Expand Down

0 comments on commit 9aa583c

Please sign in to comment.