Feature/vicms 581 behat reboot #91
Merged
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
added 15 commits
May 4, 2015 18:30
…ap.php into app/autoloader.php
…s parameters on the fly)
…rms in a same page.
…ds in VictoireContext
…VICMS-581-behat-reboot * commit 'b53e07b2a7eb7c1ffd945846f2ab23721c4f07bc': fix indentation corrrect locate parameters to get themes in widget if widget is override remove watch_view_cache and CS fix indentation kick watch_view_cache references remove obsolete ViewCacheListener refactor getViewsReferences to read the cache if already computed Use "asset()" rather than a direct call to file re-order style rules and re-implement rule for a different icon to widget style hover Changes in the setup file Indication of the following setup verification : APC enable in CLI mode Conflicts: Bundle/BlogBundle/Resources/views/Blog/_listItem.html.twig Bundle/CoreBundle/DataFixtures/Loader/VictoireYamlLoader.php Bundle/CoreBundle/DataFixtures/ORM/LoadFixtureData.php Bundle/CoreBundle/DependencyInjection/VictoireCoreExtension.php Bundle/CoreBundle/Form/WidgetType.php Bundle/WidgetBundle/Builder/WidgetFormBuilder.php Tests/Features/Context/SubContext/JavascriptSubContextTrait.php Tests/Functionnal/src/Acme/AppBundle/DependencyInjection/Configuration.php Tests/Functionnal/src/Victoire/Widget/AnakinBundle/Resources/config/config.yml Tests/Functionnal/src/Victoire/Widget/ForceBundle/Form/WidgetForceType.php Tests/Functionnal/src/Victoire/Widget/ForceBundle/Resources/views/show.html.twig
| /selenium-server-standalone-2.45.0.jar | ||
| /.idea |
There was a problem hiding this comment.
You can add this in your user specific ~/.gitignore_global
added 4 commits
May 12, 2015 16:17
* fix/VICMS-575-widget-delete: Fix delete and unlink process (redirection and issue with the confirm process) Conflicts: Bundle/WidgetBundle/Controller/WidgetController.php Tests/Features/Widget/delete.feature
added 3 commits
May 12, 2015 18:42
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.
[WIP] : Don't merge before travis becomes green again