search

bricoleurs / bricolage

Content management and publishing system
http://www.bricolagecms.org/
111 stars 51 forks source link

ckeditor patch cleanup #18

Closed zdravko closed 12 years ago

zdravko commented 13 years ago

Here I must admit I am lost. This is my third commit. For this I have arranged to work on branch ckeditor-relateds. Strangely enough to git push everything is up-to-date.

Hope you'll figure out what's in here. Next commit will be again about bricolage-wysiwyg interface improvements. Only I'll wait for this pull request to close.

Zdravko

theory commented 13 years ago

Still not quite right, since the "added support for CKeditor" commit is still in there. And you're still on the master branch. But I'll figure it out.

zdravko commented 13 years ago

git status says:

On branch ckeditor-relateds

.... git log shows all three commits.

zdravko commented 13 years ago

commit: rewrite of the ckeditor support patch is missing from my fork. It's on the branch which I can see only localy.

zdravko commented 13 years ago

As Phillip asked me, here is a suggested fix to #212 in the commit above.

zdravko commented 13 years ago

This is to be completed bricolage-wysiwyg interface for linking related documents from CKEditor. CKEditor has greenish look, it feels like a native Bricolage editor.

Here are 4 commits. 1 and 3 have been pulled before. 2 and 4 are still pending. Sorry for the mess, this is my first. :) Should this pull request be closed once and for all?

The <%filter%> code is missing. I don't know where to put it. I'll post it in devel mail-list. Help needed.

phillipadsmith commented 12 years ago

Hey there Zdravko,

What's the status of this pull request? Does it need to be applied again?

theory commented 12 years ago

I think you can cherry-pick deb0cf46307fd2eb04db264d2276dae1a64c5e5a into all relevant branches, though it might be useful to allow the user to specify the JPEG quality. Do not merge e686bfd355aff5b1680047c75f4142d9bb1bc5f5, please.

zdravko commented 12 years ago

As theory said. I was to quick on this. If I only new how to un-pull this commit, before I trash my fork.

theory commented 12 years ago

I'll likely have go through the commits at some point and cherry-pick the appropriate stuff. Maybe I'll be free for the next hackathon…

zdravko commented 12 years ago

The above two commits fix a bug discussed on devel mailing list Re: ckeditor report on Nov 2, 2011.