-
Notifications
You must be signed in to change notification settings - Fork 70
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/circleci #423
Merged
paulandrieux
merged 117 commits into
Victoire:master
from
paulandrieux:feature/circleci
May 18, 2016
Merged
Feature/circleci #423
paulandrieux
merged 117 commits into
Victoire:master
from
paulandrieux:feature/circleci
May 18, 2016
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…xception to ask for at least one instance
…o fix media upload)
refactor Media create.html.twig to correctly render FileHelperType (t…
apply media fix in modal upload too
…ooser-and-generation-of-multiple-view-ref-for-same-be-when-edit Bugfix/1.5 blog chooser and generation of multiple view ref for same be when edit
…s a template that extend another one (Victoire#395)
…custom-sensibility-for-widget-cache use a widget method to generate widget cacheId
…the-business-page-associated-to-an-article update the name and slug page when an article is edited
…dReferenceByView-to-directly-find-with-id directly find the reference withe the viewrefId
…to-use-directly-the-entity-id-to-find-a-business-page allow to pass directly the entity id in find BP method in BusinessPag…
…ut views in PageHelper
…e view override in app/Resources
…ler to avoid circular reference
Conflicts: Bundle/BusinessEntityBundle/Exception/MissingBusinessEntityInstanceException.php Bundle/WidgetBundle/Entity/Widget.php Bundle/WidgetBundle/Renderer/WidgetRenderer.php Tests/Features/Widget/edit.feature
use ubuntu as mysql user fix raw_post_data issue use a script to benefit behat parralelism enable parralelism use intalled php version make fails an artifact folder use composer cache use behat junit results do not erase junit report
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.