diff --git a/.gitignore b/.gitignore index 505a9f8f9b3b..955906ddce9d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ /public/logo /public/build /public/packages +/public/vendor /bootstrap/compiled.php /bootstrap/environment.php /vendor diff --git a/app/controllers/ReportController.php b/app/controllers/ReportController.php index 9428a47b11a8..7f0e95c25dfa 100755 --- a/app/controllers/ReportController.php +++ b/app/controllers/ReportController.php @@ -19,7 +19,7 @@ class ReportController extends \BaseController { $endDate = Utils::today(false); } - $padding = $groupBy == 'DAYOFYEAR' ? 'day' : ($groupBy == 'WEEK' ? 'week' : 'month'); + $padding = $groupBy == 'DAYOFYEAR' ? 'day' : ($groupBy == 'WEEK' ? 'week' : 'month'); $endDate->modify('+1 '.$padding); $datasets = []; $labels = []; diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index 896c155262d0..6bf89a1c6213 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -349,5 +349,4 @@ return array( 'specify_colors_label' => 'Select the colors used in the invoice', - ); diff --git a/app/views/public/splash.blade.php b/app/views/public/splash.blade.php index 575cff5195ca..2c02f3b22d95 100755 --- a/app/views/public/splash.blade.php +++ b/app/views/public/splash.blade.php @@ -90,6 +90,7 @@ +

No signup needed

diff --git a/app/views/reports/report_builder.blade.php b/app/views/reports/report_builder.blade.php index 3cc3e8221b97..523a1e047c13 100755 --- a/app/views/reports/report_builder.blade.php +++ b/app/views/reports/report_builder.blade.php @@ -3,7 +3,7 @@ @section('head') @parent - + @stop @section('content')