kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity
17,336 Commits 4 Branches 760 Tags
57b83dd2393dfb730a33fba1284c9b274f1e6f59
Commit Graph

17336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
57b83dd239 Fix #7130 2023-03-05 07:59:48 +01:00
James Cole
1539dcffd5 Revert "Fix #7130" 
This reverts commit b4a09efb8b.
 2023-03-05 07:57:40 +01:00
James Cole
b4a09efb8b Fix #7130 2023-03-05 07:56:37 +01:00
James Cole
e82b372f75 Merge pull request #7134 from firefly-iii/fix-7131 
Fix #7131 by expanding the global ajaxSetup instructions.
 2023-03-05 07:52:09 +01:00
James Cole
83a89181bc Add JSON.stringify 2023-03-05 07:00:04 +01:00
James Cole
b1e08b1084 Fix #7131 by expanding the global ajaxSetup instructions. 2023-03-05 06:09:25 +01:00
James Cole
0eb582ab3b Merge pull request #7129 from firefly-iii/common-mail-errors 
Catch common mail errors
 2023-03-04 22:26:43 +01:00
James Cole
07b58b4200 Catch common mail errors 2023-03-04 22:26:09 +01:00
James Cole
8807f04599 Merge pull request #7128 from firefly-iii/fix-7127 
Fix 7127
 2023-03-04 22:19:17 +01:00
James Cole
4657d34ae4 Fix request 2023-03-04 22:18:37 +01:00
James Cole
79951453cd Switch the button 2023-03-04 22:17:19 +01:00
James Cole
5291f485ac Fix #7127 by adding an option to the API 2023-03-04 22:16:59 +01:00
James Cole
ed75d84376 Merge pull request #7116 from firefly-iii/fix-6985 
Fix 6985
 2023-03-04 07:36:10 +01:00
James Cole
a7011376cb Add package. 2023-03-04 07:35:51 +01:00
James Cole
6c4bd84b66 Fix #6985 2023-03-04 07:35:30 +01:00
James Cole
c4418857e6 Merge pull request #7114 from firefly-iii/fix-7112 
Fix https://github.com/firefly-iii/firefly-iii/issues/7112
 2023-03-04 07:18:55 +01:00
James Cole
5d316ea26a Fix https://github.com/firefly-iii/firefly-iii/issues/7112 2023-03-04 07:18:20 +01:00
James Cole
4a0887c978 Merge pull request #7109 from firefly-iii/css-fixes 
CSS fixes for subdirectories. Full credits to @GaneshKandu
 2023-03-03 09:15:11 +01:00
James Cole
dbfceafb02 CSS fixes for subdirectories. Full credits to @GaneshKandu 2023-03-03 09:14:44 +01:00
James Cole
4db73285b7 Merge branch 'main' into develop 2023-03-03 06:22:08 +01:00
James Cole
876ea8bb07 Merge pull request #7103 from firefly-iii/dependabot/npm_and_yarn/frontend/dns-packet-5.4.0 
Bump dns-packet from 5.3.1 to 5.4.0 in /frontend
 2023-03-03 06:21:40 +01:00
dependabot[bot]
e0e90845e7 Bump dns-packet from 5.3.1 to 5.4.0 in /frontend 
Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 5.3.1 to 5.4.0.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mafintosh/dns-packet/compare/v5.3.1...5.4.0)

---
updated-dependencies:
- dependency-name: dns-packet
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-02 21:42:01 +00:00
James Cole
f1223a5a3f Merge tag 'v6.0.0' into develop 
v6.0.0
 2023-03-02 21:21:12 +01:00
James Cole
1a3720bfaa Merge branch 'release/v6.0.0' v6.0.0 2023-03-02 21:21:11 +01:00
James Cole
1ddcc51c48 Merge pull request #7102 from firefly-iii/final-60 
Final 60
 2023-03-02 21:19:40 +01:00
James Cole
9f43ea3118 Update packages. 2023-03-02 21:19:17 +01:00
James Cole
0fe4ac9ef5 Update files for 6.0.0 2023-03-02 21:18:06 +01:00
James Cole
d6d395eccd Merge pull request #7101 from firefly-iii/fix-liabilities 
Fix liabilities
 2023-03-02 21:08:20 +01:00
James Cole
a26f5e2e6d Do not remove liabilities. 2023-03-02 21:06:53 +01:00
James Cole
849e006eda Merge pull request #7094 from firefly-iii/fix-7093 
Fix https://github.com/firefly-iii/firefly-iii/issues/7093
 2023-03-01 07:32:39 +01:00
James Cole
f70a4511c6 Fix https://github.com/firefly-iii/firefly-iii/issues/7093 2023-03-01 07:32:19 +01:00
James Cole
21ba311ecf Merge pull request #7092 from firefly-iii/fix-broken-chart 
Fix broken chart
 2023-03-01 06:41:16 +01:00
James Cole
fb0a100a7f Fix broken chart 2023-03-01 06:40:58 +01:00
James Cole
2295110cf1 Merge pull request #7090 from firefly-iii/dependabot/composer/develop/laravel/framework-10.1.5 
Bump laravel/framework from 10.1.4 to 10.1.5
 2023-02-27 06:05:10 +01:00
James Cole
3c82c9af8b Merge pull request #7089 from firefly-iii/dependabot/composer/develop/phpstan/phpstan-1.10.3 
Bump phpstan/phpstan from 1.10.2 to 1.10.3
 2023-02-27 06:05:01 +01:00
James Cole
df78aa2f0d Merge pull request #7091 from firefly-iii/dark-mode-arrow 
Dark mode arrow
 2023-02-27 06:04:49 +01:00
James Cole
1ac18909b4 Dark mode arrow 2023-02-27 06:04:32 +01:00
dependabot[bot]
07d793e9f7 Bump laravel/framework from 10.1.4 to 10.1.5 
Bumps [laravel/framework](https://github.com/laravel/framework) from 10.1.4 to 10.1.5.
- [Release notes](https://github.com/laravel/framework/releases)
- [Changelog](https://github.com/laravel/framework/blob/10.x/CHANGELOG.md)
- [Commits](https://github.com/laravel/framework/compare/v10.1.4...v10.1.5)

---
updated-dependencies:
- dependency-name: laravel/framework
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-27 03:56:47 +00:00
dependabot[bot]
2a7b540a95 Bump phpstan/phpstan from 1.10.2 to 1.10.3 
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.2 to 1.10.3.
- [Release notes](https://github.com/phpstan/phpstan/releases)
- [Changelog](https://github.com/phpstan/phpstan/blob/1.10.x/CHANGELOG.md)
- [Commits](https://github.com/phpstan/phpstan/compare/1.10.2...1.10.3)

---
updated-dependencies:
- dependency-name: phpstan/phpstan
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-27 03:56:30 +00:00
James Cole
5cdecf7d04 Merge pull request #7088 from firefly-iii/fix-7079 
Update translations.
 2023-02-26 19:49:16 +01:00
James Cole
1a0e6ffffb Update translations. 2023-02-26 19:48:15 +01:00
James Cole
c0cfc60da6 Merge pull request #7087 from firefly-iii/fix-7079 
Date fix for https://github.com/firefly-iii/firefly-iii/issues/7079
 2023-02-26 19:41:59 +01:00
James Cole
9f831a8b3d Date fix for https://github.com/firefly-iii/firefly-iii/issues/7079 2023-02-26 19:41:01 +01:00
James Cole
ec3ee2f995 Merge pull request #7084 from firefly-iii/fix-7083 
Fix https://github.com/firefly-iii/firefly-iii/issues/7083
 2023-02-26 13:30:57 +01:00
James Cole
25ca02f541 Fix https://github.com/firefly-iii/firefly-iii/issues/7083 2023-02-26 13:30:14 +01:00
James Cole
776c59faea Merge pull request #7080 from firefly-iii/six 
Six
 2023-02-25 09:08:47 +01:00
James Cole
a4b1587a78 Fix week number 2023-02-25 09:08:10 +01:00
James Cole
1d79eea69e Update changelog. 2023-02-25 08:42:19 +01:00
James Cole
b369b6e7b8 Fix https://github.com/firefly-iii/firefly-iii/issues/7079 2023-02-25 08:38:50 +01:00
James Cole
3832297d69 Merge pull request #7075 from firefly-iii/six 
Fix audit processor
 2023-02-24 06:04:04 +01:00