IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-09-03 20:52:58 -05:00
Code Issues Packages Projects Releases Wiki Activity
17,170 Commits 9 Branches 1,163 Tags
06be3f0d4691a5bd6f7124f3bbc392d08c64fb01
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 06be3f0d46 Expand test script and fix first functional test. 2023-02-06 06:14:07 +01:00
James Cole d58c230f00 Clean up test related code. 2023-02-04 17:43:54 +01:00
James Cole fd7ba9dd57 Remove unused tests 2023-02-04 17:11:19 +01:00
James Cole 47a98451a0 Merge pull request #6976 from firefly-iii/fix-mergify 
Fix mergify
 2023-02-04 10:52:46 +01:00
James Cole 91e961a876 Fix mergify 2023-02-04 10:52:04 +01:00
James Cole 9aaf79a3ab Merge pull request #6975 from firefly-iii/issue-6834 
Null check for https://github.com/firefly-iii/firefly-iii/issues/6834
 2023-02-04 10:47:10 +01:00
James Cole b1e3cf3a20 Null check for https://github.com/firefly-iii/firefly-iii/issues/6834 2023-02-04 10:46:31 +01:00
James Cole be0d785a56 Merge pull request #6974 from firefly-iii/better-mergify-rules 
Better mergify rules.
 2023-02-04 10:20:08 +01:00
James Cole efb89023ac Merge pull request #6973 from firefly-iii/dependabot/npm_and_yarn/frontend/json5-1.0.2 
Bump json5 from 1.0.1 to 1.0.2 in /frontend
 2023-02-04 10:19:30 +01:00
James Cole 9adccb345a Better mergify rules. 2023-02-04 10:18:22 +01:00
James Cole de38e7cf9f Merge tag '6.0.0-alpha.2' into develop 
6.0.0-alpha.2
 2023-02-04 08:24:26 +01:00
James Cole 3a0b3f46a5 Merge branch 'release/6.0.0-alpha.2' 2023-02-04 08:24:24 +01:00
James Cole 806d108d1c Merge pull request #6972 from firefly-iii/alpha-2 
Update meta files for new release.
 2023-02-04 08:23:31 +01:00
James Cole 794d130ff9 Update meta files for new release. 2023-02-04 08:22:53 +01:00
James Cole 848e7d4c9f Merge pull request #6971 from firefly-iii/webhook-fix 
Webhook fix
 2023-02-04 08:12:52 +01:00
James Cole 6e96c75be7 Make sure errors display correctly. 2023-02-04 08:12:32 +01:00
James Cole e20dc78620 Merge pull request #6970 from firefly-iii/fix-6964 
Fix 6964
 2023-02-04 07:46:52 +01:00
James Cole 35912fe9fb Also sneak in some CSS fixes. 2023-02-04 07:46:25 +01:00
James Cole 74777a648c Fix #6964 2023-02-04 07:44:43 +01:00
James Cole 0eb0f7f35f Merge pull request #6969 from firefly-iii/dark-mode-improv 
Dark mode improv
 2023-02-04 07:08:30 +01:00
James Cole 1226ef542f Add missing CSS. 2023-02-04 07:08:05 +01:00
James Cole 7d169518a5 Also refer to minified in templates. 2023-02-04 06:32:23 +01:00
James Cole abfd837f68 Cleanup and minify 2023-02-04 06:31:28 +01:00
James Cole 8ab1e97fb0 Improve skins 2023-02-04 06:00:44 +01:00
James Cole 9fbb290d0f Better UI for webhook 2023-02-03 21:16:53 +01:00
James Cole 28deb32f5e Various improve before build. 2023-02-03 21:16:32 +01:00
James Cole 2c1023ad40 Merge pull request #6957 from firefly-iii/fix-missing-call 
Fix missing message call.
 2023-02-01 18:07:00 +01:00
James Cole 766418a894 Fix missing message call. 2023-02-01 18:05:52 +01:00
James Cole 970193473d Merge pull request #6955 from firefly-iii/fix-6947-3 
Always (try to) create group
 2023-02-01 06:17:41 +01:00
James Cole a782abd6db Always (try to) create group 2023-02-01 06:17:23 +01:00
James Cole b98050e238 Merge pull request #6954 from firefly-iii/fix-6947-2 
Fix 6947 2
 2023-02-01 06:06:35 +01:00
James Cole 1c02b04a0d Fix #6947 again 2023-02-01 06:06:07 +01:00
James Cole c5f94372a0 Merge pull request #6953 from firefly-iii/fix-6947 
Fix https://github.com/firefly-iii/firefly-iii/issues/6947
 2023-01-31 19:45:42 +01:00
James Cole 928613e908 Fix https://github.com/firefly-iii/firefly-iii/issues/6947 2023-01-31 19:45:11 +01:00
James Cole fd3da949da Merge pull request #6945 from firefly-iii/various-fixes-2 
Fix CSS and update packages.
 2023-01-29 18:54:01 +01:00
James Cole 15210f75e7 Fix CSS and update packages. 2023-01-29 18:53:26 +01:00
James Cole dec5e3440d Merge pull request #6944 from firefly-iii/various-fixes 
Various fixes and cleanup
 2023-01-29 15:30:15 +01:00
James Cole 413a4f3d9c Various fixes and cleanup 2023-01-29 15:29:42 +01:00
James Cole 1cbb644d65 Merge pull request #6943 from firefly-iii/dark-mode 
Dark mode
 2023-01-29 15:05:29 +01:00
James Cole e008c1f742 Update templates 2023-01-29 14:52:22 +01:00
James Cole 9bffa86706 Various CSS improvements 2023-01-29 14:49:53 +01:00
James Cole a5a95055c5 Various CSS fixes. 2023-01-29 10:01:00 +01:00
James Cole 5a5c92b5b5 First dark mode CSS 2023-01-29 08:38:53 +01:00
James Cole 41941b37f9 Merge pull request #6941 from firefly-iii/use-validation 
Switch to validation style error in API
 2023-01-29 07:10:35 +01:00
James Cole 881fe3e6e7 Switch to validation style error in API 2023-01-29 07:10:11 +01:00
James Cole a7570d9ab5 Merge pull request #6940 from firefly-iii/fix-rule-validation 
Fix issue with rule repository validation
 2023-01-29 07:02:20 +01:00
James Cole 605afdb271 Merge pull request #6939 from firefly-iii/add-group-check 
Basic check for user's administration ID
 2023-01-29 07:01:32 +01:00
James Cole b6e54fe3cf Merge pull request #6938 from firefly-iii/remove-env 
Remove env
 2023-01-29 07:01:02 +01:00
James Cole fbe5a5dd39 Remove env vars from config 2023-01-29 07:00:42 +01:00
James Cole e284da368d Basic check for user's administration ID 2023-01-29 07:00:26 +01:00
James Cole a5328a9ff4 Remove unused environment variables. 2023-01-29 06:57:49 +01:00
James Cole a925e1aa02 Fix issue with rule repository validation 2023-01-28 06:59:26 +01:00
James Cole 81c37b3349 Merge pull request #6922 from firefly-iii/dependabot/composer/develop/laravel/sanctum-3.2.1 
Bump laravel/sanctum from 3.2.0 to 3.2.1
 2023-01-23 06:52:18 +01:00
James Cole ced9ea4777 Merge pull request #6921 from firefly-iii/dependabot/composer/develop/laravel/passport-11.5.1 
Bump laravel/passport from 11.5.0 to 11.5.1
 2023-01-23 06:50:50 +01:00
James Cole 36c0e8df2d Merge pull request #6920 from firefly-iii/dependabot/composer/develop/predis/predis-2.1.1 
Bump predis/predis from 2.0.3 to 2.1.1
 2023-01-23 06:50:33 +01:00
James Cole 61a0a7795e Merge pull request #6919 from firefly-iii/dependabot/composer/develop/laravel/framework-9.48.0 
Bump laravel/framework from 9.47.0 to 9.48.0
 2023-01-23 06:50:20 +01:00
James Cole e2b4448985 Merge pull request #6918 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.9.14 
Bump phpstan/phpstan from 1.9.11 to 1.9.14
 2023-01-23 06:49:42 +01:00
James Cole 9bf86be305 Merge pull request #6912 from firefly-iii/v3-boxes 
Better boxes in v3
 2023-01-21 20:11:56 +01:00
James Cole 3d96f5df58 Better boxes in v3 2023-01-21 20:08:45 +01:00
James Cole fc0adfd375 Merge pull request #6911 from firefly-iii/v3-top-boxes 
Clean up top boxes
 2023-01-21 17:19:03 +01:00
James Cole 1d62d5d44a Merge pull request #6910 from firefly-iii/fix-api-errors 
Catch and verify various errors
 2023-01-21 17:15:05 +01:00
James Cole 6c2486faa7 Clean up top boxes 2023-01-21 17:14:24 +01:00
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