miguel456
/
rbrecruiter
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases 2 Wiki Activity

WIP: Road to 1.0.0 #1

Draft
miguel456 wants to merge 123 commits from develop into master
pull from: develop
merge into: miguel456:master
Conversation 1 Commits 123 Files Changed 586 +12 -8
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e6f84cd09a - Show all commits

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -81,6 +81,7 @@ class LoginController extends Controller
public function authenticated(Request $request, User $user) public function authenticated(Request $request, User $user)
{ {
if (!config('demo.is_enabled')) {
if ($user->originalIP !== $request->ip()) if ($user->originalIP !== $request->ip())
{ {
Log::alert('User IP address changed from last login. Updating.', [ Log::alert('User IP address changed from last login. Updating.', [
@ -91,4 +92,5 @@ class LoginController extends Controller
$user->save(); $user->save();
} }
} }
}
} }

2
webpack.mix.js vendored
View File

@ -1,3 +1,5 @@
let mix = require('laravel-mix');
mix.js(['resources/js/app.js', 'resources/js/application_charts.js', 'resources/js/calendar.js'], 'public/js') mix.js(['resources/js/app.js', 'resources/js/application_charts.js', 'resources/js/calendar.js'], 'public/js')
.sass('resources/sass/app.scss', 'public/css'); .sass('resources/sass/app.scss', 'public/css');