kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 18:54:58 +00:00
Code Issues Projects Releases Wiki Activity
17,182 Commits 4 Branches 773 Tags
a8e4fbb7b64a013ffff5a618bcc5955a09e4b5d3
Commit Graph

17182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
a8e4fbb7b6 Fix issue with preferences object. 2023-02-11 10:17:08 +01:00
James Cole
0060c46cdb Merge pull request #7008 from firefly-iii/fix-5234 
Fix 5234
 2023-02-11 07:39:18 +01:00
James Cole
b909841eae Clean up code. 2023-02-11 07:39:00 +01:00
James Cole
f001675066 Add options to set ranges. 2023-02-11 07:37:05 +01:00
James Cole
c979cfcd89 Replace direct calls to Carbon class. 2023-02-11 07:36:45 +01:00
James Cole
79e98cf8a2 Merge pull request #6983 from firefly-iii/downgrade-phpunit 
Downgrade phpunit due to laravel's incompatibility.
 2023-02-06 06:20:53 +01:00
James Cole
bf8ab7f5d7 Downgrade phpunit due to laravel's incompatibility. 2023-02-06 06:20:32 +01:00
James Cole
54a471ba4c Merge pull request #6980 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-10.0.4 
Bump phpunit/phpunit from 9.6.2 to 10.0.4
 2023-02-06 06:16:32 +01:00
dependabot[bot]
26accbc81e Bump phpunit/phpunit from 9.6.2 to 10.0.4 
Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 9.6.2 to 10.0.4.
- [Release notes](https://github.com/sebastianbergmann/phpunit/releases)
- [Changelog](https://github.com/sebastianbergmann/phpunit/blob/main/ChangeLog-10.0.md)
- [Commits](https://github.com/sebastianbergmann/phpunit/compare/9.6.2...10.0.4)

---
updated-dependencies:
- dependency-name: phpunit/phpunit
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-06 05:15:41 +00:00
James Cole
242c6c1b0c Merge pull request #6981 from firefly-iii/dependabot/composer/develop/barryvdh/laravel-ide-helper-2.13.0 
Bump barryvdh/laravel-ide-helper from 2.12.3 to 2.13.0
 2023-02-06 06:15:08 +01:00
James Cole
db659efe27 Merge pull request #6982 from firefly-iii/fix-tests 
Fix tests
 2023-02-06 06:14:41 +01:00
James Cole
06be3f0d46 Expand test script and fix first functional test. 2023-02-06 06:14:07 +01:00
dependabot[bot]
da318fb592 Bump barryvdh/laravel-ide-helper from 2.12.3 to 2.13.0 
Bumps [barryvdh/laravel-ide-helper](https://github.com/barryvdh/laravel-ide-helper) from 2.12.3 to 2.13.0.
- [Release notes](https://github.com/barryvdh/laravel-ide-helper/releases)
- [Changelog](https://github.com/barryvdh/laravel-ide-helper/blob/master/CHANGELOG.md)
- [Commits](https://github.com/barryvdh/laravel-ide-helper/compare/v2.12.3...v2.13.0)

---
updated-dependencies:
- dependency-name: barryvdh/laravel-ide-helper
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-06 03:00:45 +00: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
dependabot[bot]
83f5b8ab12 Bump json5 from 1.0.1 to 1.0.2 in /frontend 
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-04 07:25:25 +00: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' 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