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
16,653 Commits 9 Branches 1,163 Tags
9b7285ea84959a1794456b0ef0356bb3050f9bea
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Cole 9b7285ea84 Expand search and add operators. 2022-09-28 07:35:57 +02:00
James Cole 6eaed9829b Sort and cleanup code. 2022-09-25 15:31:58 +02:00
James Cole 3c33ea959e Expand search with negated search options 2022-09-25 15:31:07 +02:00
James Cole 80a732b32b First negative search query 2022-09-24 18:06:01 +02:00
James Cole a9f2741282 Add ability to move stuff around, fix spelling. 2022-09-24 17:43:49 +02:00
James Cole 600fa388c1 Fix extra notification 2022-09-24 12:17:55 +02:00
James Cole 45d7042405 Add slack support to Firefly III 2022-09-24 12:14:27 +02:00
James Cole 2945f5fcde Expand requirements 2022-09-24 11:43:39 +02:00
James Cole be1dff49fa Add notifications. 2022-09-24 11:41:07 +02:00
James Cole 665b78ebf5 Expand notifications. 2022-09-24 08:23:07 +02:00
James Cole 416fe0c147 Merge branch 'develop' into 5.8-dev 2022-09-24 07:03:03 +02:00
James Cole 4ca346fc4d Expand notifications 2022-09-23 06:05:22 +02:00
James Cole 6f9482fc1b Merge pull request #6444 from firefly-iii/dependabot/composer/develop/spatie/laravel-ignition-1.5.0 
Bump spatie/laravel-ignition from 1.4.1 to 1.5.0
 2022-09-19 08:16:56 +02:00
James Cole af6e70c41c Merge pull request #6448 from firefly-iii/dependabot/composer/develop/laravel/passport-11.2.0 
Bump laravel/passport from 11.1.0 to 11.2.0
 2022-09-19 08:16:02 +02:00
James Cole c5e0c492a7 Merge pull request #6445 from firefly-iii/dependabot/composer/develop/spatie/data-transfer-object-3.9.1 
Bump spatie/data-transfer-object from 3.8.1 to 3.9.1
 2022-09-19 08:14:01 +02:00
James Cole f43c74df66 Merge pull request #6443 from firefly-iii/dependabot/composer/develop/laravel/framework-9.30.1 
Bump laravel/framework from 9.29.0 to 9.30.1
 2022-09-19 08:13:49 +02:00
James Cole 40dbae17b1 Merge pull request #6447 from firefly-iii/dependabot/composer/develop/laravel/ui-4.0.2 
Bump laravel/ui from 4.0.1 to 4.0.2
 2022-09-19 08:13:39 +02:00
James Cole 52df1aad14 Merge pull request #6446 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.5.1 
Bump ramsey/uuid from 4.4.0 to 4.5.1
 2022-09-19 08:09:08 +02:00
James Cole d2c52b47f1 Allow setting of notifications. 2022-09-18 16:49:15 +02:00
James Cole c25b63d87b Fix #4198 2022-09-18 16:28:04 +02:00
James Cole c120a908f3 Remove available budgets endpoints. 2022-09-18 15:57:24 +02:00
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 e5bc074e68 Merge tag '5.7.12' into develop 
5.7.12
 2022-09-11 07:27:37 +02:00
James Cole 11ba24482f Merge branch 'release/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
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' 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
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
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
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
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
James Cole 3cc0e0f20f Update stale.yml 2022-08-23 03:41:05 +00:00
James Cole 27d6e70469 Merge pull request #6360 from firefly-iii/dependabot/composer/develop/laravel/sanctum-3.0.1 
Bump laravel/sanctum from 2.15.1 to 3.0.1
 2022-08-22 09:05:32 +02:00
James Cole ab4ee2fdb0 Merge pull request #6363 from firefly-iii/dependabot/composer/develop/phpunit/phpunit-9.5.22 
Bump phpunit/phpunit from 9.5.21 to 9.5.22
 2022-08-22 09:05:01 +02:00
James Cole 23a09825cb Merge pull request #6362 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.4.2 
Bump doctrine/dbal from 3.4.0 to 3.4.2
 2022-08-22 09:03:48 +02:00
James Cole ce1e99be9a Merge pull request #6361 from firefly-iii/dependabot/composer/develop/laravel/framework-9.25.1 
Bump laravel/framework from 9.24.0 to 9.25.1
 2022-08-22 09:03:31 +02:00
James Cole 7cf6066afd Merge branch 'develop' into 5.8-dev 2022-08-21 10:42:01 +02:00
James Cole b6e8144fe9 Try to catch bad operations. 2022-08-19 20:24:20 +02:00
James Cole 7cabc5db57 Merge pull request #6325 from firefly-iii/dependabot/composer/develop/laravel/sanctum-3.0.1 
Bump laravel/sanctum from 2.15.1 to 3.0.1
 2022-08-15 06:24:40 +02:00
James Cole 059df6f8ac Merge pull request #6344 from firefly-iii/dependabot/composer/develop/laravel/framework-9.24.0 
Bump laravel/framework from 9.23.0 to 9.24.0
 2022-08-15 06:23:45 +02:00
James Cole 0ef99077d8 Merge branch 'develop' into 5.8-dev 2022-08-14 15:42:38 +02:00
James Cole 3ea48eb6ee Merge branch 'main' into develop 2022-08-14 15:42:25 +02:00
James Cole 322b6d19d8 Add new roles. 2022-08-14 15:41:06 +02:00
James Cole 76885d2c50 Merge pull request #6278 from firefly-iii/dependabot/composer/develop/diglactic/laravel-breadcrumbs-8.0.0 
Bump diglactic/laravel-breadcrumbs from 7.2.0 to 8.0.0
 2022-08-08 18:13:50 +02:00
James Cole 55205d6107 Merge pull request #6329 from firefly-iii/dependabot/npm_and_yarn/develop/postcss-8.4.16 
Bump postcss from 8.4.14 to 8.4.16
 2022-08-08 18:12:04 +02:00
James Cole c7ce5632ea Merge pull request #6328 from firefly-iii/dependabot/composer/develop/laravel/framework-9.23.0 
Bump laravel/framework from 9.22.1 to 9.23.0
 2022-08-08 18:11:48 +02:00
James Cole 91cec7485a Merge pull request #6327 from firefly-iii/dependabot/composer/develop/doctrine/dbal-3.4.0 
Bump doctrine/dbal from 3.3.7 to 3.4.0
 2022-08-08 18:11:38 +02:00
James Cole 37fbc657a7 Merge pull request #6326 from firefly-iii/dependabot/composer/develop/ramsey/uuid-4.4.0 
Bump ramsey/uuid from 4.3.1 to 4.4.0
 2022-08-08 18:11:25 +02:00
James Cole d502c8d286 Merge pull request #6300 from firefly-iii/JC5-patch-3 
Update stale.yml
 2022-08-07 12:46:22 +02:00
James Cole 79c4fad922 Update stale.yml 2022-08-07 10:45:39 +00:00
James Cole ae0a675668 Merge branch 'develop' into 5.8-dev 2022-08-07 12:31:09 +02:00
James Cole b1532ab982 Merge branch 'main' into develop 2022-08-07 12:29:54 +02:00
James Cole 08e65887ca Merge pull request #6296 from firefly-iii/JC5-patch-2 
Update closed-issues.yml
 2022-08-06 17:42:04 +02:00
James Cole 4c0934bae8 Update closed-issues.yml 
Small changes in yaml
 2022-08-06 15:39:22 +00:00
James Cole 1670fe5e4d Merge pull request #6294 from firefly-iii/JC5-patch-1 
Create closed-issues.yml
 2022-08-06 17:31:01 +02:00
James Cole bba362fb58 Create closed-issues.yml 
Add a new workflow for closed issues.
 2022-08-06 15:30:45 +00:00
James Cole 4aa361617f Merge pull request #6293 from firefly-iii/add-badge-readme 
Add badge.
 2022-08-05 04:06:00 +02:00
James Cole be01b177fa Add badge. 2022-08-05 03:59:05 +02:00
James Cole 4d1b21f70d Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	composer.lock
 2022-08-03 05:40:31 +02:00
James Cole aa3fba91d4 Remove the service worker. 2022-08-03 05:39:47 +02:00
James Cole cc6a7b181a Convert to deposit means the journal loses its bill. 2022-08-02 05:39:04 +02:00
James Cole c460ccfad5 Conversion to transfer means that the original journal loses the bill. 2022-08-02 05:38:24 +02:00
James Cole 69d875d981 Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop 2022-08-01 19:51:56 +02:00
James Cole 75ea1c4f4b Return amount as string 2022-08-01 19:51:45 +02:00
James Cole cfbda09e36 Merge pull request #6279 from firefly-iii/dependabot/composer/develop/symfony/http-client-6.0.11 
Bump symfony/http-client from 6.0.9 to 6.0.11
 2022-08-01 05:59:32 +02:00
James Cole 7746f2ca19 Merge pull request #6277 from firefly-iii/dependabot/composer/develop/laravel/framework-9.22.1 
Bump laravel/framework from 9.21.6 to 9.22.1
 2022-08-01 05:59:23 +02:00
James Cole a8fb463520 Merge pull request #6281 from firefly-iii/dependabot/composer/develop/laravel/ui-4.0.0 
Bump laravel/ui from 3.4.6 to 4.0.0
 2022-08-01 05:59:01 +02:00