Skip to content
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/blog #48

Merged
merged 17 commits into from
Mar 3, 2015
Merged

Feature/blog #48

merged 17 commits into from
Mar 3, 2015

Conversation

Charlie-Lucas
Copy link
Contributor

No description provided.

Charlie added 17 commits March 2, 2015 18:44
* master:
  Add data-refreshOnChange="true" to form choice type to refresh forms (read comments in form.js for more details)
  Introduce AnalyticsViewHelper and getMostVisited query
  new brick 'input-kaede' & its implementation into login page
  Fix browse event tracking
  surprise ! new layout for the login page & new canvas animation in the background !
  Better indentation generation for Form widget
  Add render_hinclude in test project and add Route to the autoloader
  Scrutinizer Auto-Fixes
  Add scrutinizer score
  Scrutinizer Auto-Fixes
  Scrutinizer Auto-Fixes
  Scrutinizer Auto-Fixes

Conflicts:
	Bundle/BlogBundle/Controller/BlogController.php
	Bundle/BlogBundle/Form/BlogSettingsType.php
* master:
  Fix some documentation
  Introduce Blog dateFilter
  change constellation color

Conflicts:
	Bundle/BlogBundle/Resources/translations/victoire.fr.xliff
lenybernard pushed a commit that referenced this pull request Mar 3, 2015
@lenybernard lenybernard merged commit c1ca904 into master Mar 3, 2015
@lenybernard lenybernard deleted the feature/blog branch March 3, 2015 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants