Pull requests

#1 Open
Repository
lietu/NordCms-lietu NordCms-lietu
Branch
default
Repository
crisu83/NordCms NordCms
Branch
default

tinymce, block in a block

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update 
hg pull -r default https://bitbucket.org/lietu/nordcms-lietu
Author
  1. Janne Enberg
Reviewers
Description

Added tinymce WYSIWYG editor Added support for rendering blocks recursively, and clean handling and detection of infinite recursion Added check for only rendering published blocks

  • Learn about pull requests

Comments (1)

  1. Christoffer Niska repo owner

    Hey Janne,

    Would it be possible to separate this into two different pull requests? Also, would it be possible to have these changes as named branches? Thank you in advance.