diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 2d9bcc0192..f7ef4c3bb3 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,7 +1,19 @@
-## Hi there!
+# Welcome to Firefly III on Github!
-Thank you for taking the time to report an issue or requesting a new feature.
+:+1::tada: Thank you for taking the time to contribute something to Firefly III!
-Please take note that there are NO rules or regulations when you submit an issue.
+## Feature requests
If you are requesting a new feature, please check out the list of [often requested features](https://firefly-iii.github.io/requested-features/).
+
+## Bugs
+
+If you find a bug, include as many log files and details as you think are necessary.
+
+## Installation problems
+
+Take the time to read the [installation guide FAQ](https://firefly-iii.github.io/installation-guide-faq/) and make sure you search through closed issues for the problems other people have had. Your problem may be among them!
+
+## Pull requests
+
+I can only accept pull requests against the `develop` branch, never the `master` branch
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dc3f748c8..91120fe9b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [4.3.3] - 2017-02-02
+### Fixed
+- Fixed bug #550, reported by @worldworm!
+- Fixed bug #551, reported by @t-me!
+
## [4.3.3] - 2017-01-30
_The 100th release of Firefly!_
diff --git a/app/Http/Requests/AccountFormRequest.php b/app/Http/Requests/AccountFormRequest.php
index 91b05abcb0..cbd07f46ee 100644
--- a/app/Http/Requests/AccountFormRequest.php
+++ b/app/Http/Requests/AccountFormRequest.php
@@ -63,7 +63,7 @@ class AccountFormRequest extends Request
{
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
- $accountRoles = join(',', array_keys(config('firefly.accountRoles')));
+ $accountRoles = join(',', config('firefly.accountRoles'));
$types = join(',', array_keys(config('firefly.subTitlesByIdentifier')));
$ccPaymentTypes = join(',', array_keys(config('firefly.ccTypes')));
diff --git a/composer.json b/composer.json
index 6f7bea2597..659144ebc2 100755
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,6 @@
"watson/validating": "3.*",
"doctrine/dbal": "^2.5",
"league/commonmark": "0.15.*",
- "twig/twig": "1.30.0",
"rcrowe/twigbridge": "0.9.*",
"league/csv": "8.*",
"laravelcollective/html": "^5.3",
diff --git a/composer.lock b/composer.lock
index ae477e0989..b816654cd5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "db26ae145d3656fe05d8a222fc21e263",
+ "content-hash": "8a447ee60bb0509881af5070e5980f18",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -158,16 +158,16 @@
},
{
"name": "davejamesmiller/laravel-breadcrumbs",
- "version": "3.0.1",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git",
- "reference": "460bf79e83ff9e3db1e3f1c40169d8893893f8ff"
+ "reference": "6ca5a600003ecb52a5b5af14dad82033058604e1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/460bf79e83ff9e3db1e3f1c40169d8893893f8ff",
- "reference": "460bf79e83ff9e3db1e3f1c40169d8893893f8ff",
+ "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/6ca5a600003ecb52a5b5af14dad82033058604e1",
+ "reference": "6ca5a600003ecb52a5b5af14dad82033058604e1",
"shasum": ""
},
"require": {
@@ -195,15 +195,15 @@
{
"name": "Dave James Miller",
"email": "dave@davejamesmiller.com",
- "homepage": "http://davejamesmiller.com/"
+ "homepage": "https://davejamesmiller.com/"
}
],
"description": "A simple Laravel-style way to create breadcrumbs in Laravel 4+.",
- "homepage": "http://laravel-breadcrumbs.davejamesmiller.com",
+ "homepage": "https://laravel-breadcrumbs.readthedocs.io/",
"keywords": [
"laravel"
],
- "time": "2016-08-28T16:57:03+00:00"
+ "time": "2017-01-30T21:16:53+00:00"
},
{
"name": "dnoegel/php-xdg-base-dir",
@@ -1163,16 +1163,16 @@
},
{
"name": "league/flysystem",
- "version": "1.0.33",
+ "version": "1.0.34",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "5c7f98498b12d47f9de90ec9186a90000125777c"
+ "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5c7f98498b12d47f9de90ec9186a90000125777c",
- "reference": "5c7f98498b12d47f9de90ec9186a90000125777c",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/469ad53c13ea19a0e54e3e5d70f61227ddcc0299",
+ "reference": "469ad53c13ea19a0e54e3e5d70f61227ddcc0299",
"shasum": ""
},
"require": {
@@ -1242,7 +1242,7 @@
"sftp",
"storage"
],
- "time": "2017-01-23T10:32:09+00:00"
+ "time": "2017-01-30T17:41:17+00:00"
},
{
"name": "monolog/monolog",
@@ -2730,16 +2730,16 @@
},
{
"name": "twig/twig",
- "version": "v1.30.0",
+ "version": "v1.31.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "c6ff71094fde15d12398eaba029434b013dc5e59"
+ "reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/c6ff71094fde15d12398eaba029434b013dc5e59",
- "reference": "c6ff71094fde15d12398eaba029434b013dc5e59",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddc9e3e20ee9c0b6908f401ac8353635b750eca7",
+ "reference": "ddc9e3e20ee9c0b6908f401ac8353635b750eca7",
"shasum": ""
},
"require": {
@@ -2747,12 +2747,12 @@
},
"require-dev": {
"symfony/debug": "~2.7",
- "symfony/phpunit-bridge": "~3.2@dev"
+ "symfony/phpunit-bridge": "~3.2"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.30-dev"
+ "dev-master": "1.31-dev"
}
},
"autoload": {
@@ -2787,7 +2787,7 @@
"keywords": [
"templating"
],
- "time": "2016-12-23T11:06:22+00:00"
+ "time": "2017-01-11T19:36:15+00:00"
},
{
"name": "vlucas/phpdotenv",
diff --git a/config/firefly.php b/config/firefly.php
index 7d0627c636..adae9e8c07 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -24,7 +24,7 @@ return [
],
'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
'chart' => 'chartjs',
- 'version' => '4.3.3',
+ 'version' => '4.3.4',
'csv_import_enabled' => true,
'maxUploadSize' => 5242880,
'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'],
diff --git a/resources/lang/pt_BR/auth.php b/resources/lang/pt_BR/auth.php
index 7cfe62b56c..5a17d21cad 100644
--- a/resources/lang/pt_BR/auth.php
+++ b/resources/lang/pt_BR/auth.php
@@ -22,7 +22,7 @@ return [
|
*/
- 'failed' => 'Essas credenciais não correspondem com nossos registros.',
+ 'failed' => 'Essas credenciais não correspondem aos nossos registros.',
'throttle' => 'Muitas tentativas de login. Por favor, tente novamente em :seconds segundos.',
];
\ No newline at end of file
diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php
index 31a47f95e6..cd6c42b790 100644
--- a/resources/lang/pt_BR/breadcrumbs.php
+++ b/resources/lang/pt_BR/breadcrumbs.php
@@ -24,7 +24,7 @@ return [
'edit_bill' => 'Editar fatura ":name"',
'delete_bill' => 'Apagar fatura ":name"',
'reports' => 'Relatórios',
- 'searchResult' => 'Pesquisa por ":query"',
+ 'searchResult' => 'Pesquisar por ":query"',
'withdrawal_list' => 'Despesas',
'deposit_list' => 'Receitas, renda e depósitos',
'transfer_list' => 'Transferências',
diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php
index d23fdd3663..a1b92485f2 100644
--- a/resources/lang/pt_BR/csv.php
+++ b/resources/lang/pt_BR/csv.php
@@ -14,31 +14,31 @@ declare(strict_types = 1);
return [
'import_configure_title' => 'Configure sua importação',
- 'import_configure_intro' => 'There are some options for your CSV import. Please indicate if your CSV file contains headers on the first column, and what the date format of your date-fields is. That might require some experimentation. The field delimiter is usually a ",", but could also be a ";". Check this carefully.',
+ 'import_configure_intro' => 'Existem algumas opções para sua importação CSV. Por favor, indique se o seu arquivo CSV contém cabeçalhos na primeira coluna, e qual o formato de data de seus campos de data. Isso pode exigir alguma experimentação. O delimitador de campo é geralmente um ",", mas também poderia ser um ";". Verifique isto cuidadosamente.',
'import_configure_form' => 'Opções básicas de importação CSV',
'header_help' => 'Verifique se a primeira linha do seu arquivo CSV está com os títulos de coluna',
- 'date_help' => 'Date time format in your CSV. Follow the format like this page indicates. The default value will parse dates that look like this: :dateExample.',
- 'delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.',
- 'import_account_help' => 'Se seu arquivo CSV NÃO contém informações sobre sua(s) conta(s) ativa(s), use este combobox para selecionar para qual conta pertencem as transações no CSV.',
- 'upload_not_writeable' => 'Na caixa cinza contém um caminho de arquivo. Deve ser possível gravar nele. Por favor, certifique-se de que é.',
+ 'date_help' => 'Formato de data e hora em seu CSV. Siga o formato como indica esta página. O valor padrão analisará datas que se parecem com isso: :dateExample.',
+ 'delimiter_help' => 'Escolha o delimitador de campo que é usado em seu arquivo de entrada. Se não tiver certeza, a vírgula é a opção mais segura.',
+ 'import_account_help' => 'Se o seu arquivo CSV NÃO contém informações sobre sua(s) conta(s) ativa(s), use este combobox para selecionar para qual conta pertencem as transações no CSV.',
+ 'upload_not_writeable' => 'A caixa cinza contém um caminho para um arquivo. Deve ser possível escrever nele. Por favor, certifique-se de que é.',
// roles
- 'column_roles_title' => 'Definir papeis da coluna',
+ 'column_roles_title' => 'Definir as funções da coluna',
'column_roles_table' => 'Tabela',
'column_name' => 'Nome da coluna',
'column_example' => 'Dados de exemplo da coluna',
- 'column_role' => 'Significado de dados de coluna',
- 'do_map_value' => 'Mapeie esses valores',
+ 'column_role' => 'Significado dos dados da coluna',
+ 'do_map_value' => 'Mapear estes valores',
'column' => 'Coluna',
'no_example_data' => 'Não há dados de exemplo disponíveis',
'store_column_roles' => 'Continuar a importação',
'do_not_map' => '(não mapear)',
'map_title' => 'Conectar dados importados para dados do Firefly III',
- 'map_text' => 'In the following tables, the left value shows you information found in your uploaded CSV file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.',
+ 'map_text' => 'Nas tabelas a seguir, o valor à esquerda mostra informações encontradas no seu arquivo CSV carregado. É sua tarefa mapear esse valor, se possível, para um valor já presente em seu banco de dados. O Firefly vai se ater a esse mapeamento. Se não há nenhum valor para mapear, ou não quer mapear o valor específico, não selecione nada.',
'field_value' => 'Valor do campo',
'field_mapped_to' => 'Mapeado para',
- 'store_column_mapping' => 'Mapear armazenamento',
+ 'store_column_mapping' => 'Armazenar mapeamento',
// map things.
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 16a8c2f4e9..fc86a04dce 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -177,7 +177,7 @@
-
+
{% block scripts %}{% endblock %}
diff --git a/routes/web.php b/routes/web.php
index bd438f5f59..8a7b9c8eb7 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -370,7 +370,7 @@ Route::group(
*/
Route::group(
['middleware' => 'user-full-auth', 'prefix' => 'javascript', 'as' => 'javascript.'], function () {
- Route::get('variables.js', ['uses' => 'JavascriptController@variables', 'as' => 'variables']);
+ Route::get('variables', ['uses' => 'JavascriptController@variables', 'as' => 'variables']);
}
);