-
Notifications
You must be signed in to change notification settings - Fork 157
Conversation
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 |
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"> |
There was a problem hiding this comment.
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
@dantleech so I can just submit some standard fixings this afternoon? |
@wouterj yeah, carry on like this PR doesn't exist. Every time I update it it will be rebased on the current master |
Reviewed automatic changes, seem OK. |
ready? |
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 |
There was a problem hiding this comment.
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.
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. |
+1 for a merge |
#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 :
Envoyé de mon téléphone Android avec K-9 Mail. Excusez la brièveté. |
[WIP] Replacing symfony_cmf with cmf_
ok.. done. |
thanks a lot dan for the effort! |
No description provided.