Skip to content

Commit

Permalink
Merge pull request #45 from oc-shopaholic/develop
Browse files Browse the repository at this point in the history
Release version 1.8.1
  • Loading branch information
kharanenka authored Mar 26, 2020
2 parents a856476 + 72e5a11 commit ee3efcf
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
14 changes: 5 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,22 @@
language: php

os: linux

cache:
directories:
- $HOME/.composer/cache/files

php:
- 7.0
- 7.1
- nightly
- 7.2
- 7.3
- 7.4

services:
- mysql

before_install:
- mysql -e 'CREATE DATABASE test CHARACTER SET utf8 COLLATE utf8_general_ci;'

matrix:
allow_failures:
- php: nightly

sudo: false

install:
- if [[ "$BUILD" != true ]]; then
composer require satooshi/php-coveralls:~0.6@stable;
Expand Down
2 changes: 1 addition & 1 deletion classes/AuthHelperManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function login(Authenticatable $obUser, $bRemember = false)
Session::put($this->sessionKey, $toPersist);

if ($bRemember) {
Cookie::queue(Cookie::forever($this->sessionKey, $toPersist));
Cookie::queue(Cookie::forever($this->sessionKey, json_encode($toPersist)));
}

//Fire the 'afterLogin' event
Expand Down
2 changes: 2 additions & 0 deletions models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class User extends UserModel
'email' => 'required|email|unique:lovata_buddies_users|max:255',
'password' => 'required:create|max:255|confirmed',
'password_confirmation' => 'required_with:password|max:255',
'avatar' => 'image|nullable',
];
public $attributeNames = [
'email' => 'lovata.toolbox::lang.field.email',
Expand All @@ -97,6 +98,7 @@ class User extends UserModel
'middle_name',
'phone',
'phone_list',
'avatar',
'property',
];

Expand Down
4 changes: 3 additions & 1 deletion updates/version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,6 @@
1.7.2:
- 'Fixed login method, after updating OctoberCMS v1.0.455'
1.8.0:
- 'Added lovata.buddies.before.login, lovata.buddies.after.login, lovata.buddies.logout events'
- 'Added lovata.buddies.before.login, lovata.buddies.after.login, lovata.buddies.logout events'
1.8.1:
- 'Added avatar field to fillable array in User model.'

0 comments on commit ee3efcf

Please sign in to comment.