Skip to content
Snippets Groups Projects
Commit bcc1de8e authored by Karl Hasselbring's avatar Karl Hasselbring
Browse files

Merge with development

parents d00ee859 fce7f0ab
No related branches found
No related tags found
2 merge requests!1356Development,!1350Resolve "CSS Dateien aufräumen/zusammenfassen/verallgemeinern/..."
Hide whitespace changes
Inline Side-by-side
app/Console/Kernel.php
+ 7
− 0
View file @ bcc1de8e
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace App\Console; namespace App\Console;
use DB;
use Illuminate\Console\Scheduling\Schedule; use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel; use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
...@@ -25,6 +26,12 @@ class Kernel extends ConsoleKernel ...@@ -25,6 +26,12 @@ class Kernel extends ConsoleKernel
protected function schedule(Schedule $schedule) protected function schedule(Schedule $schedule)
{ {
$schedule->command('log:rotate')->everyTenMinutes(); $schedule->command('log:rotate')->everyTenMinutes();
// Delete all of the old humanverification entries
$schedule->call(function() {
DB::delete('DELETE FROM humanverification WHERE updated_at < (now() - interval 72 hour) AND whitelist = 0 ORDER BY updated_at DESC');
DB::delete('DELETE FROM humanverification WHERE updated_at < (now() - interval 2 week) AND whitelist = 1 ORDER BY updated_at DESC');
})->everyThirtyMinutes();
} }
/** /**
......
resources/assets/less/metager/pages/resultpage/result-page.less
+ 18
− 9
View file @ bcc1de8e
...@@ -514,21 +514,30 @@ footer.resultPageFooter { ...@@ -514,21 +514,30 @@ footer.resultPageFooter {
grid-template-areas: "results"; grid-template-areas: "results";
} }
.metager3-unstable-warning-resultpage { .metager3-unstable-warning {
text-align: center; text-align: center;
position: fixed; position: fixed;
bottom: 0;
margin-bottom: 0px;
width: 100%; width: 100%;
padding: 15px;
@media (max-width: @screen-mobile) {
padding: 5px;
}
} }
.metager3-unstable-warning { .metager3-unstable-warning-static-pages {
text-align: center; .metager3-unstable-warning;
position: fixed;
top: 0; top: 0;
width: 100%; padding-right: 50px;
padding-right: 60px; @media (max-width: @screen-mobile) {
padding-left: 150px; padding: 5px;
padding-right: 50px;
}
}
.metager3-unstable-warning-resultpage {
.metager3-unstable-warning;
bottom: 0;
margin-bottom: 0px;
} }
/* Settings button and checkboxes */ /* Settings button and checkboxes */
......
resources/views/layouts/staticPages.blade.php
+ 1
− 1
View file @ bcc1de8e
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</head> </head>
<body> <body>
@if(Request::getHttpHost() === "metager3.de") @if(Request::getHttpHost() === "metager3.de")
<div class="alert alert-info metager3-unstable-warning"> <div class="alert alert-info metager3-unstable-warning-static-pages">
{!! @trans('resultPage.metager3') !!} {!! @trans('resultPage.metager3') !!}
</div> </div>
@endif @endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment