Commit Graph

17102 Commits

Author SHA1 Message Date
James Cole
f9daf7751a
Catch and verify various errors 2023-01-21 12:21:06 +01:00
James Cole
c269913510
Merge pull request #6908 from firefly-iii/expand-mergify
no message
2023-01-21 07:08:05 +01:00
James Cole
cc436605d0
no message 2023-01-21 07:07:03 +01:00
James Cole
c697d2aa13
Merge pull request #6906 from firefly-iii/fix-clean-string
Add some extra catches and remove debug info
2023-01-21 06:52:27 +01:00
James Cole
90219bec35
Add some extra catches and remove debug info 2023-01-21 06:52:04 +01:00
James Cole
afca023767
Merge pull request #6905 from firefly-iii/fix-validation
Catch various validation errors
2023-01-20 22:09:19 +01:00
James Cole
1502c5de94
Merge pull request #6904 from firefly-iii/update-languages
Update languages.
2023-01-20 22:08:57 +01:00
James Cole
cd408e581b
Catch various validation errors 2023-01-20 22:08:18 +01:00
James Cole
122c8acae0
Update languages. 2023-01-20 22:07:43 +01:00
James Cole
13cffaa1e3
Merge pull request #6903 from firefly-iii/JC5-patch-3
Update TransactionCurrencySeeder.php
2023-01-20 15:11:15 +01:00
James Cole
feab244edd
Update TransactionCurrencySeeder.php
Remove crypto currencies from default set.
2023-01-20 15:10:58 +01:00
James Cole
259ad852c9
Merge pull request #6902 from firefly-iii/JC5-patch-2
Update web.php
2023-01-20 12:40:48 +01:00
James Cole
6802f53c96
Update web.php
Make sure dates work.
2023-01-20 12:40:28 +01:00
James Cole
d922390802
Merge pull request #6901 from firefly-iii/JC5-patch-1
Update web.php
2023-01-20 12:34:16 +01:00
James Cole
2a9f51a40f
Update web.php
Fix report routes.
2023-01-20 12:33:45 +01:00
James Cole
614d54c9bd
Merge pull request #6898 from firefly-iii/pr-6831
Add debug info and a warning for login issues related to #6831
2023-01-19 06:46:44 +01:00
James Cole
3ea8792c6e
Add debug info and a warning for login issues related to #6831 2023-01-19 06:45:45 +01:00
James Cole
3d802b9c9e
Merge pull request #6891 from firefly-iii/cleanup-routes
Cleanup routes and code.
2023-01-17 20:10:21 +01:00
James Cole
480d787242
Cleanup routes and code. 2023-01-17 20:09:57 +01:00
James Cole
820c6feadd
Merge pull request #6889 from firefly-iii/JC5-patch-1
Update web.php
2023-01-17 17:18:54 +01:00
James Cole
8c1eeedf17
Update web.php 2023-01-17 17:18:36 +01:00
James Cole
9b5931f1d6
Merge pull request #6885 from firefly-iii/JC5-patch-1
Update web.php
2023-01-17 12:40:49 +01:00
James Cole
d5cade320b
Update web.php 2023-01-17 12:40:40 +01:00
James Cole
ef46ab6de2
Merge pull request #6881 from firefly-iii/JC5-patch-1
Update CreatesObjectGroups.php
2023-01-17 10:16:00 +01:00
James Cole
d0d3921ff6
Update CreatesObjectGroups.php
Fix thing
2023-01-17 10:15:50 +01:00
James Cole
2cb2e2e635
Merge pull request #6880 from firefly-iii/JC5-patch-1
Update CreatesObjectGroups.php
2023-01-17 09:58:35 +01:00
James Cole
1a0047205d
Update CreatesObjectGroups.php
An extra trim for extra long group names.
2023-01-17 09:58:17 +01:00
James Cole
468655cd94
Merge pull request #6878 from firefly-iii/fix-routes-again
Fix dateformat.
2023-01-17 05:57:33 +01:00
James Cole
09cb4b10b9
Fix dateformat. 2023-01-17 05:57:06 +01:00
James Cole
6eaf83d6d2
Merge pull request #6877 from firefly-iii/fix-routes
Add regular expressions to routes.
2023-01-17 05:54:49 +01:00
James Cole
7c8a2e3591
Add regular expressions to routes. 2023-01-17 05:54:30 +01:00
James Cole
ba5c3ef0a1
Merge pull request #6876 from firefly-iii/validate-date-field
Validate date field.
2023-01-17 05:41:18 +01:00
James Cole
c0f744b03a
Validate date field. 2023-01-17 05:40:56 +01:00
James Cole
8cd13ba13b
Merge pull request #6873 from firefly-iii/main
Merge back into develop
2023-01-16 06:56:44 +01:00
James Cole
10db3d63ac
Merge pull request #6872 from firefly-iii/fix-6870
Fix 6870
2023-01-16 06:55:20 +01:00
James Cole
a753fde2f1
Fix #6870 2023-01-16 06:54:57 +01:00
James Cole
d4f1b9a1bc
Merge pull request #6871 from firefly-iii/fix-6869
Fix https://github.com/firefly-iii/firefly-iii/issues/6869
2023-01-16 06:40:05 +01:00
James Cole
3cfaa5aa03
Fix https://github.com/firefly-iii/firefly-iii/issues/6869 2023-01-16 06:39:16 +01:00
James Cole
bc47017e31
Merge pull request #6864 from firefly-iii/update-build-2
Update build 2
2023-01-15 17:31:35 +01:00
James Cole
125d9e7e9d
Rebuild frontend 2023-01-15 17:31:14 +01:00
James Cole
4cea7a3287
Add logging 2023-01-15 17:29:45 +01:00
James Cole
e7a1ad23f4
Merge pull request #6863 from firefly-iii/fix-improper-escaoe
Fix improper escape.
2023-01-15 17:24:37 +01:00
James Cole
afd3fd9f88
Fix improper escape. 2023-01-15 17:05:21 +01:00
James Cole
f2251d7bfa
Merge pull request #6862 from firefly-iii/main
Merge back into develop
2023-01-15 16:11:18 +01:00
James Cole
700ccaa853
Merge pull request #6861 from firefly-iii/release/6.0.0-alpha.1
Release/6.0.0 alpha.1
2023-01-15 16:10:06 +01:00
James Cole
0fcdcf0f01
Final updates 2023-01-15 16:09:02 +01:00
James Cole
fa347a5ee4
Merge pull request #6860 from firefly-iii/six-alpha1
Update files for 6.0.0-alpha.1
2023-01-15 15:55:31 +01:00
James Cole
d412c2407a
Merge pull request #6859 from firefly-iii/debug-6831
Add debug for https://github.com/firefly-iii/firefly-iii/issues/6831
2023-01-15 15:54:59 +01:00
James Cole
dea86242fd
Add debug for https://github.com/firefly-iii/firefly-iii/issues/6831 2023-01-15 15:54:41 +01:00
James Cole
973c175213
Update files for 6.0.0-alpha.1 2023-01-15 15:47:25 +01:00