Skip to content

Commit

Permalink
[Composer]
Browse files Browse the repository at this point in the history
  • Loading branch information
gbeauvoir committed May 25, 2014
1 parent 995a3da commit 5f0ab01
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 1 deletion.
2 changes: 2 additions & 0 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public function registerBundles()
new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
new Symfony\Cmf\Bundle\RoutingBundle\CmfRoutingBundle(),
new Knp\Bundle\PaginatorBundle\KnpPaginatorBundle(),
new JMS\SerializerBundle\JMSSerializerBundle(),
new FOS\RestBundle\FOSRestBundle(),
new Majes\CoreBundle\MajesCoreBundle(),
new Majes\MediaBundle\MajesMediaBundle(),
new Majes\CmsBundle\MajesCmsBundle(),
Expand Down
11 changes: 11 additions & 0 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,14 @@ fos_elastica:
update: true
delete: true
is_indexable_callback: "isIndexable"

sensio_framework_extra:
view: { annotations: false }
router: { annotations: true }

fos_rest:
format_listener:
rules:
- prefer_extension: false
view:
view_response_listener: true
6 changes: 5 additions & 1 deletion app/var/db/db-mysql.sql
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ INSERT INTO `cms_attribute` (`id`, `title`, `ref`) VALUES
(3, 'Text', 'textarea'),
(4, 'Html editor', 'editor'),
(5, 'Link', 'link'),
(6, 'File', 'file');
(6, 'File', 'file'),
(7, 'Video', 'video'),
(7, 'Checkbox', 'checkbox');

-- --------------------------------------------------------

Expand Down Expand Up @@ -385,6 +387,8 @@ CREATE TABLE IF NOT EXISTS `core_language` (
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;

ALTER TABLE `core_language` ADD `host` VARCHAR(255) NULL DEFAULT NULL AFTER `name`;

--
-- Contenu de la table `core_language`
--
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
"doctrine/doctrine-migrations-bundle": "dev-master",
"friendsofsymfony/elastica-bundle": "3.0.*@dev",
"knplabs/knp-paginator-bundle": "dev-master",
"jms/serializer-bundle": "@stable",
"friendsofsymfony/rest-bundle": "@stable",
"guzzlehttp/guzzle": "~4.0",
"majes/social-bundle": "dev-master",
"majes/core-bundle": "dev-master",
"majes/media-bundle": "dev-master",
Expand Down

0 comments on commit 5f0ab01

Please sign in to comment.