Mathieu Darse 63eaaf1596 Merge remote-tracking branch 'upstream/master' into elastic-indexer ...

Conflicts:
	composer.lock
	www/scripts/apps/admin/main/app.js

2015-03-10 15:25:20 +01:00

..

AggregateToken.php

Substitute random string generator by Randomlib

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

ApiAccount.php

Set default value

2015-03-06 12:35:18 +01:00

ApiApplication.php

Fix strict mode sql issue

2015-03-06 12:35:18 +01: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

Set default value

2015-03-06 12:35:18 +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

Set default value

2015-03-06 12:35:18 +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

Set default value

2015-03-06 12:35:18 +01:00

FeedToken.php

Substitute random string generator by Randomlib

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

FtpCredential.php

Set default value

2015-03-06 12:35:18 +01:00

FtpExport.php

Set default value

2015-03-06 12:35:18 +01:00

FtpExportElement.php

Set default value

2015-03-06 12:35:18 +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

Set default value

2015-03-06 12:35:18 +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

Set default value

2015-03-06 12:35:18 +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

Set default value

2015-03-06 12:35:18 +01:00

Token.php

Fix strict mode sql issue

2015-03-06 12:35:18 +01:00

User.php

Merge remote-tracking branch 'upstream/master' into elastic-indexer

2015-03-10 15:25:20 +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

Set default value

2015-03-06 12:35:18 +01:00

ValidationSession.php

Address comments

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

WebhookEvent.php

Set default value

2015-03-06 12:35:18 +01:00

WebhookEventDelivery.php

Set default value

2015-03-06 12:35:18 +01:00