[backported] Fixes INP-1617 - Implement inline editing in CKEditor
rINP16409
Actions

Description

[backported] Fixes INP-1617 - Implement inline editing in CKEditor

Conflicts:

core/admin_templates/js/template_manager.js
core/kernel/db/db_tag_processor.php
core/units/content/content_eh.php

Details

Committed

alex	Nov 13 2016, 1:43 PM

Parents

rINP16408: [backported] Fixes INP-1618 - Append new column to the grid at designated…
rINP15949: Bug INP-1309 - Implement inline editing
rINP15946: Fixes INP-1309 - Implement inline editing

Branches

Unknown

Tags

Unknown

Build Status

Buildable 501
Build 501: After New Commit (Harbormaster Build Plan)

Event Timeline

alex committed rINP16409: [backported] Fixes INP-1617 - Implement inline editing in CKEditor.Nov 13 2016, 1:43 PM

Harbormaster completed building B501: rINP16409: [backported] Fixes INP-1617 - Implement inline editing in CKEditor.Nov 13 2016, 1:43 PM

Build #74 finished with UNSTABLE status: http://ci.in-portal.org/job/in-portal-52x/74/

Checkstyle Warnings: 86

Changes (29)

		Path
M	(dir)	in-portal/branches/5.2.x/
M		in-portal/branches/5.2.x/.htaccess
M		in-portal/branches/5.2.x/COPYRIGHT
M		in-portal/branches/5.2.x/CREDITS
M		in-portal/branches/5.2.x/INSTALL
M		in-portal/branches/5.2.x/LICENSE
M		in-portal/branches/5.2.x/LICENSES
M		in-portal/branches/5.2.x/README
M		in-portal/branches/5.2.x/admin/system_presets/simple/inp_ckconfig.js
M		in-portal/branches/5.2.x/core/admin_templates/categories/edit_content.tpl
P		in-portal/branches/5.2.x/core/admin_templates/img/top_frame/icons/saving_indicator.gif Copied from in-portal/branches/5.3.x/core/admin_templates/img/top_frame/icons/saving_indicator.gif
M		in-portal/branches/5.2.x/core/admin_templates/incs/cms.css
M		in-portal/branches/5.2.x/core/admin_templates/js/inp_ckconfig.js
M		in-portal/branches/5.2.x/core/admin_templates/js/template_manager.js
M		in-portal/branches/5.2.x/core/ckeditor/ckeditor_php5.php
P		in-portal/branches/5.2.x/core/ckeditor/plugins/my_document/images/document.png Copied from in-portal/branches/5.3.x/core/ckeditor/plugins/my_document/images/document.png
M		in-portal/branches/5.2.x/core/ckeditor/plugins/my_document/plugin.js
P	(dir)	in-portal/branches/5.2.x/core/ckeditor/plugins/my_inline/ Copied from in-portal/branches/5.3.x/core/ckeditor/plugins/my_inline
P	(dir)	in-portal/branches/5.2.x/core/ckeditor/plugins/my_inline/images/ Copied from in-portal/branches/5.3.x/core/ckeditor/plugins/my_inline/images
P		in-portal/branches/5.2.x/core/ckeditor/plugins/my_inline/images/cancel.png Copied from in-portal/branches/5.3.x/core/ckeditor/plugins/my_inline/images/cancel.png
P		in-portal/branches/5.2.x/core/ckeditor/plugins/my_inline/plugin.js Copied from in-portal/branches/5.3.x/core/ckeditor/plugins/my_inline/plugin.js
M		in-portal/branches/5.2.x/core/install/english.lang
M		in-portal/branches/5.2.x/core/kernel/db/db_tag_processor.php
M		in-portal/branches/5.2.x/core/units/categories/categories_tag_processor.php
M		in-portal/branches/5.2.x/core/units/content/content_eh.php
M		in-portal/branches/5.2.x/core/units/helpers/fck_helper.php
M		in-portal/branches/5.2.x/core/units/helpers/page_helper.php
M		in-portal/branches/5.2.x/index.php
M		in-portal/branches/5.2.x/robots.txt