Romain Neutron 762f758705 Merge branch '3.8' ...

Conflicts:
	bower.json
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/eventsmanager/notify/feed.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php

2013-10-24 14:05:04 +02:00

..

Basket.php

Fix #1277 : Fix archive / unarchive basket route

2013-07-11 14:42:33 +02:00

Bridge.php

Add error pages, fix error handling and PHP conf

2013-06-17 17:01:35 +02:00

DoDownload.php

Bump to Symfony 2.4 and Silex 1.1

2013-08-26 10:09:28 +02:00

Download.php

Use url generator everywhere

2013-06-13 09:44:16 +02:00

Edit.php

Fix #1520 : Avoid fatal error while editing from multiple databoxes

2013-10-10 13:39:47 +02:00

Export.php

Remove unused use statements

2013-09-04 14:25:01 +02:00

Feed.php

Merge branch '3.8'

2013-10-24 14:05:04 +02:00

Language.php

Fix #1488 : Push / Feedback name is now mandatory

2013-10-10 13:39:07 +02:00

Lazaret.php

Remove dead code

2013-09-04 12:14:50 +02:00

MoveCollection.php

Use url generator everywhere

2013-06-13 09:44:16 +02:00

Order.php

Fix order

2013-08-27 12:17:20 +02:00

Printer.php

Use url generator everywhere

2013-06-13 09:44:16 +02:00

Property.php

Fix CS lib/Alchemy

2013-01-29 16:38:00 +01:00

Push.php

Fix #1488 : Push / Feedback name is now mandatory

2013-10-10 13:39:07 +02:00

Query.php

Move engine query log process from search engine classes to controllers

2013-08-25 13:55:04 +02:00

Records.php

Reverted unnecessary modification

2013-08-27 11:58:50 +02:00

Root.php

Fixed order in entry/update, fixed a lot of codestyle

2013-09-05 13:44:06 +02:00

Share.php

Update authentication to service provider

2013-05-29 14:22:51 +02:00

Story.php

Add error pages, fix error handling and PHP conf

2013-06-17 17:01:35 +02:00

Tools.php

Fix CS

2013-09-02 12:12:36 +02:00

Tooltip.php

Fix Phrasea engine caption display on tooltip

2013-07-09 14:04:20 +02:00

TOU.php

Add labels to databoxes

2013-06-13 09:45:43 +02:00

Upload.php

Adressed @romainneutron 's comments

2013-09-02 12:12:37 +02:00

UsrLists.php

Regenerate doctrine entities and proxies

2013-06-17 20:11:44 +02:00

WorkZone.php

Add error pages, fix error handling and PHP conf

2013-06-17 17:01:35 +02:00