Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop

* 'develop' of https://github.com/JC5/firefly-iii:
  Fix a bug where the frontpage would not honor transaction order.
  Fix a bug where the report page would mess up the session dates.
This commit is contained in:
James Cole
2015-12-22 20:46:52 +01:00
3 changed files with 20 additions and 9 deletions

View File

@@ -95,16 +95,16 @@
<li>
<a href="{{ route('reports.report',
['default',
Session.get('start').startOfMonth.format('Ymd'),
Session.get('start').endOfMonth.format('Ymd'),
startOfMonth.format('Ymd'),
endOfMonth.format('Ymd'),
accountList
]) }}">{{ 'report_this_month_quick'|_ }}</a>
</li>
<li>
<a href="{{ route('reports.report',
['default',
Session.get('start').startOfYear.format('Ymd'),
Session.get('start').endOfYear.format('Ymd'),
startOfYear.format('Ymd'),
endOfYear.format('Ymd'),
accountList
]) }}">{{ 'report_this_year_quick'|_ }}</a>
</li>
@@ -112,7 +112,7 @@
<a href="{{ route('reports.report',
['default',
start.format('Ymd'),
Session.get('end').endOfMonth.format('Ymd'),
endOfMonth.format('Ymd'),
accountList
]) }}">{{ 'report_all_time_quick'|_ }}</a>
</li>