kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-31 02:36:28 +00:00
Code Issues Projects Releases Wiki Activity
17,176 Commits 4 Branches 771 Tags
e4b4234fbb716a3e92c5c0c40bc42909243b8d09
Commit Graph

17176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole
07541fa08f Update translations and notifications. 2022-09-18 15:48:28 +02:00
James Cole
0098a9c3c0 Create some empty notifications. 2022-09-18 12:36:35 +02:00
James Cole
9f95d7a76f Fix https://github.com/firefly-iii/firefly-iii/issues/5862 2022-09-18 12:23:20 +02:00
James Cole
67126e46b9 Add webhook code and rebuild. 2022-09-18 10:45:38 +02:00
James Cole
c4c178b39d Merge branch 'develop' into 5.8-dev 2022-09-18 05:54:49 +02:00
James Cole
eef14ced59 Add amount check. Not sure why rule doesn't fire. 2022-09-18 05:53:11 +02:00
James Cole
d9245f06f7 Add option to delete webhooks. 2022-09-18 05:49:56 +02:00
James Cole
625ad14d7d Add code to create webhook. 2022-09-17 16:54:13 +02:00
James Cole
23e5cf1b34 Update languages 2022-09-17 07:14:50 +02:00
James Cole
ad9efde2d0 Expand webhook code. 2022-09-17 07:08:30 +02:00
James Cole
10f2cf2481 Update webhooks 2022-09-17 07:07:25 +02:00
James Cole
f0416f5322 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	config/firefly.php
 2022-09-11 08:59:34 +02:00
James Cole
11ba24482f Merge branch 'release/5.7.12' 5.7.12 2022-09-11 07:27:37 +02:00
James Cole
e5bc074e68 Merge tag '5.7.12' into develop 
5.7.12
 2022-09-11 07:27:37 +02:00
James Cole
93ea86f921 Fix meta files for new release. 2022-09-11 07:27:16 +02:00
James Cole
cf8957a460 Fix https://github.com/firefly-iii/firefly-iii/issues/6332 2022-09-11 07:08:54 +02:00
James Cole
9c2f771bae Fix https://github.com/firefly-iii/firefly-iii/issues/6333 2022-09-11 07:08:02 +02:00
James Cole
d9e8f8106a Fix https://github.com/firefly-iii/firefly-iii/issues/6379 2022-09-11 07:02:39 +02:00
James Cole
6589f88883 Fix https://github.com/firefly-iii/firefly-iii/issues/6421 2022-09-11 06:58:16 +02:00
James Cole
38ebdd8249 Merge pull request #6423 from canoine/develop 
Redis username needed for both databases
 2022-09-10 06:09:42 +02:00
canoine
6296ead897 Redis username needed for both databases 
Redis username needed for both 'default' and 'cache' databases
 2022-09-09 14:21:16 +02:00
James Cole
ecf5cc62f9 Fix https://github.com/firefly-iii/firefly-iii/issues/6287 2022-09-08 06:22:02 +02:00
James Cole
b205cc87fc Merge tag '5.7.11' into develop 
5.7.11
 2022-09-07 18:38:57 +02:00
James Cole
4c60473f02 Merge branch 'release/5.7.11' 5.7.11 2022-09-07 18:38:56 +02:00
James Cole
7104433a68 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Exceptions/Handler.php
#	config/firefly.php
 2022-09-07 18:35:01 +02:00
James Cole
f47464944b Update packages 2022-09-07 18:33:23 +02:00
James Cole
edb9480c90 Merge pull request #6413 from firefly-iii/dependabot/composer/develop/predis/predis-2.0.1 
Bump predis/predis from 2.0.0 to 2.0.1
 2022-09-05 20:05:40 +02:00
dependabot[bot]
615e789134 Bump predis/predis from 2.0.0 to 2.0.1 
Bumps [predis/predis](https://github.com/predis/predis) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/predis/predis/releases)
- [Changelog](https://github.com/predis/predis/blob/main/CHANGELOG.md)
- [Commits](https://github.com/predis/predis/compare/v2.0.0...v2.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-05 13:09:42 +00:00
James Cole
3e96bb526c Store secret correctly. 2022-09-05 05:39:47 +02:00
James Cole
1d21a8788c Update packages and meta data. 2022-09-04 13:58:21 +02:00
James Cole
e420ead9e8 Update translations. 2022-09-04 13:53:24 +02:00
James Cole
06b7f18d55 Make 2FA code + validation more robust. Thanks to @jtmoss3991, @timaschew and @Ottega. 2022-09-04 13:32:59 +02:00
James Cole
8659c7efbd Skip error 2022-09-04 13:31:46 +02:00
James Cole
80fe52f5d7 Merge pull request #6383 from firefly-iii/dependabot/composer/develop/guzzlehttp/guzzle-7.5.0 
Bump guzzlehttp/guzzle from 7.4.5 to 7.5.0
 2022-08-29 05:55:27 +02:00
dependabot[bot]
77358301e8 Bump guzzlehttp/guzzle from 7.4.5 to 7.5.0 
Bumps [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) from 7.4.5 to 7.5.0.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/compare/7.4.5...7.5.0)

---
updated-dependencies:
- dependency-name: guzzlehttp/guzzle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-29 03:55:01 +00:00
James Cole
93ed1de23f Merge pull request #6385 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.12 
Bump symfony/http-client from 6.0.11 to 6.0.12
 2022-08-29 05:54:52 +02:00
James Cole
a81ca5114b Merge pull request #6386 from firefly-iii/dependabot/composer/develop/laravel/passport-11.0.0 
Bump laravel/passport from 10.4.1 to 11.0.0
 2022-08-29 05:54:35 +02:00
James Cole
9a69b941d8 Merge pull request #6387 from firefly-iii/dependabot/npm_and_yarn/develop/jquery-3.6.1 
Bump jquery from 3.6.0 to 3.6.1
 2022-08-29 05:54:20 +02:00
dependabot[bot]
194ecc7ac7 Bump symfony/http-client from 6.0.11 to 6.0.12 
Bumps [symfony/http-client](https://github.com/symfony/http-client) from 6.0.11 to 6.0.12.
- [Release notes](https://github.com/symfony/http-client/releases)
- [Changelog](https://github.com/symfony/http-client/blob/6.1/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-client/compare/v6.0.11...v6.0.12)

---
updated-dependencies:
- dependency-name: symfony/http-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-29 03:53:42 +00:00
dependabot[bot]
44da3be910 Bump laravel/passport from 10.4.1 to 11.0.0 
Bumps [laravel/passport](https://github.com/laravel/passport) from 10.4.1 to 11.0.0.
- [Release notes](https://github.com/laravel/passport/releases)
- [Changelog](https://github.com/laravel/passport/blob/11.x/CHANGELOG.md)
- [Upgrade guide](https://github.com/laravel/passport/blob/11.x/UPGRADE.md)
- [Commits](https://github.com/laravel/passport/compare/v10.4.1...v11.0.0)

---
updated-dependencies:
- dependency-name: laravel/passport
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-29 03:53:27 +00:00
James Cole
22de6e61ff Merge pull request #6382 from firefly-iii/dependabot/composer/develop/spatie/laravel-ignition-1.4.0 
Bump spatie/laravel-ignition from 1.3.1 to 1.4.0
 2022-08-29 05:52:56 +02:00
dependabot[bot]
37f91cabf5 Bump jquery from 3.6.0 to 3.6.1 
Bumps [jquery](https://github.com/jquery/jquery) from 3.6.0 to 3.6.1.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/3.6.0...3.6.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-29 03:02:30 +00:00
dependabot[bot]
7f9d87a117 Bump spatie/laravel-ignition from 1.3.1 to 1.4.0 
Bumps [spatie/laravel-ignition](https://github.com/spatie/laravel-ignition) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/spatie/laravel-ignition/releases)
- [Changelog](https://github.com/spatie/laravel-ignition/blob/main/CHANGELOG.md)
- [Commits](https://github.com/spatie/laravel-ignition/compare/1.3.1...1.4.0)

---
updated-dependencies:
- dependency-name: spatie/laravel-ignition
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-08-29 03:00:45 +00:00
James Cole
52e83c2ec2 Fix https://github.com/firefly-iii/firefly-iii/issues/6379 2022-08-28 06:37:03 +02:00
James Cole
70c08d6b50 Basic amount fix 2022-08-23 05:46:59 +02:00
James Cole
0b49e9b8a8 Basic amount fix 2022-08-23 05:46:43 +02:00
James Cole
6add8765c4 Merge branch 'develop' into 5.8-dev 2022-08-23 05:44:25 +02:00
James Cole
73d97d90ae Merge branch 'main' into develop 2022-08-23 05:44:12 +02:00
James Cole
4d12e6b58b New migration command. 2022-08-23 05:43:40 +02:00
James Cole
43650583fe Merge pull request #6368 from firefly-iii/JC5-patch-4 
Update stale.yml
 2022-08-23 05:41:17 +02:00