diff --git a/app/Export/Collector/AttachmentCollector.php b/app/Export/Collector/AttachmentCollector.php index 443aa187f6..9ae2410339 100644 --- a/app/Export/Collector/AttachmentCollector.php +++ b/app/Export/Collector/AttachmentCollector.php @@ -96,4 +96,4 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface $this->explanationString .= $string; } -} \ No newline at end of file +} diff --git a/app/Export/Collector/BasicCollector.php b/app/Export/Collector/BasicCollector.php index db91b161e4..03bf62ac3d 100644 --- a/app/Export/Collector/BasicCollector.php +++ b/app/Export/Collector/BasicCollector.php @@ -55,4 +55,4 @@ class BasicCollector } -} \ No newline at end of file +} diff --git a/app/Export/Collector/CollectorInterface.php b/app/Export/Collector/CollectorInterface.php index 82730425a7..349fee971d 100644 --- a/app/Export/Collector/CollectorInterface.php +++ b/app/Export/Collector/CollectorInterface.php @@ -34,4 +34,4 @@ interface CollectorInterface */ public function setFiles(Collection $files); -} \ No newline at end of file +} diff --git a/app/Export/Collector/UploadCollector.php b/app/Export/Collector/UploadCollector.php index e88a2b8266..817385fc93 100644 --- a/app/Export/Collector/UploadCollector.php +++ b/app/Export/Collector/UploadCollector.php @@ -66,4 +66,4 @@ class UploadCollector extends BasicCollector implements CollectorInterface } } } -} \ No newline at end of file +} diff --git a/app/Export/ConfigurationFile.php b/app/Export/ConfigurationFile.php index 56507a7239..a7c989b8d9 100644 --- a/app/Export/ConfigurationFile.php +++ b/app/Export/ConfigurationFile.php @@ -58,4 +58,4 @@ class ConfigurationFile return $file; } -} \ No newline at end of file +} diff --git a/app/Export/Entry.php b/app/Export/Entry.php index 2f4d2dcab1..df417b83a8 100644 --- a/app/Export/Entry.php +++ b/app/Export/Entry.php @@ -420,4 +420,4 @@ class Entry } -} \ No newline at end of file +} diff --git a/app/Export/Exporter/BasicExporter.php b/app/Export/Exporter/BasicExporter.php index b48185e087..627dbabbe9 100644 --- a/app/Export/Exporter/BasicExporter.php +++ b/app/Export/Exporter/BasicExporter.php @@ -55,4 +55,4 @@ class BasicExporter -} \ No newline at end of file +} diff --git a/app/Export/Exporter/CsvExporter.php b/app/Export/Exporter/CsvExporter.php index 94dd3c5597..9a8d414a06 100644 --- a/app/Export/Exporter/CsvExporter.php +++ b/app/Export/Exporter/CsvExporter.php @@ -80,4 +80,4 @@ class CsvExporter extends BasicExporter implements ExporterInterface $this->fileName = storage_path('export') . DIRECTORY_SEPARATOR . $fileName; $this->handler = fopen($this->fileName, 'w'); } -} \ No newline at end of file +} diff --git a/app/Export/Exporter/ExporterInterface.php b/app/Export/Exporter/ExporterInterface.php index a9d56edb8f..165f529823 100644 --- a/app/Export/Exporter/ExporterInterface.php +++ b/app/Export/Exporter/ExporterInterface.php @@ -39,4 +39,4 @@ interface ExporterInterface */ public function getFileName(); -} \ No newline at end of file +} diff --git a/app/Export/JournalCollector.php b/app/Export/JournalCollector.php index 9356596f71..14cb30f654 100644 --- a/app/Export/JournalCollector.php +++ b/app/Export/JournalCollector.php @@ -63,4 +63,4 @@ class JournalCollector ->get(['transaction_journals.*']); } -} \ No newline at end of file +} diff --git a/app/Export/Processor.php b/app/Export/Processor.php index 523c66e435..b1092a71c9 100644 --- a/app/Export/Processor.php +++ b/app/Export/Processor.php @@ -157,4 +157,4 @@ class Processor { return $this->files; } -} \ No newline at end of file +} diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index ac63abe4c1..21f7644d01 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -560,4 +560,4 @@ Breadcrumbs::register( $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id])); } -); \ No newline at end of file +); diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index 4af61d72c8..e230ac2de2 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -78,4 +78,4 @@ class ExportJobRepository implements ExportJobRepositoryInterface return Auth::user()->exportJobs()->where('key', $key)->first(); } -} \ No newline at end of file +} diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index f48eff5cc5..1eb1352f4f 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -36,4 +36,4 @@ interface ExportJobRepositoryInterface */ public function findByKey(string $key); -} \ No newline at end of file +} diff --git a/database/migrations/2016_02_04_144117_changes_for_v380.php b/database/migrations/2016_02_04_144117_changes_for_v380.php index 277a1c2942..5c027deded 100644 --- a/database/migrations/2016_02_04_144117_changes_for_v380.php +++ b/database/migrations/2016_02_04_144117_changes_for_v380.php @@ -26,7 +26,7 @@ class ChangesForV380 extends Migration */ public function up() { - // new table "rule_groups" + // new table "export_jobs" Schema::create( 'export_jobs', function (Blueprint $table) { $table->increments('id'); @@ -40,5 +40,19 @@ class ChangesForV380 extends Migration } ); + + // new table for transaction journal meta, "journal_meta" + Schema::create('journal_meta', function(Blueprint $table) { + $table->increments('id'); + $table->timestamps(); + $table->integer('transaction_journal_id')->unsigned(); + $table->string('name'); + $table->text('data'); + + $table->unique(['transaction_journal_id', 'name']); + + // link to transaction journal + $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade'); + }); } } diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php old mode 100755 new mode 100644 diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php old mode 100755 new mode 100644 diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php old mode 100755 new mode 100644 diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php old mode 100755 new mode 100644 diff --git a/resources/lang/fr_FR/help.php b/resources/lang/fr_FR/help.php old mode 100755 new mode 100644 diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php old mode 100755 new mode 100644 diff --git a/resources/lang/fr_FR/pagination.php b/resources/lang/fr_FR/pagination.php old mode 100755 new mode 100644 diff --git a/resources/lang/fr_FR/passwords.php b/resources/lang/fr_FR/passwords.php old mode 100755 new mode 100644 diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/breadcrumbs.php b/resources/lang/nl_NL/breadcrumbs.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/config.php b/resources/lang/nl_NL/config.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/help.php b/resources/lang/nl_NL/help.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/pagination.php b/resources/lang/nl_NL/pagination.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/passwords.php b/resources/lang/nl_NL/passwords.php old mode 100755 new mode 100644 diff --git a/resources/lang/nl_NL/validation.php b/resources/lang/nl_NL/validation.php old mode 100755 new mode 100644 diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php old mode 100755 new mode 100644 diff --git a/resources/lang/pt_BR/config.php b/resources/lang/pt_BR/config.php old mode 100755 new mode 100644 diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php old mode 100755 new mode 100644 diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php old mode 100755 new mode 100644 diff --git a/resources/lang/pt_BR/help.php b/resources/lang/pt_BR/help.php old mode 100755 new mode 100644 diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php old mode 100755 new mode 100644 diff --git a/resources/lang/pt_BR/pagination.php b/resources/lang/pt_BR/pagination.php old mode 100755 new mode 100644 diff --git a/resources/lang/pt_BR/passwords.php b/resources/lang/pt_BR/passwords.php old mode 100755 new mode 100644 diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php old mode 100755 new mode 100644 diff --git a/resources/views/emails/error.twig b/resources/views/emails/error.twig index 0e30a0cd22..03c60c67b8 100644 --- a/resources/views/emails/error.twig +++ b/resources/views/emails/error.twig @@ -12,4 +12,4 @@ https://github.com/JC5/firefly-iii/issues/new The full stacktrace is below: -{{ stacktrace }} \ No newline at end of file +{{ stacktrace }} diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig index c11c212d30..018657c2d9 100644 --- a/resources/views/errors/FireflyException.twig +++ b/resources/views/errors/FireflyException.twig @@ -58,4 +58,4 @@ - \ No newline at end of file +