kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-13 21:28:16 +00:00
Code Issues Projects Releases Wiki Activity
16,925 Commits 5 Branches 798 Tags
d3a619cb15b3cc3ae429de0431adf1697c1d5abf
Commit Graph

398 Commits

Author SHA1 Message Date
James Cole
034647a5ca Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	composer.lock
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
 2022-12-11 10:29:01 +01:00
James Cole
9529721368 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Factory/TransactionJournalFactory.php
#	app/Providers/EventServiceProvider.php
#	app/Repositories/PiggyBank/ModifiesPiggyBanks.php
#	app/Support/Search/OperatorQuerySearch.php
#	app/Support/Steam.php
#	app/TransactionRules/Actions/UpdatePiggybank.php
#	composer.json
#	composer.lock
#	config/search.php
#	frontend/yarn.lock
#	resources/lang/en_US/firefly.php
 2022-12-11 07:37:33 +01:00
James Cole
44af5473a8 Unify piggy bank events. Does not save a link to the journal (yet) 2022-12-11 07:17:59 +01:00
James Cole
249b0c3377 Various code fixes. 2022-10-31 05:53:36 +01:00
James Cole
4e618a4d0b Remove phpstan comments. 2022-10-31 05:40:59 +01:00
James Cole
f53923f16c Use PSR-12 code style 2022-10-30 14:24:28 +01:00
James Cole
ca8a65af60 Display audit logs 2022-10-02 14:37:50 +02:00
James Cole
185842a891 Add audit logs for rules. 2022-10-02 05:37:38 +02:00
James Cole
5f11272d49 Merge branch 'develop' into 5.8-dev 2022-10-01 19:06:55 +02:00
James Cole
ee9b651f0f Add ability to invite users 2022-10-01 12:21:42 +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
c25b63d87b Fix #4198 2022-09-18 16:28:04 +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
ecf5cc62f9 Fix https://github.com/firefly-iii/firefly-iii/issues/6287 2022-09-08 06:22:02 +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
06b7f18d55 Make 2FA code + validation more robust. Thanks to @jtmoss3991, @timaschew and @Ottega. 2022-09-04 13:32:59 +02:00
Sander Dorigo
9652c86782 tight param for api macro 2022-06-25 14:37:15 +02:00
Sander Dorigo
b12d72bef6 New code for API 2 2022-06-23 09:33:43 +02:00
James Cole
d007db166a Various code for currency exchange rate support 2022-06-06 14:40:19 +02:00
James Cole
9c08b9f1d3 Small update to frontend and associated code. 2022-06-05 20:02:43 +02:00
James Cole
75f5b5b51d Stupid laravel and its forced migrations. 2022-04-20 16:25:11 +02:00
James Cole
123693096c Reformat various code. 2022-03-29 15:10:05 +02:00
James Cole
d1a09ff33b Reformat various code. 2022-03-29 14:59:58 +02:00
James Cole
09bd0b572a Make email messages Markdown. 2022-03-29 12:45:48 +02:00
James Cole
f2849c8058 New cron job for bills. 2022-03-28 12:23:46 +02:00
James Cole
52a5995bd1 Remove LDAP support. 2022-03-19 11:19:58 +01:00
James Cole
aa7d4a610b Add files and updates necessary to manage new layout. 2022-02-27 10:04:08 +01:00
James Cole
280975b81a Improvements for https://github.com/firefly-iii/firefly-iii/issues/5133 2021-10-30 06:50:04 +02:00
James Cole
ba740322f4 Fix class not found. 2021-10-23 09:37:53 +02:00
James Cole
f4fe930430 Update code to reflect latest changes. 2021-10-23 08:32:33 +02:00
James Cole
66303f614b Fix login mail handing, #5173 2021-10-13 05:57:11 +02:00
James Cole
4003cea759 Code reordering and reformatting. I should really start employing style CI. 2021-09-18 10:26:12 +02:00
James Cole
10787aada8 New user groups and memberships 2021-08-28 15:47:33 +02:00
James Cole
d828660b9e Catch LDAP events 2021-07-10 07:35:54 +02:00
James Cole
c0d3554acb Clean up views and code 2021-07-05 20:01:36 +02:00
James Cole
70da5917c9 Refactor findNull to find 2021-06-30 06:17:38 +02:00
James Cole
40bbed2a8b Limit some collection features. 2021-05-29 11:30:13 +02:00
James Cole
815fd5ff6b Various code cleanup. 2021-05-24 08:50:17 +02:00
James Cole
001c1f6518 New events for new accounts 2021-04-10 17:25:48 +02:00
James Cole
dcc5d9f583 Trigger recalculation of credit when editing or storing a group. 2021-04-10 07:58:13 +02:00
James Cole
eddf0c1200 Various code cleanup. 2021-04-07 07:53:05 +02:00
James Cole
f12744ad8c Various code cleanup. 2021-04-07 07:28:43 +02:00
James Cole
2c575f3ca5 Code cleanup. 2021-03-28 11:43:07 +02:00
James Cole
97a687e40a Final things. 2021-03-21 11:06:08 +01:00
James Cole
206845575c Code cleanup 2021-03-21 09:15:40 +01:00
James Cole
9aa743b31b Update frontend. 2021-02-25 06:27:43 +01:00
James Cole
deb829dfdb Make sure webhooks are generated in a generic way for future expansion. 2020-12-05 06:47:16 +01:00