Romain Neutron c641ab7841 Merge branch '3.8' ...

Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php

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

..

BasketController.php

Address PR comments

2014-02-19 17:29:27 +01:00

Bridge.php

Merge branch '3.8'

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

DoDownload.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Download.php

Remove User_Adapter

2014-02-19 17:28:53 +01:00

Edit.php

Fix unit tests

2014-02-19 17:29:26 +01:00

Export.php

Address PR comments

2014-02-19 17:29:27 +01:00

Feed.php

Fix merge

2014-02-19 17:29:27 +01:00

Language.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Lazaret.php

Fix CS

2014-02-26 12:44:32 +01:00

MoveCollection.php

Merge branch '3.8'

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

Order.php

Fix merge

2014-02-19 17:29:27 +01:00

Printer.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Property.php

Merge branch '3.8'

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

Push.php

Address PR comments

2014-02-19 17:29:27 +01:00

Query.php

Fix CS

2014-02-19 17:29:26 +01:00

Records.php

Add a namespace to Phraseanet doctrine entities

2014-02-18 19:32:08 +01:00

Root.php

Fix settings

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

Merge branch '3.8'

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

Tooltip.php

Remove User_Adapter

2014-02-19 17:28:53 +01: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

Address PR comments

2014-02-19 17:29:27 +01:00

WorkZone.php

Add a namespace to Phraseanet doctrine entities

2014-02-18 19:32:08 +01:00