Skip to content

Commit

Permalink
Merge pull request #166 from nayluge/feature/avent-2019
Browse files Browse the repository at this point in the history
feat(avent): add markdown support for 2019 articles
  • Loading branch information
Nek- authored Nov 25, 2019
2 parents 9b9c8ce + c94ef2b commit 282064e
Show file tree
Hide file tree
Showing 60 changed files with 500 additions and 132 deletions.
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"ext-iconv": "*",
"ext-json": "*",
"doctrine/doctrine-fixtures-bundle": "^3.2",
"erusev/parsedown": "^1.7",
"doctrine/doctrine-migrations-bundle": "^2.1",
"fpn/doctrine-extensions-taggable": "^0.9.0",
"fpn/tag-bundle": "dev-patch-1",
Expand Down Expand Up @@ -41,7 +42,9 @@
"symfony/web-link": "4.3.*",
"symfony/webpack-encore-bundle": "^1.6",
"symfony/yaml": "4.3.*",
"twig/extensions": "^1.5"
"twig/extensions": "^1.5",
"twig/extra-bundle": "^2.12",
"twig/markdown-extra": "^2.12"
},
"require-dev": {
"symfony/debug-pack": "*",
Expand Down
213 changes: 186 additions & 27 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@
Sonata\AdminBundle\SonataAdminBundle::class => ['all' => true],
Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle::class => ['all' => true],
HWI\Bundle\OAuthBundle\HWIOAuthBundle::class => ['all' => true],
Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
Http\HttplugBundle\HttplugBundle::class => ['all' => true],
];
4 changes: 4 additions & 0 deletions config/services.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ services:
resource: '../src/Controller'
tags: ['controller.service_arguments']

App\Controller\AventController:
tags: ['controller.service_arguments']
arguments: ['@twig', '%kernel.environment%']

FPN\TagBundle\Entity\TagManager:
alias: 'fpn_tag.tag_manager'

Expand Down
Loading

0 comments on commit 282064e

Please sign in to comment.