Commit graph

24 commits

Author SHA1 Message Date
Jeremy Mikola 3fb9aaa56a Rename FOQ namespaces and services to FOS 2013-03-27 13:44:06 -04:00
Jeremy Mikola 4e11e20071 Merge branch '2.0'
Conflicts:
	.travis.yml
	composer.json
2013-03-15 15:24:43 -04:00
Jeremy Mikola fb73ded604 Replace minimum-stability with ODM dev requirements 2013-03-15 15:15:26 -04:00
Vyacheslav Salakhutdinov e9be67d59b Updated dev deps 2013-01-25 14:59:24 +04:00
NicolasBadey ab84d89eb7 rebase upstream 2012-12-05 17:28:34 +01:00
daFish e6bfda8e80 Added support for Symfony 2.2 to composer.json 2012-11-18 20:30:51 +01:00
Nicolas Badey 1f2fd479e3 Update composer.json
new version fix some issues ( _count with query filtered )
2012-08-30 12:41:32 +03:00
Chris Tickner fcb9e8f2f5 Updated the DoctrineMongoDBBundle service IDs
The service IDs for the DoctrineMongoDBBundle have changed for version 2.1.  This is an update to reflect that change.

https://github.com/doctrine/DoctrineMongoDBBundle/pull/134
2012-08-15 08:45:43 -03:00
Richard Miller c7e0e88ece Merge branch '2.0'
Conflicts:
	composer.json
2012-07-10 22:50:04 +01:00
Richard Miller 60d3ef69f3 Specified specific Elastica version in composer.json 2012-07-10 22:48:40 +01:00
Richard Miller 2732296aed Merge branch '2.0'
Conflicts:
	Doctrine/AbstractElasticaToModelTransformer.php
	Doctrine/MongoDB/ElasticaToModelTransformer.php
	Doctrine/ORM/ElasticaToModelTransformer.php
	composer.json
2012-07-10 21:37:23 +01:00
Richard Miller cc410cb804 Added require-dev section to composer.json 2012-07-10 21:29:18 +01:00
Richard Miller e37d22c220 Added minimum-stability to composer.json 2012-07-08 14:22:39 +01:00
Francisco Facioni d5778bda4b Added composer dependency to symfony/form 2012-05-21 15:00:56 -03:00
Richard Miller f9cab6e48d Update Elastica version required in composer.json
Conflicts:

	composer.json
2012-05-04 12:22:12 +01:00
Richard Miller 123816795a Update Elastica version required in composer.json 2012-05-02 10:08:48 +02:00
Jeremy Mikola c3391d957a Add suggested Doctrine and Propel deps for test suite coverage 2012-04-10 17:51:02 -04:00
Jeremy Mikola 22789c1b01 Add suggested Doctrine and Propel deps for test suite coverage 2012-04-10 14:35:08 -04:00
Jeremy Mikola 02f162fd79 Update Elastica dependency for Resetter changes
Resetter depends on Elastica_Type::delete(), which was a recent addition to Elastica. See: af6c92b92e5374f92323a65cb6ea957b74fcb1dd
2012-03-12 12:08:53 -04:00
Richard Miller 41f18a47af Merge branch '2.0'
Conflicts:
	composer.json
2012-03-07 10:20:24 +00:00
Richard Miller 1f8993557b Added symfony/console to composer.json 2012-03-07 10:18:25 +00:00
Jeremy Mikola ebeff1aae4 Update composer.json to require Symfony 2.1 2012-03-03 22:48:22 -05:00
Jeremy Mikola 62c410f464 Revise composer.json and require Symfony 2.0 explicitly 2012-03-03 22:46:34 -05:00
daFish 67d44a767d Add composer support. 2012-03-03 22:34:16 -05:00