Skip to content
This repository has been archived by the owner on Sep 16, 2021. It is now read-only.

[WIP] Replacing symfony_cmf with cmf_ #140

Merged
merged 2 commits into from
May 30, 2013
Merged

Conversation

dantleech
Copy link
Member

No description provided.

@dbu
Copy link
Member

dbu commented May 13, 2013

be sure not to collide with a standards refactoring of @wouterj on this one

i guess for all the other open PR its just going to be collisions, can't avoid that

@dantleech
Copy link
Member Author

yeah, well everythings automated so I will make it so it always rebases on master before reapplying the changes. That should avoid the conflicts.

@@ -80,14 +80,14 @@ render the menu ``simple``, the menu root node must be stored at
<container xmlns="http://cmf.symfony.com/schema/dic/menu"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

<symfony-cmf-menu:config xmlns="http://cmf.symfony.com/schema/dic/menu">
<cmf-menu:config xmlns="http://cmf.symfony.com/schema/dic/menu">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're missing the namespace for this one

@wouterj
Copy link
Member

wouterj commented May 13, 2013

@dantleech so I can just submit some standard fixings this afternoon?

@dantleech
Copy link
Member Author

@wouterj yeah, carry on like this PR doesn't exist. Every time I update it it will be rebased on the current master

@dantleech
Copy link
Member Author

Reviewed automatic changes, seem OK.

@lsmith77
Copy link
Member

ready?

@dbu
Copy link
Member

dbu commented May 27, 2013

i would wait until the sandbox and SE are updated. and it would be cool if we can merge #104 first

this now needs a rebase or being recreated.

@@ -197,6 +197,6 @@ These properties can then be accessed in your controller or templates via the
``getExtras()`` or ``getExtra($key)`` methods.

.. _`SimpleCmsBundle`: https://github.com/symfony-cmf/SimpleCmsBundle#readme
.. _`Symfony CMF Standard Edition`: https://github.com/symfony-cmf/symfony-cmf-standard
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the other links here will need to be fixed manually when we are ready to merge.

@dantleech
Copy link
Member Author

Have updated the PR and reviewed, noting the things that need to be fixed manually. If you say we're good to merge I (or somebody if I'm not about) can push another commit with those fixes. I don't want to fix them now incase we end up merging other stuff and then have to rebase etc.

@lsmith77
Copy link
Member

+1 for a merge

@dbu
Copy link
Member

dbu commented May 30, 2013

i just merged #104 and i think you could also merge #148 (maybe with the clarification i ask/propose). then i would say just go for it: rebuild, fix manually and immediately merge. the other doc PR are old anyway - we really should then take an effort to finish them.

@dantleech
Copy link
Member Author

#148 is still waiting for its associated PR (which deps on the trans domain PR on SonataAdmin). I say ignore that one for now. I will rerun, merge and fix.

David Buchmann [email protected] a écrit :

i just merged #104
and i think you could also merge
#148 (maybe with
the clarification i ask/propose). then i would say just go for it:
rebuild, fix manually and immediately merge. the other doc PR are old
anyway - we really should then take an effort to finish them.


Reply to this email directly or view it on GitHub:
#140 (comment)

Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté.

dantleech added a commit that referenced this pull request May 30, 2013
@dantleech dantleech merged commit 24e50e5 into master May 30, 2013
@dantleech
Copy link
Member Author

ok.. done.

@dbu
Copy link
Member

dbu commented May 30, 2013

thanks a lot dan for the effort!

@wouterj wouterj deleted the drop_symfony_cmf_prefix branch August 5, 2013 07:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants