Nicolas Le Goff ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer ...

Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css

2015-03-10 14:36:31 +01:00

..

AggregateToken.php

Substitute random string generator by Randomlib

2014-03-02 21:13:57 +01:00

ApiAccount.php

Add bi-directional reloationship for application to account & accout to tokens

2014-03-24 12:29:38 +01:00

ApiApplication.php

Add third party application webhook event

2014-06-23 17:48:42 +02:00

ApiLog.php

Add ApiLog Manipulator tests

2014-03-24 12:29:37 +01:00

ApiOauthCode.php

Store UNIX timestamp for token expiration

2014-03-24 12:29:39 +01:00

ApiOauthRefreshToken.php

Store UNIX timestamp for token expiration

2014-03-24 12:29:39 +01:00

ApiOauthToken.php

Fix CS

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

AuthFailure.php

Merge branch '3.8'

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

Basket.php

Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users

2014-02-20 18:02:27 +01:00

BasketElement.php

Address PR comments

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

ElasticsearchRecord.php

Refactor status display

2015-02-19 15:14:23 +01:00

Feed.php

Fix CS

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

FeedEntry.php

Delete references to usr.usr_id field in entities

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

FeedItem.php

Fix feed entry item order

2014-12-04 11:48:10 +01:00

FeedPublisher.php

Address PR comments

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

FeedToken.php

Substitute random string generator by Randomlib

2014-03-02 21:13:57 +01:00

FtpCredential.php

Address PR comments

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

FtpExport.php

Address PR comments

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

FtpExportElement.php

Bump copyright year

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

LazaretAttribute.php

Merge branch '3.8'

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

LazaretCheck.php

Merge branch '3.8'

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

LazaretFile.php

Merge branch '3.8'

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

LazaretSession.php

Address PR comments

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

Order.php

Address PR comments

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

OrderElement.php

Address PR comments

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

Preset.php

Transform thesaurus preset into doctrine Entity

2014-03-06 01:31:43 +01:00

Registration.php

Fix registration table name

2014-02-27 16:57:31 +01:00

Session.php

Substitute random string generator by Randomlib

2014-03-02 21:13:57 +01:00

SessionModule.php

Merge branch '3.8'

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

StoryWZ.php

Address PR comments

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

Task.php

Bump copyright year

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

Token.php

Fix CS

2014-03-23 23:07:01 +01:00

User.php

Refactor status display

2015-02-19 15:14:23 +01:00

UserNotificationSetting.php

Address PR comments

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

UserQuery.php

Address PR comments

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

UserSetting.php

Address PR comments

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

UsrAuthProvider.php

Address PR comments

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

UsrList.php

Fix CS

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

UsrListEntry.php

Address PR comments

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

UsrListOwner.php

Address PR comments

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

ValidationData.php

Merge branch '3.8'

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

ValidationParticipant.php

Multiple ORMs for all database

2015-02-12 17:58:45 +01:00

ValidationSession.php

Address comments

2014-02-20 16:09:18 +01:00

WebhookEvent.php

Fix CS

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

WebhookEventDelivery.php

Add third party application webhook event

2014-06-23 17:48:42 +02:00