Mathieu Darse 5b24664001 Merge branch 'master' into elastic-indexer ...

Conflicts:
	bin/console

2014-10-15 12:18:44 +02:00

..

BasketController.php

Fix latest merge

2014-08-13 17:40:40 +02:00

Bridge.php

Merge branch '3.8'

2014-02-28 19:37:54 +01:00

DoDownload.php

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

Download.php

Convert custom events to symfony events

2014-09-09 21:21:38 +02:00

Edit.php

Merge branch '3.8' into fix-latest-merge

2014-07-11 17:19:39 +02:00

Export.php

Fix latest merge

2014-10-13 12:58:20 +02:00

Feed.php

Convert custom events to symfony events

2014-09-09 21:21:38 +02:00

Language.php

Merge branch '3.8'

2014-06-17 15:30:41 +02:00

Lazaret.php

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

MoveCollection.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

Order.php

Set User_Query object as a service

2014-09-09 21:21:38 +02:00

Printer.php

Fix PDF generation for print

2014-08-19 11:43:16 +02:00

Property.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

Push.php

Set User_Query object as a service

2014-09-09 21:21:38 +02:00

Query.php

Fix PHRAS-322, add result debug informations (aggregations)

2014-10-14 18:51:02 +02:00

Records.php

Fix CS

2014-07-17 15:17:04 +02:00

Root.php

Add possibility to restrict aggregated feeds to a set of feeds

2014-03-21 17:52:12 +01:00

Share.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

Story.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

Tools.php

Update directory structure & allow to configure paths (tmp, log, cache)

2014-09-05 15:57:00 +02:00

Tooltip.php

Fix CS

2014-07-17 15:17:04 +02:00

TOU.php

Fix CS

2014-02-11 16:27:47 +01:00

Upload.php

Oups, debug code

2014-10-13 19:17:53 +02:00

UsrLists.php

Add feed-publisher repository as a service

2014-02-28 20:02:23 +01:00

WorkZone.php

Add story-wz repository as a service

2014-02-28 20:01:58 +01:00