Commit Graph

17086 Commits

Author SHA1 Message Date
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
James Cole
e135d01655
Merge pull request #6857 from firefly-iii/fix-liabilities
Fix liabilities
2023-01-15 15:15:35 +01:00
James Cole
9b37d5ab8d
Clean up logging. 2023-01-15 13:49:28 +01:00
James Cole
84c3868c9b
Add destructive upgrade routine. 2023-01-15 09:22:34 +01:00
James Cole
3c0b23aaed
Add another case for deposits. 2023-01-15 07:52:05 +01:00
James Cole
7e6ce7c3e8
Also in create form. 2023-01-15 07:21:51 +01:00
James Cole
7111aec101
Make sure edit of liability always works. 2023-01-15 07:20:58 +01:00
James Cole
1f9e0b48c9
Fix withdrawals away from liabilities, cleanup debug logs 2023-01-15 06:58:09 +01:00
James Cole
63a7aad44c
Merge pull request #6855 from eps90/fix-bulk-validator-for-expenses
Do not validate currency if account has no currency configured
2023-01-14 17:44:55 +01:00
Kuba Turek
9191ae5054
Do not validate currency if account has no currency configured 2023-01-14 17:08:24 +01:00
James Cole
618e70748c
Merge pull request #6853 from firefly-iii/add-catalan
Enable and include Catalan.
2023-01-14 15:49:55 +01:00
James Cole
68e4f26656
Enable and include Catalan. 2023-01-14 15:49:13 +01:00
James Cole
5124a5eba9
Merge pull request #6851 from firefly-iii/translation-warnings
Translation warnings
2023-01-14 15:48:31 +01:00
James Cole
708cd014c5
Add warning to files. 2023-01-14 15:47:51 +01:00
James Cole
9654f631c5
Give all files the standard warning (to be replaced). 2023-01-14 15:43:25 +01:00
James Cole
65027d7832
Add placeholder to en_US files. 2023-01-14 15:32:51 +01:00
James Cole
db0500dcf0
Merge pull request #6850 from firefly-iii/fix-auth-issue
Expand authentication validation in API.
2023-01-14 07:55:11 +01:00