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

block: classes checked + added sonata prepended config #282

Merged
merged 5 commits into from
Oct 5, 2013
Merged

Conversation

rmsint
Copy link
Contributor

@rmsint rmsint commented Oct 1, 2013

Q A
Doc fix? yes
New docs? yes
Applies to all
Fixed tickets part of #262
  • classes
  • examples
  • standards
  • text
  • cache chapter
  • configuration reference

@rmsint
Copy link
Contributor Author

rmsint commented Oct 1, 2013

Checked the classes and did some other updates. Also added the section back about the prepended SonataBlockBundle config. Next Friday will be the first moment again I have access to a computer so feel free to proceed the PR.

@dbu
Copy link
Member

dbu commented Oct 1, 2013

i will pick this one up

@ghost ghost assigned dbu Oct 1, 2013
@@ -116,6 +116,29 @@ change features of one or more Admin instances. Read more about
),
));

.. _bundle-block-updated-sonata-defaults:

Updated SonataBlockBundle defaults
Copy link
Member

Choose a reason for hiding this comment

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

Defaults

@dbu
Copy link
Member

dbu commented Oct 2, 2013

okay, all ready for review

@lsmith77
Copy link
Member

lsmith77 commented Oct 2, 2013

seems to need a rebase


* ``block_id``
* ``updated_at``

.. note::
.. warning::
Copy link
Member

Choose a reason for hiding this comment

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

use caution

@dbu
Copy link
Member

dbu commented Oct 2, 2013

okay, rebased and all updated. imho good to merge, wating for final feedback.

the conflict was that lukas added the config change i did on BlockBundle in master dfa295a and i did it in this branch.

dbu added a commit that referenced this pull request Oct 5, 2013
block: classes checked + added sonata prepended config
@dbu dbu merged commit 3c46ef0 into master Oct 5, 2013
@dbu dbu deleted the block-bundle branch October 5, 2013 09:32
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