kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

New files for coming release.

Browse Source
This commit is contained in:
James Cole
2017-12-08 17:47:04 +01:00
parent 9220c0de16
commit 84d0ec062e
10 changed files with 96 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.sandstorm/changelog.md
View File

@@ -1,3 +1,17 @@
# 4.6.1.1
- Import routine can scan for matching bills, [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956)
- Import will no longer scan for rules, this has become optional. Originally suggested in [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956) by [gavu](https://github.com/gavu)
- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1033), as reported by [Jumanjii](https://github.com/Jumanjii)
- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1034), as reported by [Aquariu](https://github.com/Aquariu)
- Extra admin check for [issue 1039](https://github.com/firefly-iii/firefly-iii/issues/1039), as reported by [ocdtrekkie](https://github.com/ocdtrekkie)
- Missing translations ([issue 1026](https://github.com/firefly-iii/firefly-iii/issues/1026)), as reported by [gavu](https://github.com/gavu) and [zjean](https://github.com/zjean)
- [Issue 1028](https://github.com/firefly-iii/firefly-iii/issues/1028), reported by [zjean](https://github.com/zjean)
- [Issue 1029](https://github.com/firefly-iii/firefly-iii/issues/1029), reported by [zjean](https://github.com/zjean)
- [Issue 1030](https://github.com/firefly-iii/firefly-iii/issues/1030), as reported by [Traxxi](https://github.com/Traxxi)
- [Issue 1036](https://github.com/firefly-iii/firefly-iii/issues/1036), as reported by [webence](https://github.com/webence)
- [Issue 1038](https://github.com/firefly-iii/firefly-iii/issues/1038), as reported by [gavu](https://github.com/gavu)
# 4.6.11 # 4.6.11
- A debug page at `/debug` for easier debug. - A debug page at `/debug` for easier debug.
- Strings translatable (see [issue 976](https://github.com/firefly-iii/firefly-iii/issues/976)), thanks to [Findus23](https://github.com/Findus23) - Strings translatable (see [issue 976](https://github.com/firefly-iii/firefly-iii/issues/976)), thanks to [Findus23](https://github.com/Findus23)

72
.sandstorm/sandstorm-files.list
View File

@@ -727,6 +727,7 @@ opt/app/bootstrap/cache/packages.php
opt/app/bootstrap/cache/services.php opt/app/bootstrap/cache/services.php
opt/app/composer.json opt/app/composer.json
opt/app/composer.lock opt/app/composer.lock
opt/app/composer.phar
opt/app/config/app.php opt/app/config/app.php
opt/app/config/auth.php opt/app/config/auth.php
opt/app/config/broadcasting.php opt/app/config/broadcasting.php
@@ -992,20 +993,6 @@ opt/app/resources/lang/en_US/list.php
opt/app/resources/lang/en_US/pagination.php opt/app/resources/lang/en_US/pagination.php
opt/app/resources/lang/en_US/passwords.php opt/app/resources/lang/en_US/passwords.php
opt/app/resources/lang/en_US/validation.php opt/app/resources/lang/en_US/validation.php
opt/app/resources/lang/es_ES/auth.php
opt/app/resources/lang/es_ES/bank.php
opt/app/resources/lang/es_ES/breadcrumbs.php
opt/app/resources/lang/es_ES/config.php
opt/app/resources/lang/es_ES/csv.php
opt/app/resources/lang/es_ES/demo.php
opt/app/resources/lang/es_ES/firefly.php
opt/app/resources/lang/es_ES/form.php
opt/app/resources/lang/es_ES/help.php
opt/app/resources/lang/es_ES/intro.php
opt/app/resources/lang/es_ES/list.php
opt/app/resources/lang/es_ES/pagination.php
opt/app/resources/lang/es_ES/passwords.php
opt/app/resources/lang/es_ES/validation.php
opt/app/resources/lang/fr_FR/auth.php opt/app/resources/lang/fr_FR/auth.php
opt/app/resources/lang/fr_FR/bank.php opt/app/resources/lang/fr_FR/bank.php
opt/app/resources/lang/fr_FR/breadcrumbs.php opt/app/resources/lang/fr_FR/breadcrumbs.php
@@ -1020,19 +1007,6 @@ opt/app/resources/lang/fr_FR/list.php
opt/app/resources/lang/fr_FR/pagination.php opt/app/resources/lang/fr_FR/pagination.php
opt/app/resources/lang/fr_FR/passwords.php opt/app/resources/lang/fr_FR/passwords.php
opt/app/resources/lang/fr_FR/validation.php opt/app/resources/lang/fr_FR/validation.php
opt/app/resources/lang/id_ID/auth.php
opt/app/resources/lang/id_ID/bank.php
opt/app/resources/lang/id_ID/breadcrumbs.php
opt/app/resources/lang/id_ID/config.php
opt/app/resources/lang/id_ID/csv.php
opt/app/resources/lang/id_ID/demo.php
opt/app/resources/lang/id_ID/firefly.php
opt/app/resources/lang/id_ID/form.php
opt/app/resources/lang/id_ID/intro.php
opt/app/resources/lang/id_ID/list.php
opt/app/resources/lang/id_ID/pagination.php
opt/app/resources/lang/id_ID/passwords.php
opt/app/resources/lang/id_ID/validation.php
opt/app/resources/lang/nl_NL/auth.php opt/app/resources/lang/nl_NL/auth.php
opt/app/resources/lang/nl_NL/bank.php opt/app/resources/lang/nl_NL/bank.php
opt/app/resources/lang/nl_NL/breadcrumbs.php opt/app/resources/lang/nl_NL/breadcrumbs.php
@@ -1061,48 +1035,6 @@ opt/app/resources/lang/pl_PL/list.php
opt/app/resources/lang/pl_PL/pagination.php opt/app/resources/lang/pl_PL/pagination.php
opt/app/resources/lang/pl_PL/passwords.php opt/app/resources/lang/pl_PL/passwords.php
opt/app/resources/lang/pl_PL/validation.php opt/app/resources/lang/pl_PL/validation.php
opt/app/resources/lang/pt_BR/auth.php
opt/app/resources/lang/pt_BR/bank.php
opt/app/resources/lang/pt_BR/breadcrumbs.php
opt/app/resources/lang/pt_BR/config.php
opt/app/resources/lang/pt_BR/csv.php
opt/app/resources/lang/pt_BR/demo.php
opt/app/resources/lang/pt_BR/firefly.php
opt/app/resources/lang/pt_BR/form.php
opt/app/resources/lang/pt_BR/help.php
opt/app/resources/lang/pt_BR/intro.php
opt/app/resources/lang/pt_BR/list.php
opt/app/resources/lang/pt_BR/pagination.php
opt/app/resources/lang/pt_BR/passwords.php
opt/app/resources/lang/pt_BR/validation.php
opt/app/resources/lang/ru_RU/auth.php
opt/app/resources/lang/ru_RU/bank.php
opt/app/resources/lang/ru_RU/breadcrumbs.php
opt/app/resources/lang/ru_RU/config.php
opt/app/resources/lang/ru_RU/csv.php
opt/app/resources/lang/ru_RU/demo.php
opt/app/resources/lang/ru_RU/firefly.php
opt/app/resources/lang/ru_RU/form.php
opt/app/resources/lang/ru_RU/help.php
opt/app/resources/lang/ru_RU/intro.php
opt/app/resources/lang/ru_RU/list.php
opt/app/resources/lang/ru_RU/pagination.php
opt/app/resources/lang/ru_RU/passwords.php
opt/app/resources/lang/ru_RU/validation.php
opt/app/resources/lang/sl_SI/auth.php
opt/app/resources/lang/sl_SI/bank.php
opt/app/resources/lang/sl_SI/breadcrumbs.php
opt/app/resources/lang/sl_SI/config.php
opt/app/resources/lang/sl_SI/csv.php
opt/app/resources/lang/sl_SI/demo.php
opt/app/resources/lang/sl_SI/firefly.php
opt/app/resources/lang/sl_SI/form.php
opt/app/resources/lang/sl_SI/help.php
opt/app/resources/lang/sl_SI/intro.php
opt/app/resources/lang/sl_SI/list.php
opt/app/resources/lang/sl_SI/pagination.php
opt/app/resources/lang/sl_SI/passwords.php
opt/app/resources/lang/sl_SI/validation.php
opt/app/resources/stubs/binary.bin opt/app/resources/stubs/binary.bin
opt/app/resources/stubs/csv.csv opt/app/resources/stubs/csv.csv
opt/app/resources/stubs/demo-configuration.json opt/app/resources/stubs/demo-configuration.json
@@ -2414,6 +2346,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDataba
opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabaseState.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/RefreshDatabaseState.php
opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestCase.php
opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestResponse.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/TestResponse.php
opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithFaker.php
opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php
opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php
opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php opt/app/vendor/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php
@@ -2673,6 +2606,7 @@ opt/app/vendor/laravel/framework/src/Illuminate/Session/ExistenceAwareInterface.
opt/app/vendor/laravel/framework/src/Illuminate/Session/FileSessionHandler.php opt/app/vendor/laravel/framework/src/Illuminate/Session/FileSessionHandler.php
opt/app/vendor/laravel/framework/src/Illuminate/Session/Middleware/AuthenticateSession.php opt/app/vendor/laravel/framework/src/Illuminate/Session/Middleware/AuthenticateSession.php
opt/app/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php opt/app/vendor/laravel/framework/src/Illuminate/Session/Middleware/StartSession.php
opt/app/vendor/laravel/framework/src/Illuminate/Session/NullSessionHandler.php
opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionManager.php
opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php opt/app/vendor/laravel/framework/src/Illuminate/Session/SessionServiceProvider.php
opt/app/vendor/laravel/framework/src/Illuminate/Session/Store.php opt/app/vendor/laravel/framework/src/Illuminate/Session/Store.php

4
.sandstorm/sandstorm-pkgdef.capnp
View File

@@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = (
manifest = ( manifest = (
appTitle = (defaultText = "Firefly III"), appTitle = (defaultText = "Firefly III"),
appVersion = 4, appVersion = 5,
appMarketingVersion = (defaultText = "4.6.11"), appMarketingVersion = (defaultText = "4.6.11.1"),
actions = [ actions = [
# Define your "new document" handlers here. # Define your "new document" handlers here.

18
CHANGELOG.md
View File

@@ -2,6 +2,24 @@
All notable changes to this project will be documented in this file. All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/). This project adheres to [Semantic Versioning](http://semver.org/).
## [4.6.11.1] - 2017-12-08
### Added
- Import routine can scan for matching bills, [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956)
### Changed
- Import will no longer scan for rules, this has become optional. Originally suggested in [issue 956](https://github.com/firefly-iii/firefly-iii/issues/956) by [gavu](https://github.com/gavu)
- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1033), as reported by [Jumanjii](https://github.com/Jumanjii)
- [Issue 1033](https://github.com/firefly-iii/firefly-iii/issues/1034), as reported by [Aquariu](https://github.com/Aquariu)
- Extra admin check for [issue 1039](https://github.com/firefly-iii/firefly-iii/issues/1039), as reported by [ocdtrekkie](https://github.com/ocdtrekkie)
### Fixed
- Missing translations ([issue 1026](https://github.com/firefly-iii/firefly-iii/issues/1026)), as reported by [gavu](https://github.com/gavu) and [zjean](https://github.com/zjean)
- [Issue 1028](https://github.com/firefly-iii/firefly-iii/issues/1028), reported by [zjean](https://github.com/zjean)
- [Issue 1029](https://github.com/firefly-iii/firefly-iii/issues/1029), reported by [zjean](https://github.com/zjean)
- [Issue 1030](https://github.com/firefly-iii/firefly-iii/issues/1030), as reported by [Traxxi](https://github.com/Traxxi)
- [Issue 1036](https://github.com/firefly-iii/firefly-iii/issues/1036), as reported by [webence](https://github.com/webence)
- [Issue 1038](https://github.com/firefly-iii/firefly-iii/issues/1038), as reported by [gavu](https://github.com/gavu)
## [4.6.11] - 2017-11-30 ## [4.6.11] - 2017-11-30
### Added ### Added
- A debug page at `/debug` for easier debug. - A debug page at `/debug` for easier debug.

117
composer.lock generated
View File

@@ -791,16 +791,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v5.5.22", "version": "v5.5.24",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "2404af887ca8272d721628a99bbc721ac3b692e7" "reference": "06135405bb1f736dac5e9529ed1541fc446c9c0f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/2404af887ca8272d721628a99bbc721ac3b692e7", "url": "https://api.github.com/repos/laravel/framework/zipball/06135405bb1f736dac5e9529ed1541fc446c9c0f",
"reference": "2404af887ca8272d721628a99bbc721ac3b692e7", "reference": "06135405bb1f736dac5e9529ed1541fc446c9c0f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -920,7 +920,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2017-11-27T15:29:55+00:00" "time": "2017-12-07T01:28:21+00:00"
}, },
{ {
"name": "laravelcollective/html", "name": "laravelcollective/html",
@@ -1876,16 +1876,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "9468ad3fba3a5e1f0dc12a96e50e84cddb923cf0" "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/9468ad3fba3a5e1f0dc12a96e50e84cddb923cf0", "url": "https://api.github.com/repos/symfony/console/zipball/2cdef78de8f54f68ff16a857e710e7302b47d4c7",
"reference": "9468ad3fba3a5e1f0dc12a96e50e84cddb923cf0", "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1941,11 +1941,11 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-11-29T13:28:14+00:00" "time": "2017-12-02T18:20:11+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/css-selector.git", "url": "https://github.com/symfony/css-selector.git",
@@ -1998,7 +1998,7 @@
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
@@ -2054,7 +2054,7 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.8.31", "version": "v2.8.32",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
@@ -2114,7 +2114,7 @@
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
@@ -2163,7 +2163,7 @@
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/http-foundation.git", "url": "https://github.com/symfony/http-foundation.git",
@@ -2528,7 +2528,7 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
@@ -2577,7 +2577,7 @@
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/routing.git", "url": "https://github.com/symfony/routing.git",
@@ -2655,7 +2655,7 @@
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
@@ -2723,7 +2723,7 @@
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
@@ -3752,16 +3752,16 @@
}, },
{ {
"name": "php-coveralls/php-coveralls", "name": "php-coveralls/php-coveralls",
"version": "v1.0.2", "version": "v1.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-coveralls/php-coveralls.git", "url": "https://github.com/php-coveralls/php-coveralls.git",
"reference": "9c07b63acbc9709344948b6fd4f63a32b2ef4127" "reference": "37f8f83fe22224eb9d9c6d593cdeb33eedd2a9ad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/9c07b63acbc9709344948b6fd4f63a32b2ef4127", "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/37f8f83fe22224eb9d9c6d593cdeb33eedd2a9ad",
"reference": "9c07b63acbc9709344948b6fd4f63a32b2ef4127", "reference": "37f8f83fe22224eb9d9c6d593cdeb33eedd2a9ad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3809,7 +3809,7 @@
"github", "github",
"test" "test"
], ],
"time": "2017-10-14T23:15:34+00:00" "time": "2017-12-06T23:17:56+00:00"
}, },
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
@@ -4028,16 +4028,16 @@
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
"version": "5.2.4", "version": "5.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
"reference": "033ec97498cf530cc1be4199264cad568b19be26" "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/033ec97498cf530cc1be4199264cad568b19be26", "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1",
"reference": "033ec97498cf530cc1be4199264cad568b19be26", "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4053,7 +4053,6 @@
"theseer/tokenizer": "^1.1" "theseer/tokenizer": "^1.1"
}, },
"require-dev": { "require-dev": {
"ext-xdebug": "^2.5",
"phpunit/phpunit": "^6.0" "phpunit/phpunit": "^6.0"
}, },
"suggest": { "suggest": {
@@ -4062,7 +4061,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "5.2.x-dev" "dev-master": "5.3.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -4077,7 +4076,7 @@
"authors": [ "authors": [
{ {
"name": "Sebastian Bergmann", "name": "Sebastian Bergmann",
"email": "sb@sebastian-bergmann.de", "email": "sebastian@phpunit.de",
"role": "lead" "role": "lead"
} }
], ],
@@ -4088,7 +4087,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2017-11-27T09:00:30+00:00" "time": "2017-12-06T09:29:45+00:00"
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
@@ -4278,16 +4277,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "6.4.4", "version": "6.5.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932" "reference": "882e886cc928a0abd3c61282b2a64026237d14a4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/562f7dc75d46510a4ed5d16189ae57fbe45a9932", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/882e886cc928a0abd3c61282b2a64026237d14a4",
"reference": "562f7dc75d46510a4ed5d16189ae57fbe45a9932", "reference": "882e886cc928a0abd3c61282b2a64026237d14a4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4301,12 +4300,12 @@
"phar-io/version": "^1.0", "phar-io/version": "^1.0",
"php": "^7.0", "php": "^7.0",
"phpspec/prophecy": "^1.7", "phpspec/prophecy": "^1.7",
"phpunit/php-code-coverage": "^5.2.2", "phpunit/php-code-coverage": "^5.3",
"phpunit/php-file-iterator": "^1.4.2", "phpunit/php-file-iterator": "^1.4.3",
"phpunit/php-text-template": "^1.2.1", "phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^1.0.9", "phpunit/php-timer": "^1.0.9",
"phpunit/phpunit-mock-objects": "^4.0.3", "phpunit/phpunit-mock-objects": "^5.0.4",
"sebastian/comparator": "^2.0.2", "sebastian/comparator": "^2.1",
"sebastian/diff": "^2.0", "sebastian/diff": "^2.0",
"sebastian/environment": "^3.1", "sebastian/environment": "^3.1",
"sebastian/exporter": "^3.1", "sebastian/exporter": "^3.1",
@@ -4332,7 +4331,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "6.4.x-dev" "dev-master": "6.5.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -4358,20 +4357,20 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2017-11-08T11:26:09+00:00" "time": "2017-12-06T09:42:03+00:00"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
"version": "4.0.4", "version": "5.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
"reference": "2f789b59ab89669015ad984afa350c4ec577ade0" "reference": "16b50f4167e5e85e81ca8a3dd105d0a5fd32009a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/2f789b59ab89669015ad984afa350c4ec577ade0", "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/16b50f4167e5e85e81ca8a3dd105d0a5fd32009a",
"reference": "2f789b59ab89669015ad984afa350c4ec577ade0", "reference": "16b50f4167e5e85e81ca8a3dd105d0a5fd32009a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4384,7 +4383,7 @@
"phpunit/phpunit": "<6.0" "phpunit/phpunit": "<6.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.0" "phpunit/phpunit": "^6.5"
}, },
"suggest": { "suggest": {
"ext-soap": "*" "ext-soap": "*"
@@ -4392,7 +4391,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0.x-dev" "dev-master": "5.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -4407,7 +4406,7 @@
"authors": [ "authors": [
{ {
"name": "Sebastian Bergmann", "name": "Sebastian Bergmann",
"email": "sb@sebastian-bergmann.de", "email": "sebastian@phpunit.de",
"role": "lead" "role": "lead"
} }
], ],
@@ -4417,7 +4416,7 @@
"mock", "mock",
"xunit" "xunit"
], ],
"time": "2017-08-03T14:08:16+00:00" "time": "2017-12-02T05:31:19+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",
@@ -4980,7 +4979,7 @@
}, },
{ {
"name": "symfony/class-loader", "name": "symfony/class-loader",
"version": "v3.4.0", "version": "v3.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/class-loader.git", "url": "https://github.com/symfony/class-loader.git",
@@ -5036,7 +5035,7 @@
}, },
{ {
"name": "symfony/config", "name": "symfony/config",
"version": "v4.0.0", "version": "v4.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/config.git", "url": "https://github.com/symfony/config.git",
@@ -5096,7 +5095,7 @@
}, },
{ {
"name": "symfony/filesystem", "name": "symfony/filesystem",
"version": "v4.0.0", "version": "v4.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/filesystem.git", "url": "https://github.com/symfony/filesystem.git",
@@ -5145,7 +5144,7 @@
}, },
{ {
"name": "symfony/stopwatch", "name": "symfony/stopwatch",
"version": "v4.0.0", "version": "v4.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/stopwatch.git", "url": "https://github.com/symfony/stopwatch.git",
@@ -5194,16 +5193,16 @@
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v4.0.0", "version": "v4.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/yaml.git", "url": "https://github.com/symfony/yaml.git",
"reference": "7be8741ce5dce9943f41a9269f6828b66e726776" "reference": "873417cb9949f07be8852d41e3be5ab6f09e1218"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/7be8741ce5dce9943f41a9269f6828b66e726776", "url": "https://api.github.com/repos/symfony/yaml/zipball/873417cb9949f07be8852d41e3be5ab6f09e1218",
"reference": "7be8741ce5dce9943f41a9269f6828b66e726776", "reference": "873417cb9949f07be8852d41e3be5ab6f09e1218",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -5248,7 +5247,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-11-29T13:42:03+00:00" "time": "2017-12-04T18:34:52+00:00"
}, },
{ {
"name": "theseer/tokenizer", "name": "theseer/tokenizer",

2
config/firefly.php
View File

@@ -33,7 +33,7 @@ return [
'is_demo_site' => false, 'is_demo_site' => false,
], ],
'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true), 'encryption' => (is_null(env('USE_ENCRYPTION')) || env('USE_ENCRYPTION') === true),
'version' => '4.6.11', 'version' => '4.6.11.1',
'maxUploadSize' => 15242880, 'maxUploadSize' => 15242880,
'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf','text/plain'], 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf','text/plain'],
'list_length' => 10, 'list_length' => 10,

1
resources/lang/de_DE/firefly.php
View File

@@ -13,7 +13,6 @@ declare(strict_types=1);
return [ return [
// general stuff: // general stuff:
'language_incomplete' => 'Unvollständige Übersetzung',
'close' => 'Schließen', 'close' => 'Schließen',
'actions' => 'Aktionen', 'actions' => 'Aktionen',
'edit' => 'Bearbeiten', 'edit' => 'Bearbeiten',

1
resources/lang/fr_FR/firefly.php
View File

@@ -13,7 +13,6 @@ declare(strict_types=1);
return [ return [
// general stuff: // general stuff:
'language_incomplete' => 'Traduction incomplète',
'close' => 'Fermer', 'close' => 'Fermer',
'actions' => 'Actions', 'actions' => 'Actions',
'edit' => 'Modifier', 'edit' => 'Modifier',

1
resources/lang/nl_NL/firefly.php
View File

@@ -13,7 +13,6 @@ declare(strict_types=1);
return [ return [
// general stuff: // general stuff:
'language_incomplete' => 'Onvolledige vertaling',
'close' => 'Sluiten', 'close' => 'Sluiten',
'actions' => 'Acties', 'actions' => 'Acties',
'edit' => 'Wijzig', 'edit' => 'Wijzig',

1
resources/lang/pl_PL/firefly.php
View File

@@ -13,7 +13,6 @@ declare(strict_types=1);
return [ return [
// general stuff: // general stuff:
'language_incomplete' => 'Niepełne tłumaczenie',
'close' => 'Zamknij', 'close' => 'Zamknij',
'actions' => 'Akcje', 'actions' => 'Akcje',
'edit' => 'Modyfikuj', 'edit' => 'Modyfikuj',