Nicolas Le Goff 81763db182 Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Helper/Record/Helper.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/caption/record.php
	lib/classes/registry.php
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php

2014-08-19 12:17:18 +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

Fix latest merge

2014-06-19 16:11:27 +02:00

Download.php

Add token entities

2014-03-05 15:27:43 +01:00

Edit.php

Merge branch '3.8' into fix-latest-merge

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

Export.php

Merge branch '3.8' into fix-latest-merge

2014-08-11 20:28:03 +02:00

Feed.php

Fix latest merge

2014-06-24 14:56:09 +02:00

Language.php

Merge branch '3.8'

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

Lazaret.php

Fix unit tests

2014-03-01 14:37:56 +01:00

MoveCollection.php

Merge branch '3.8'

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

Order.php

Merge branch '3.8'

2014-08-19 12:17:18 +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

Fix CS

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

Query.php

Fix CS

2014-02-19 17:29:26 +01: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

Allow to rotate thumbnails on all type of records

2014-08-19 11:45:19 +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

Delete references to usr.usr_id field in entities

2014-02-19 17:29:25 +01: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