E.Alamo f44cbe23b9 Fix merge conflict

2018-05-27 16:25:28 +02:00

..

AuthClient

set username = email when authenticating with Google/Facebook/LinkdeIn #130

2018-04-16 11:40:21 +02:00

Command

Close #55 add google captcha mechanism

2017-10-15 22:11:35 +02:00

Component

patch #166

2018-03-13 22:31:49 +07:00

Contracts

update php code standards fixer rules

2017-07-15 16:45:25 +02:00

Controller

Fix merge with upstream

2018-05-27 07:09:02 +02:00

Event

Fix merge with upstream

2018-05-27 07:09:02 +02:00

Factory

Fix wrong email on email change confirmation message, #122

2017-12-01 15:27:21 +01:00

Filter

Merge remote-tracking branch 'upstream/master' into password_expiration

2018-01-30 22:16:03 +01:00

Form

Add default value for gdpr

2018-05-27 16:25:08 +02:00

Helper

Close #109 provide better error classes + phpdoc fixes

2017-11-12 23:13:42 +01:00

Migration

Fix merge with upstream

2018-05-27 07:09:02 +02:00

Model

Fix merge conflict

2018-05-27 16:25:28 +02:00

Query

#115 Convert client_id to string because pgsql fail with type convertion string <> int

2017-11-18 23:42:42 +03:00

resources

Fix merge with upstream

2018-05-27 07:09:02 +02:00

Search

Add last-login-ip capture capability (#184)

2018-05-16 15:29:08 +02:00

Service

Add last-login-ip capture capability (#184)

2018-05-16 15:29:08 +02:00

Strategy

update message translations + spanish file

2017-10-15 14:11:53 +02:00

Traits

Close #109 provide better error classes + phpdoc fixes

2017-11-12 23:13:42 +01:00

Validator

Close #109 provide better error classes + phpdoc fixes

2017-11-12 23:13:42 +01:00

Widget

Fix #139

2018-02-08 08:23:21 +01:00

Bootstrap.php

Fix merge with upstream

2018-05-27 07:09:02 +02:00

Module.php

Fix merge with upstream

2018-05-27 07:09:02 +02:00