IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/3.5.6.1'

Browse Source
This commit is contained in:
James Cole 2015-12-28 16:53:45 +01:00
commit 919a35aed3
4 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Events/JournalDeleted.php
View File

@ -1,25 +0,0 @@
<?php namespace FireflyIII\Events;
use Illuminate\Queue\SerializesModels;
/**
* Class JournalDeleted
*
* @codeCoverageIgnore
* @package FireflyIII\Events
*/
class JournalDeleted extends Event
{
use SerializesModels;
/**
* Create a new event instance.
*
*/
public function __construct()
{
//
}
}

2
app/Repositories/Journal/JournalRepository.php
View File

@ -174,7 +174,7 @@ class JournalRepository implements JournalRepositoryInterface
[
'user_id' => $data['user'],
'transaction_type_id' => $transactionType->id,
'amount_currency_id_amount' => $data['amount_currency_id_amount'],
'transaction_currency_id' => $data['amount_currency_id_amount'],
'description' => $data['description'],
'completed' => 0,
'date' => $data['date'],

1
composer.json
View File

@ -22,7 +22,6 @@
"require": {
"laravel/framework": "5.1.*",
"davejamesmiller/laravel-breadcrumbs": "~3.0",
"grumpydictator/gchart": "~1",
"watson/validating": "~1.0",
"doctrine/dbal": "~2.5",
"illuminate/html": "~5.0",

2
config/firefly.php
View File

@ -2,7 +2,7 @@
return [
'chart' => 'chartjs',
'version' => '3.5.6',
'version' => '3.5.6.1',
'index_periods' => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
'budget_periods' => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
'csv_import_enabled' => true,