Romain Neutron 12f9575a8b Merge branch '3.8' ...

Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig

2014-02-20 16:05:23 +01:00

..

320alpha1a.php

Merge branch '3.8'

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

320alpha1b.php

Merge branch '3.8'

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

320alpha2a.php

Merge branch '3.8'

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

320alpha3a.php

Merge branch '3.8'

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

320alpha4a.php

Merge branch '3.8'

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

320alpha4b.php

Merge branch '3.8'

2014-02-20 16:05:23 +01:00

320alpha5a.php

Merge branch '3.8'

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

320alpha6a.php

Merge branch '3.8'

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

320alpha8a.php

Merge branch '3.8'

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

360alpha1a.php

Merge branch '3.8'

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

360alpha1b.php

Merge branch '3.8'

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

360alpha2a.php

Merge branch '3.8'

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

360alpha2b.php

Merge branch '3.8'

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

361alpha1a.php

Add a namespace to Phraseanet doctrine entities

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

370alpha1a.php

Merge branch '3.8'

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

370alpha3a.php

Merge branch '3.8'

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

370alpha4a.php

Merge branch '3.8'

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

370alpha5a.php

Merge branch '3.8'

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

370alpha6a.php

Merge branch '3.8'

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

370alpha7a.php

Merge branch '3.8'

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

370alpha8a.php

Merge branch '3.8'

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

370alpha9a.php

Merge branch '3.8'

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

371alpha1a.php

Merge branch '3.8'

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

373alpha1a.php

Merge branch '3.8'

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

379alpha1a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha2a.php

Merge branch '3.8'

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

380alpha2b.php

Merge branch '3.8'

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

380alpha3a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha3b.php

Merge branch '3.8'

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

380alpha4a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha6a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha8a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha9a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha10a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha11a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha13a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha14a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha15a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha16a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha17a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

380alpha18a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

381alpha1b.php

Bump copyright year

2014-01-06 15:40:56 +01:00

381alpha2a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

381alpha3a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

381alpha4a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

383alpha1a.php

Add a namespace to Phraseanet doctrine entities

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

383alpha2a.php

Add a namespace to Phraseanet doctrine entities

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

383alpha3a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

383alpha4a.php

Merge branch '3.8'

2014-01-27 17:23:03 +01:00

383alpha5a.php

Use short array declarations

2014-02-11 18:44:31 +01:00

390alpha1a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

390alpha1b.php

Add a namespace to Phraseanet doctrine entities

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

390alpha2a.php

Add a namespace to Phraseanet doctrine entities

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

390alpha3a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

390alpha4a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

390alpha5a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

390alpha6a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

390alpha7a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

390alpha8a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

390alpha9a.php

Add a namespace to Phraseanet doctrine entities

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

390alpha10a.php

Bump copyright year

2014-01-06 15:40:56 +01:00

390alpha11a.php

Address PR comments

2014-02-15 12:05:05 +01:00

3715alpha1a.php

Bump copyright year

2014-01-06 15:40:56 +01:00