Commit Graph

12912 Commits

Author SHA1 Message Date
James Cole
4b5b47a078 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2020-02-09 09:21:27 +01:00
James Cole
930695b188
Add line 2020-02-09 09:21:20 +01:00
James Cole
d51e5798ef Merge pull request #3100 from Agraphie/master
Move redis comment to different line
2020-02-08 13:40:08 +00:00
Agraphie
edaa2c168a
Move redis comment to different line
The comment in the variable caused redis to use `"0" #always use quotes` as redis db index instead of just "0"
2020-02-08 13:55:31 +01:00
James Cole
4dc24939ba Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2020-02-08 12:59:56 +01:00
James Cole
4cd642b8da
Fix #3099 2020-02-08 12:59:43 +01:00
James Cole
b77b3f0c21
Merge pull request #3098 from GeoffreyFrogeye/link_type_id
API: Add link_type_id when reading TransactionLink
2020-02-08 11:54:27 +00:00
James Cole
0acc2c5727 Merge pull request #3097 from GeoffreyFrogeye/att_unif
API: Unified attachment_* and model_* for Attachments
2020-02-08 11:54:01 +00:00
Geoffrey “Frogeye” Preud'homme
5aae8b7743 API: Add link_type_id when reading TransactionLink 2020-02-08 12:38:15 +01:00
Geoffrey “Frogeye” Preud'homme
e81ce3317c API: Unified attachment_* and model_* for Attachments 2020-02-08 12:29:23 +01:00
James Cole
cebc0d7568
Add a debug view for transactions. 2020-02-08 06:42:07 +01:00
James Cole
d5cfc12bf3
Clone button. 2020-02-07 20:52:13 +01:00
James Cole
ac931698d3
Code for #3052 2020-02-07 20:51:25 +01:00
James Cole
0c13ac2e93
Fix some old debug code. 2020-02-07 20:50:46 +01:00
James Cole
685107e950
Add DNS to debug. 2020-02-07 18:27:49 +01:00
James Cole
ae57be74e0
Add port to DSN 2020-02-07 18:26:47 +01:00
James Cole
58c0a69737
Fix #3083 2020-02-07 11:16:52 +01:00
James Cole
ab73322c58
Update email addresses. 2020-02-07 11:16:38 +01:00
James Cole
c2e7e00cdd
Demo user can trigger error. 2020-02-06 22:01:59 +01:00
James Cole
554a702c0a
A special commit for @SuperSandro2000 😉 2020-02-06 21:54:47 +01:00
James Cole
2a3775968c Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2020-02-06 21:48:44 +01:00
James Cole
3cb01a9b50
Update groups.twig 2020-02-06 15:05:29 +01:00
James Cole
e54a011e0c
More validation for #3080 2020-02-05 20:37:23 +01:00
James Cole
fc81833b50
Update email address 2020-02-05 05:53:12 +01:00
James Cole
067246be79
Check if object is countable, fix #3080 2020-02-04 19:20:34 +01:00
James Cole
11997f0f97
Fix #3082 2020-02-04 17:39:38 +01:00
James Cole
635ef0de77
Fix #3075 2020-02-03 20:00:02 +01:00
James Cole
7f3522339c
Simplify update check. 2020-02-02 10:39:37 +01:00
James Cole
f99f166623
Merge tag '5.0.4' into develop
5.0.4

# Conflicts:
#	changelog.md
#	config/firefly.php
2020-02-01 16:17:24 +01:00
James Cole
3864855967 Merge branch 'hotfix/5.0.4' 2020-02-01 16:16:35 +01:00
James Cole
0266c364e0
Changelog for 5.0.4 2020-02-01 16:16:25 +01:00
James Cole
1b411815b7
Fix issue where MySQL was considered the default if left unset. 2020-02-01 16:14:21 +01:00
James Cole
fb574cb173
Expand changelog. 2020-02-01 15:54:36 +01:00
James Cole
cf4adae604
Refactor category chart code. 2020-02-01 15:54:26 +01:00
James Cole
3f6719dc70
Add Lando to readme. 2020-02-01 15:44:03 +01:00
James Cole
7cdfbc48a9
Fix #3070 2020-02-01 06:32:28 +01:00
James Cole
28b7bd4d71
Improve box for #3071 2020-02-01 06:19:12 +01:00
James Cole
d056f0d221
Allows the user to set the default language for new and unauthenticated visitors. 2020-01-31 07:39:24 +01:00
James Cole
3771cc3b75
Update email address 2020-01-31 07:32:04 +01:00
James Cole
c7f25c5486
Middleware to generate unique ID for Firefly III installation. 2020-01-31 07:24:41 +01:00
James Cole
b697b71e59
Some updates to the tag overview for #3066 and #3067 2020-01-30 18:56:08 +01:00
James Cole
a6fab50c20
Fix #3064 2020-01-30 18:35:00 +01:00
James Cole
43232c208f
Merge tag '5.0.3' into develop
5.0.3

# Conflicts:
#	config/firefly.php
2020-01-30 04:49:28 +01:00
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
1c502667b1 Merge tag '5.0.2' into develop
5.0.2
2020-01-30 04:44:24 +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
d28bf1f8a4
Update email address 2020-01-28 08:46:01 +01:00