mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-23 20:00:33 -04:00
Text changes
This commit is contained in:
parent
c2998b888c
commit
c5f725fe17
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,6 +7,7 @@
|
|||||||
/public/logo
|
/public/logo
|
||||||
/public/build
|
/public/build
|
||||||
/public/packages
|
/public/packages
|
||||||
|
/public/vendor
|
||||||
/bootstrap/compiled.php
|
/bootstrap/compiled.php
|
||||||
/bootstrap/environment.php
|
/bootstrap/environment.php
|
||||||
/vendor
|
/vendor
|
||||||
|
@ -19,7 +19,7 @@ class ReportController extends \BaseController {
|
|||||||
$endDate = Utils::today(false);
|
$endDate = Utils::today(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
$padding = $groupBy == 'DAYOFYEAR' ? 'day' : ($groupBy == 'WEEK' ? 'week' : 'month');
|
$padding = $groupBy == 'DAYOFYEAR' ? 'day' : ($groupBy == 'WEEK' ? 'week' : 'month');
|
||||||
$endDate->modify('+1 '.$padding);
|
$endDate->modify('+1 '.$padding);
|
||||||
$datasets = [];
|
$datasets = [];
|
||||||
$labels = [];
|
$labels = [];
|
||||||
|
@ -349,5 +349,4 @@ return array(
|
|||||||
'specify_colors_label' => 'Select the colors used in the invoice',
|
'specify_colors_label' => 'Select the colors used in the invoice',
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
||||||
|
@ -90,6 +90,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<!-- <p>or {{ link_to('features', 'View Our Features' ) }}</a></p> -->
|
<!-- <p>or {{ link_to('features', 'View Our Features' ) }}</a></p> -->
|
||||||
|
<p><i>No signup needed</i></p>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-7">
|
<div class="col-md-7">
|
||||||
<img src="{{ asset('images/devices.png') }}">
|
<img src="{{ asset('images/devices.png') }}">
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
@section('head')
|
@section('head')
|
||||||
@parent
|
@parent
|
||||||
|
|
||||||
<script src="{{ asset('js/chart.js') }}" type="text/javascript"></script>
|
<script src="{{ asset('js/Chart.js') }}" type="text/javascript"></script>
|
||||||
@stop
|
@stop
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user