Compare commits

...

79 Commits

Author SHA1 Message Date
James Cole
e9ab11051f Merge branch 'hotfix/5.0.3' 2020-01-30 04:47:57 +01:00
James Cole
a4874e10b8 Update changelog and set version. 2020-01-30 04:47:40 +01:00
James Cole
b3cdc08a1b Merge branch 'hotfix/5.0.2' 2020-01-30 04:44:22 +01:00
James Cole
60ca1fc4fd Expand environment variable script. 2020-01-30 04:44:10 +01:00
James Cole
b627fcc754 Fix issue with DB creation. 2020-01-30 04:43:54 +01:00
James Cole
6fa4666336 Merge branch 'release/5.0.1' 2020-01-24 05:39:27 +01:00
James Cole
2b9467cd69 Update language strings. 2020-01-24 05:22:40 +01:00
James Cole
a06b23deba New version. 2020-01-24 05:22:15 +01:00
James Cole
9a83e48570 Updated changelog. 2020-01-24 05:22:07 +01:00
James Cole
16a6ee577d Fix #3047 2020-01-24 04:59:08 +01:00
James Cole
69b30f4220 Update composer.lock 2020-01-23 20:35:19 +01:00
James Cole
797c539c20 Update copyright thingie. 2020-01-23 20:35:02 +01:00
James Cole
f3f53cc38a Clean readme. 2020-01-23 20:04:58 +01:00
James Cole
003c0d1191 Subkey uploaded. 2020-01-23 20:04:21 +01:00
James Cole
f14d3e24ea Final attempt. 2020-01-23 20:01:06 +01:00
James Cole
03be992062 Attempt two to sign. 2020-01-23 20:00:25 +01:00
James Cole
c86faaa165 Experimental commit from new email address 2020-01-23 19:56:38 +01:00
James Cole
68c71cb2f9 Update email address in the readme and a selection of code. 2020-01-23 19:44:52 +01:00
James Cole
ad2994a47c Add copyright template. 2020-01-23 19:38:39 +01:00
James Cole
1e4b4c66fc Update readme.md 2020-01-22 20:09:58 +01:00
James Cole
28c9069441 Merge pull request #3041 from JC5/develop
Develop
2020-01-22 17:31:50 +01:00
James Cole
200e0054ba Fix <P> tag in readme. 2020-01-22 17:30:39 +01:00
James Cole
ad3280c7ef Merge pull request #1 from firefly-iii/develop
Develop
2020-01-22 17:29:46 +01:00
James Cole
04824c9c8c Add screenshots from other devices. 2020-01-22 11:39:37 +01:00
James Cole
a8df0c292c Merge pull request #3039 from tomershvueli/install-on-cloudron
Add link to install Firefly III on Cloudron in Get Started
2020-01-22 05:41:29 +01:00
Tomer Shvueli
fcb57a911b Update readme.md 2020-01-21 16:58:59 -05:00
Tomer Shvueli
cd756ffee5 Update readme.md 2020-01-21 16:58:35 -05:00
Tomer Shvueli
db6533b3de Update readme.md 2020-01-21 16:58:14 -05:00
Tomer Shvueli
c78455ce6c Merge branch 'develop' into install-on-cloudron 2020-01-21 16:57:41 -05:00
Tomer S
6a7c7e1e26 Add link to install Firefly III on Cloudron in Get Started 2020-01-21 16:55:02 -05:00
James Cole
882d78afd3 Merge pull request #3038 from JC5/develop
Write new readme.
2020-01-21 20:55:32 +01:00
James Cole
00ed8a17f4 Write new readme. 2020-01-21 20:54:51 +01:00
James Cole
fc7c2c298e Merge pull request #3037 from JC5/develop
Add missing function that resulted in 404's.
2020-01-21 18:04:06 +01:00
James Cole
7b204c0c2d Add missing function that resulted in 404's. 2020-01-21 18:02:49 +01:00
James Cole
afcd6cffda Merge pull request #3036 from JC5/develop
Fixes #2998
2020-01-21 17:59:20 +01:00
James Cole
4f86aaf198 Fixes 2998 2020-01-21 17:58:31 +01:00
James Cole
e055f1720e Merge pull request #3035 from JC5/develop
Fix #3026
2020-01-21 17:49:04 +01:00
James Cole
fd24fe35a6 See what style CI will do. 2020-01-21 17:45:39 +01:00
James Cole
d27b3fafe9 Fix issue with ISO week numbers. 2020-01-21 17:44:35 +01:00
James Cole
5a9a35dab8 Merge pull request #3031 from JC5/develop
Develop
2020-01-20 20:54:21 +01:00
James Cole
a4c0ee7350 Code to fix issue with missing button information. 2020-01-20 20:52:23 +01:00
James Cole
c8e4bc00c5 Try to fix an annoying bug in budget overview in default report. 2020-01-20 20:21:40 +01:00
James Cole
47e1d9371c Merge pull request #3030 from JC5/develop
Fix issue 3027
2020-01-20 19:55:37 +01:00
James Cole
9ae1f460b2 Fix issue https://github.com/firefly-iii/firefly-iii/issues/3027 by filtering the transaction types included in the report. 2020-01-20 19:48:40 +01:00
James Cole
d49efca791 Merge pull request #3018 from JC5/develop
Fix #3016
2020-01-19 18:11:21 +01:00
James Cole
154ac8b73c Enable cache again. 2020-01-19 18:09:34 +01:00
James Cole
9b420c461f Fix for https://github.com/firefly-iii/firefly-iii/issues/3016 2020-01-19 18:07:54 +01:00
James Cole
f6e5a399cf Merge tag '5.0.0' into develop
5.0.0
2020-01-18 06:10:18 +01:00
James Cole
8bc6ca0ec0 Merge branch 'release/5.0.0' 2020-01-18 06:10:17 +01:00
James Cole
63d8068ba6 Update some code for the new release. 2020-01-18 06:09:52 +01:00
James Cole
11160adf08 Update composer.lock 2020-01-17 20:50:56 +01:00
James Cole
924899f763 Update translations, fix version. 2020-01-17 20:44:54 +01:00
James Cole
458bdc5fd4 Update changelog. 2020-01-17 04:40:44 +01:00
James Cole
1c458704d6 Small composer update. 2020-01-17 04:33:12 +01:00
James Cole
ff44dbaea0 Update analytics code. 2020-01-17 04:30:44 +01:00
James Cole
3852dbeacc Update composer.lock 2020-01-13 16:55:56 +01:00
James Cole
94bb3f43ed #2993 2020-01-13 16:55:41 +01:00
James Cole
534f4de520 Fix an issue where users were unable to create revenue / expense account combinations with the same name. #2987 2020-01-11 17:31:32 +01:00
James Cole
8c36a371be Remove https. 2020-01-11 09:58:35 +01:00
James Cole
2416fd6773 Remove experimental simple nonce. 2020-01-11 06:24:53 +01:00
James Cole
77fa3af87e Use a very simple nonce to see if Edge stops complaining. 2020-01-11 06:15:08 +01:00
James Cole
5da8b2ec9e Some CSP tuning. 2020-01-11 06:14:10 +01:00
James Cole
c55bfc0b8c Improve config of CSP headers. 2020-01-11 05:28:20 +01:00
James Cole
97dffaa8a9 Update readme. 2020-01-11 05:10:24 +01:00
James Cole
8857e3553d Fix for #2980 2020-01-10 17:12:38 +01:00
James Cole
925f63c8e1 Experimental switch of parameters and different urls 2020-01-09 20:43:32 +01:00
James Cole
987730b36b Config for locking old issues. 2020-01-09 20:40:30 +01:00
James Cole
4752dea460 Fix the same typo's in Firefly III's example env file. https://github.com/firefly-iii/docker/pull/1 Courtesy of @techash 2020-01-09 20:09:22 +01:00
James Cole
d57f764fb8 Routine for #2983 2020-01-09 20:04:42 +01:00
James Cole
2d0a57e7e4 More debug and some thinking comments 2020-01-09 19:59:53 +01:00
James Cole
f78729fc8a Add lots of debug. 2020-01-09 19:52:47 +01:00
James Cole
7362a36a98 Add logs. 2020-01-09 19:45:13 +01:00
James Cole
cf067d0bd2 Some extra debugging. 2020-01-09 19:42:28 +01:00
James Cole
2efe5b07e2 #2981 whoops 2020-01-09 19:29:43 +01:00
James Cole
42de629646 Fix #2981 2020-01-09 19:28:23 +01:00
James Cole
220230e981 Fix #2983 2020-01-09 19:26:45 +01:00
James Cole
7f002eb6a9 Be backwards compatible. 2020-01-09 17:04:10 +01:00
James Cole
8c6f8460a2 Be backwards compatible. 2020-01-09 17:03:59 +01:00
James Cole
7f0ac79c5c Merge tag '5.0.0-beta.1' into develop
5.0.0-beta.1
2020-01-09 06:39:13 +01:00
179 changed files with 1760 additions and 1439 deletions

View File

@@ -110,7 +110,8 @@ CER_PROVIDER=fixer
FIXER_API_KEY= FIXER_API_KEY=
# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here. # If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
ANALYTICS_ID= TRACKER_SITE_ID=
TRACKER_URL=
# Most parts of the database are encrypted by default, but you can turn this off if you want to. # Most parts of the database are encrypted by default, but you can turn this off if you want to.
# This makes it easier to migrate your database. Not that some fields will never be decrypted. # This makes it easier to migrate your database. Not that some fields will never be decrypted.

View File

@@ -13,3 +13,5 @@ ru_RU
hu_HU hu_HU
el_GR el_GR
sv_SE sv_SE
zh-hans_CN
zh-hant_CN

View File

@@ -5,14 +5,17 @@ APP_ENV=local
# Set to true if you want to see debug information in error screens. # Set to true if you want to see debug information in error screens.
APP_DEBUG=false APP_DEBUG=false
# This should be your email address # This should be your email address.
# If you use Docker or similar, you can set this variable from a file by using SITE_OWNER_FILE
SITE_OWNER=mail@example.com SITE_OWNER=mail@example.com
# The encryption key for your sessions. Keep this very secure. # The encryption key for your sessions. Keep this very secure.
# If you generate a new one existing data must be considered LOST. # If you generate a new one existing data must be considered LOST.
# Change it to a string of exactly 32 chars or use command `php artisan key:generate` to generate it # Change it to a string of exactly 32 chars or use something like `php artisan key:generate` to generate it.
# If you use Docker or similar, you can set this variable from a file by using APP_KEY_FILE
APP_KEY=SomeRandomStringOf32CharsExactly APP_KEY=SomeRandomStringOf32CharsExactly
# Change this value to your preferred time zone. # Change this value to your preferred time zone.
# Example: Europe/Amsterdam # Example: Europe/Amsterdam
TZ=Europe/Amsterdam TZ=Europe/Amsterdam
@@ -32,7 +35,9 @@ TRUSTED_PROXIES=
# Several other options exist. You can use 'single' for one big fat error log (not recommended). # Several other options exist. You can use 'single' for one big fat error log (not recommended).
# Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself. # Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself.
LOG_CHANNEL=stdout # A rotating log option is 'daily', creates 5 files that (surprise) rotate.
# Default setting 'stack' will log to 'daily' and to 'stdout' at the same time.
LOG_CHANNEL=stack
# Log level. You can set this from least severe to most severe: # Log level. You can set this from least severe to most severe:
# debug, info, notice, warning, error, critical, alert, emergency # debug, info, notice, warning, error, critical, alert, emergency
@@ -42,6 +47,7 @@ APP_LOG_LEVEL=notice
# Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III # Database credentials. Make sure the database exists. I recommend a dedicated user for Firefly III
# For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq # For other database types, please see the FAQ: https://docs.firefly-iii.org/support/faq
# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
DB_CONNECTION=pgsql DB_CONNECTION=pgsql
DB_HOST=firefly_iii_db DB_HOST=firefly_iii_db
DB_PORT=5432 DB_PORT=5432
@@ -50,6 +56,7 @@ DB_USERNAME=firefly
DB_PASSWORD=secret_firefly_password DB_PASSWORD=secret_firefly_password
# PostgreSQL supports SSL. You can configure it here. # PostgreSQL supports SSL. You can configure it here.
# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
PGSQL_SSL_MODE=prefer PGSQL_SSL_MODE=prefer
PGSQL_SSL_ROOT_CERT=null PGSQL_SSL_ROOT_CERT=null
PGSQL_SSL_CERT=null PGSQL_SSL_CERT=null
@@ -61,6 +68,8 @@ CACHE_DRIVER=file
SESSION_DRIVER=file SESSION_DRIVER=file
# If you set either of these to 'redis', you might want to update these settings too # If you set either of these to 'redis', you might want to update these settings too
# If you use Docker or similar, you can set REDIS_HOST_FILE, REDIS_PASSWORD_FILE or
# REDIS_PORT_FILE to set the value from a file instead of from an environment variable
REDIS_HOST=127.0.0.1 REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null REDIS_PASSWORD=null
REDIS_PORT=6379 REDIS_PORT=6379
@@ -68,12 +77,15 @@ REDIS_DB="0" # always use quotes
REDIS_CACHE_DB="1" REDIS_CACHE_DB="1"
# Cookie settings. Should not be necessary to change these. # Cookie settings. Should not be necessary to change these.
# If you use Docker or similar, you can set COOKIE_DOMAIN_FILE to set
# the value from a file instead of from an environment variable
COOKIE_PATH="/" COOKIE_PATH="/"
COOKIE_DOMAIN= COOKIE_DOMAIN=
COOKIE_SECURE=false COOKIE_SECURE=false
# If you want Firefly III to mail you, update these settings # If you want Firefly III to mail you, update these settings
# For instructions, see: https://docs.firefly-iii.org/advanced-installation/email # For instructions, see: https://docs.firefly-iii.org/advanced-installation/email
# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
MAIL_DRIVER=log MAIL_DRIVER=log
MAIL_HOST=smtp.mailtrap.io MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525 MAIL_PORT=2525
@@ -83,13 +95,20 @@ MAIL_PASSWORD=null
MAIL_ENCRYPTION=null MAIL_ENCRYPTION=null
# Other mail drivers: # Other mail drivers:
# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
MAILGUN_DOMAIN= MAILGUN_DOMAIN=
MAILGUN_SECRET= MAILGUN_SECRET=
# If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net # If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net
# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
MAILGUN_ENDPOINT=api.mailgun.net MAILGUN_ENDPOINT=api.mailgun.net
# If you use Docker or similar, you can set these variables from a file by appending them with _FILE
MANDRILL_SECRET= MANDRILL_SECRET=
SPARKPOST_SECRET= SPARKPOST_SECRET=
# Firefly III can send you the following messages # Firefly III can send you the following messages
SEND_REGISTRATION_MAIL=true SEND_REGISTRATION_MAIL=true
SEND_ERROR_MESSAGE=true SEND_ERROR_MESSAGE=true
@@ -98,6 +117,7 @@ SEND_ERROR_MESSAGE=true
SEND_REPORT_JOURNALS=true SEND_REPORT_JOURNALS=true
# Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places. # Set a Mapbox API key here (see mapbox.com) so there might be a map available at various places.
# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
MAPBOX_API_KEY= MAPBOX_API_KEY=
# The map will default to this location: # The map will default to this location:
@@ -115,23 +135,25 @@ CER_PROVIDER=ratesapi
# set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates. # set a Fixer IO API key here (see https://fixer.io) to enable live currency exchange rates.
# Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited # Please note that this WILL ONLY WORK FOR PAID fixer.io accounts because they severely limited
# the free API up to the point where you might as well offer nothing. # the free API up to the point where you might as well offer nothing.
# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
FIXER_API_KEY= FIXER_API_KEY=
# If you wish to track your own behavior over Firefly III, set a valid analytics tracker ID here.
ANALYTICS_ID=
# Firefly III has two options for user authentication. "eloquent" is the default, # Firefly III has two options for user authentication. "eloquent" is the default,
# and "ldap" for LDAP servers. # and "ldap" for LDAP servers.
# For full instructions on these settings please visit: # For full instructions on these settings please visit:
# https://docs.firefly-iii.org/advanced-installation/authentication # https://docs.firefly-iii.org/advanced-installation/authentication
# If you use Docker or similar, you can set this variable from a file by appending it with _FILE
LOGIN_PROVIDER=eloquent LOGIN_PROVIDER=eloquent
# LDAP connection configuration # LDAP connection configuration
# OpenLDAP, FreeIPA or ActiveDirectory # OpenLDAP, FreeIPA or ActiveDirectory
# # If you use Docker or similar, you can set this variable from a file by appending it with _FILE
ADLDAP_CONNECTION_SCHEME=OpenLDAP ADLDAP_CONNECTION_SCHEME=OpenLDAP
ADLDAP_AUTO_CONNECT=true ADLDAP_AUTO_CONNECT=true
# LDAP connection settings # LDAP connection settings
# You can set the following variables from a file by appending them with _FILE:
# ADLDAP_CONTROLLERS, ADLDAP_PORT, ADLDAP_BASEDN
ADLDAP_CONTROLLERS= ADLDAP_CONTROLLERS=
ADLDAP_PORT=389 ADLDAP_PORT=389
ADLDAP_TIMEOUT=5 ADLDAP_TIMEOUT=5
@@ -140,12 +162,15 @@ ADLDAP_FOLLOW_REFFERALS=false
ADLDAP_USE_SSL=false ADLDAP_USE_SSL=false
ADLDAP_USE_TLS=false ADLDAP_USE_TLS=false
# You can set the following variables from a file by appending them with _FILE:
ADLDAP_ADMIN_USERNAME= ADLDAP_ADMIN_USERNAME=
ADLDAP_ADMIN_PASSWORD= ADLDAP_ADMIN_PASSWORD=
# You can set the following variables from a file by appending them with _FILE:
ADLDAP_ACCOUNT_PREFIX= ADLDAP_ACCOUNT_PREFIX=
ADLDAP_ACCOUNT_SUFFIX= ADLDAP_ACCOUNT_SUFFIX=
# LDAP authentication settings. # LDAP authentication settings.
ADLDAP_PASSWORD_SYNC=false ADLDAP_PASSWORD_SYNC=false
ADLDAP_LOGIN_FALLBACK=false ADLDAP_LOGIN_FALLBACK=false
@@ -154,16 +179,33 @@ ADLDAP_DISCOVER_FIELD=distinguishedname
ADLDAP_AUTH_FIELD=distinguishedname ADLDAP_AUTH_FIELD=distinguishedname
# Will allow SSO if your server provides an AUTH_USER field. # Will allow SSO if your server provides an AUTH_USER field.
# You can set the following variables from a file by appending them with _FILE:
WINDOWS_SSO_DISCOVER=samaccountname WINDOWS_SSO_DISCOVER=samaccountname
WINDOWS_SSO_KEY=AUTH_USER WINDOWS_SSO_KEY=AUTH_USER
# field to sync as local username. # field to sync as local username.
# You can set the following variable from a file by appending it with _FILE:
ADLDAP_SYNC_FIELD=userprincipalname ADLDAP_SYNC_FIELD=userprincipalname
# You can disable the X-Frame-Options header if it interfears with tools like # You can disable the X-Frame-Options header if it interferes with tools like
# Organizr. This is at your own risk. # Organizr. This is at your own risk. Applications running in frames run the risk
# of leaking information to their parent frame.
DISABLE_FRAME_HEADER=false DISABLE_FRAME_HEADER=false
# You can disable the Content Security Policy header when you're using an ancient browser
# or any version of Microsoft Edge / Internet Explorer (which amounts to the same thing really)
# This leaves you with the risk of not being able to stop XSS bugs should they ever surface.
# This is at your own risk.
DISABLE_CSP_HEADER=false
# If you wish to track your own behavior over Firefly III, set valid analytics tracker information here.
# Nobody uses this except for me on the demo site. But hey, feel free to use this if you want to.
# Do not prepend the TRACKER_URL with http:// or https://
# The only tracker supported is Matomo.
# You can set the following variables from a file by appending them with _FILE:
TRACKER_SITE_ID=
TRACKER_URL=
# You can fine tune the start-up of a Docker container by editing these environment variables. # You can fine tune the start-up of a Docker container by editing these environment variables.
# Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data. # Use this at your own risk. Disabling certain checks and features may result in lost of inconsistent data.
# However if you know what you're doing you can significantly speed up container start times. # However if you know what you're doing you can significantly speed up container start times.
@@ -191,7 +233,7 @@ DKR_RUN_REPORT=true
# Generate OAuth2 keys. # Generate OAuth2 keys.
# When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if) # When disabled, Firefly III won't attempt to generate OAuth2 Passport keys. This won't be an issue, IFF (if and only if)
# you had previously generated keys already and they're stored in your database for restauration. # you had previously generated keys already and they're stored in your database for restoration.
DKR_RUN_PASSPORT_INSTALL=true DKR_RUN_PASSPORT_INSTALL=true
# Leave the following configuration vars as is. # Leave the following configuration vars as is.

View File

@@ -16,11 +16,10 @@ I am running Firefly III version x.x.x, and my problem is:
<!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). --> <!-- Please add extra info here, such as OS, browser, and the output from the /debug page of your Firefly III installation (click the version at the bottom). -->
**Bonus points** **Bonus points**
<!-- Earn bonus points by: <!-- Earn bonus points by checking the boxes -->
- Post a stacktrace from your log files - [ ] Nobody reported this bug before
- Add a screenshot - [ ] I have added a stack trace from my log files.
- Make a drawing - [ ] I have added a screenshot.
- Donate money (just kidding ;) - [ ] I was able to replicate it on the demo site https://demo.firefly-iii.org/
- Replicate the problem on the demo site https://demo.firefly-iii.org/ <!-- - [ ] I donated money (this is a joke :wink:)-->
-->

35
.github/lock.yml vendored Normal file
View File

@@ -0,0 +1,35 @@
# Configuration for Lock Threads - https://github.com/dessant/lock-threads
# Number of days of inactivity before a closed issue or pull request is locked
daysUntilLock: 90
# Skip issues and pull requests created before a given timestamp. Timestamp must
# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
skipCreatedBefore: false
# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
exemptLabels: []
# Label to add before locking, such as `outdated`. Set to `false` to disable
lockLabel: false
# Comment to post before locking. Set to `false` to disable
lockComment: false
# Assign `resolved` as the reason for locking. Set to `false` to disable
setLockReason: true
# Limit to only `issues` or `pulls`
# only: issues
# Optionally, specify configuration settings just for `issues` or `pulls`
# issues:
# exemptLabels:
# - help-wanted
# lockLabel: outdated
# pulls:
# daysUntilLock: 30
# Repository to extend settings from
# _extends: repo

View File

@@ -2,7 +2,7 @@
/** /**
* AboutController.php * AboutController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* AccountController.php * AccountController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* AttachmentController.php * AttachmentController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* AvailableBudgetController.php * AvailableBudgetController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* BillController.php * BillController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* BudgetController.php * BudgetController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* BudgetLimitController.php * BudgetLimitController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CategoryController.php * CategoryController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* AccountController.php * AccountController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* AvailableBudgetController.php * AvailableBudgetController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* CategoryController.php * CategoryController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* ConfigurationController.php * ConfigurationController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* Controller.php * Controller.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CurrencyController.php * CurrencyController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CurrencyExchangeRateController.php * CurrencyExchangeRateController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* ImportController.php * ImportController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* LinkTypeController.php * LinkTypeController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* PiggyBankController.php * PiggyBankController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* PreferenceController.php * PreferenceController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RecurrenceController.php * RecurrenceController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RuleController.php * RuleController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RuleGroupController.php * RuleGroupController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* AccountController.php * AccountController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* TransactionController.php * TransactionController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* TransferController.php * TransferController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* SummaryController.php * SummaryController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* TagController.php * TagController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* TransactionController.php * TransactionController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* TransactionLinkController.php * TransactionLinkController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* UserController.php * UserController.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* AccountStoreRequest.php * AccountStoreRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* AccountUpdateRequest.php * AccountUpdateRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* AttachmentStoreRequest.php * AttachmentStoreRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* AttachmentUpdateRequest.php * AttachmentUpdateRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* AvailableBudgetRequest.php * AvailableBudgetRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* BillRequest.php * BillRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* BudgetLimitRequest.php * BudgetLimitRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* BudgetRequest.php * BudgetRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CategoryRequest.php * CategoryRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* ConfigurationRequest.php * ConfigurationRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CurrencyRequest.php * CurrencyRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* DateRequest.php * DateRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* LinkTypeRequest.php * LinkTypeRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* PiggyBankRequest.php * PiggyBankRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* PreferenceRequest.php * PreferenceRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RecurrenceStoreRequest.php * RecurrenceStoreRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RecurrenceUpdateRequest.php * RecurrenceUpdateRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* Request.php * Request.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RuleGroupRequest.php * RuleGroupRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* RuleGroupTestRequest.php * RuleGroupTestRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* RuleGroupTriggerRequest.php * RuleGroupTriggerRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RuleStoreRequest.php * RuleStoreRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* RuleTestRequest.php * RuleTestRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* RuleTriggerRequest.php * RuleTriggerRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RuleUpdateRequest.php * RuleUpdateRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* TransferRequest.php * TransferRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* TagStoreRequest.php * TagStoreRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* TagUpdateRequest.php * TagUpdateRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* TransactionLinkRequest.php * TransactionLinkRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* TransactionStoreRequest.php * TransactionStoreRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* TransactionUpdateRequest.php * TransactionUpdateRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* UserStoreRequest.php * UserStoreRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* UserUpdateRequest.php * UserUpdateRequest.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2019 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CorrectDatabase.php * CorrectDatabase.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CorrectOpeningBalanceCurrencies.php * CorrectOpeningBalanceCurrencies.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CreateAccessTokens.php * CreateAccessTokens.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CreateLinkTypes.php * CreateLinkTypes.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* DeleteEmptyGroups.php * DeleteEmptyGroups.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* DeleteEmptyJournals.php * DeleteEmptyJournals.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* DeleteOrphanedTransactions.php * DeleteOrphanedTransactions.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* DeleteZeroAmount.php * DeleteZeroAmount.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* EnableCurrencies.php * EnableCurrencies.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* FixAccountTypes.php * FixAccountTypes.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* FixLongDescriptions.php * FixLongDescriptions.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* FixPiggies.php * FixPiggies.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* FixRecurringTransactions.php * FixRecurringTransactions.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* FixUnevenAmount.php * FixUnevenAmount.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RemoveBills.php * RemoveBills.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RenameMetaFields.php * RenameMetaFields.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* TransferBudgets.php * TransferBudgets.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,5 +1,26 @@
<?php <?php
/**
* CreateDatabase.php
* Copyright (c) 2020 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
namespace FireflyIII\Console\Commands; namespace FireflyIII\Console\Commands;
use Illuminate\Console\Command; use Illuminate\Console\Command;
@@ -33,7 +54,8 @@ class CreateDatabase extends Command
public function handle() public function handle()
{ {
if ('mysql' !== env('DB_CONNECTION')) { if ('mysql' !== env('DB_CONNECTION')) {
$this->info('This command currently applies to MySQL connections only.'); $this->info(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));
return 0;
} }
// try to set up a raw connection: // try to set up a raw connection:
$dsn = sprintf('mysql:host=%s;charset=utf8mb4', env('DB_HOST')); $dsn = sprintf('mysql:host=%s;charset=utf8mb4', env('DB_HOST'));

View File

@@ -2,7 +2,7 @@
/** /**
* DecryptDatabase.php * DecryptDatabase.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* ExportData.php * ExportData.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *
@@ -41,14 +41,6 @@ class ExportData extends Command
{ {
use VerifiesAccessToken; use VerifiesAccessToken;
/** @var JournalRepositoryInterface */
private $journalRepository;
/** @var AccountRepositoryInterface */
private $accountRepository;
/** @var User */
private $user;
/** /**
* The console command description. * The console command description.
* *
@@ -77,7 +69,12 @@ class ExportData extends Command
{--export-bills : Create a file with all your bills and some meta data.} {--export-bills : Create a file with all your bills and some meta data.}
{--export-piggies : Create a file with all your piggy banks and some meta data.} {--export-piggies : Create a file with all your piggy banks and some meta data.}
{--force : Force overwriting of previous exports if found.}'; {--force : Force overwriting of previous exports if found.}';
/** @var AccountRepositoryInterface */
private $accountRepository;
/** @var JournalRepositoryInterface */
private $journalRepository;
/** @var User */
private $user;
/** /**
* Create a new command instance. * Create a new command instance.
@@ -99,7 +96,7 @@ class ExportData extends Command
{ {
// verify access token // verify access token
if (!$this->verifyAccessToken()) { if (!$this->verifyAccessToken()) {
$this->error('Invalid access token.'); $this->error('Invalid access token. Check /profile.');
return 1; return 1;
} }
@@ -138,7 +135,7 @@ class ExportData extends Command
if (0 === count($data)) { if (0 === count($data)) {
$this->error('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org'); $this->error('You must export *something*. Use --export-transactions or another option. See docs.firefly-iii.org');
return 1; return 1;
} }
try { try {
@@ -212,29 +209,32 @@ class ExportData extends Command
*/ */
private function getDateParameter(string $field): Carbon private function getDateParameter(string $field): Carbon
{ {
$date = null; $date = Carbon::now()->subYear();
if (null !== $this->option($field)) { if (null !== $this->option($field)) {
try { try {
$date = Carbon::createFromFormat('Y-m-d', $this->option($field)); $date = Carbon::createFromFormat('Y-m-d', $this->option($field));
} catch (InvalidArgumentException $e) { } catch (InvalidArgumentException $e) {
Log::error($e->getMessage()); Log::error($e->getMessage());
throw new FireflyException(sprintf('%s date "%s" must be formatted YYYY-MM-DD', $field, $this->option('start'))); $this->error(sprintf('%s date "%s" must be formatted YYYY-MM-DD. Field will be ignored.', $field, $this->option('start')));
} }
return $date;
} }
if (null === $date && 'start' === $field) { if ('start' === $field) {
$journal = $this->journalRepository->firstNull(); $journal = $this->journalRepository->firstNull();
$date = null === $journal ? Carbon::now()->subYear() : $date; $date = null === $journal ? Carbon::now()->subYear() : $journal->date;
}
if (null === $date && 'end' === $field) {
$date = new Carbon;
}
if ('start' === $date) {
$date->startOfDay(); $date->startOfDay();
return $date;
} }
if ('end' === $date) { if ('end' === $field) {
$date = new Carbon;
$date->endOfDay(); $date->endOfDay();
return $date;
} }
// fallback
return $date; return $date;
} }

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* CreateCSVImport.php * CreateCSVImport.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* ReportEmptyObjects.php * ReportEmptyObjects.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* ReportIntegrity.php * ReportIntegrity.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* ReportSum.php * ReportSum.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* RestoreOAuthKeys.php * RestoreOAuthKeys.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* ScanAttachments.php * ScanAttachments.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,5 +1,26 @@
<?php <?php
/**
* SetLatestVersion.php
* Copyright (c) 2020 james@firefly-iii.org
*
* This file is part of Firefly III (https://github.com/firefly-iii).
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
namespace FireflyIII\Console\Commands; namespace FireflyIII\Console\Commands;
use Illuminate\Console\Command; use Illuminate\Console\Command;

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* ApplyRules.php * ApplyRules.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -2,7 +2,7 @@
/** /**
* Cron.php * Cron.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* AccountCurrencies.php * AccountCurrencies.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* BackToJournals.php * BackToJournals.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

View File

@@ -1,7 +1,7 @@
<?php <?php
/** /**
* BudgetLimitCurrency.php * BudgetLimitCurrency.php
* Copyright (c) 2019 thegrumpydictator@gmail.com * Copyright (c) 2020 james@firefly-iii.org
* *
* This file is part of Firefly III (https://github.com/firefly-iii). * This file is part of Firefly III (https://github.com/firefly-iii).
* *

Some files were not shown because too many files have changed in this diff Show More