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
17,039 Commits 9 Branches 1,163 Tags
9654f631c577a00f97e27659f5017fd00cb741f3
Commit Graph
6478 Commits
Author SHA1 Message Date
James Cole 9654f631c5 Give all files the standard warning (to be replaced). 2023-01-14 15:43:25 +01:00
James Cole 65027d7832 Add placeholder to en_US files. 2023-01-14 15:32:51 +01:00
James Cole 65df355440 Fix login box in dark mode. 2023-01-11 06:17:03 +01:00
Julien Stébenne 5967762cd8 Hide sensitive information in 2FA setup page when printing 
The QR code (and manual code) should not be recoverable after the initial setup. This would allow an unauthorized person to access an account without leaving a trace (like showing that a backup code was used, given that person has the account password).

Even if very low, having that information visible could be a problem.
 2023-01-09 21:47:39 -05:00
James Cole 40083230fd Update meta files for new alpha release. 2023-01-07 08:12:53 +01:00
James Cole 1fee2092d6 Clear up webhooks 2023-01-05 19:05:23 +01:00
James Cole 7bd824e8cb Update packages and meta data. 2023-01-04 20:40:57 +01:00
James Cole c3e0ce0c08 Merge branch 'develop' into 5.8-dev 2023-01-03 08:45:04 +01:00
James Cole 6a629a7da3 Add a little sort and active filter. 2023-01-03 08:44:54 +01:00
James Cole 24696bf800 Clean up some code 2022-12-31 07:33:44 +01:00
James Cole 27a576ae8a Various bug fixes and code cleanup. 2022-12-31 06:57:05 +01:00
James Cole 2b9996b844 Remove some unreachable code. 2022-12-30 20:48:48 +01:00
James Cole 0022009dd5 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	config/firefly.php
#	resources/lang/de_DE/firefly.php
#	resources/lang/de_DE/validation.php
#	resources/lang/pl_PL/firefly.php
 2022-12-29 19:16:24 +01:00
James Cole ba35c5da0b Update meta data 2022-12-29 19:13:15 +01:00
James Cole 9b242f1a75 Update translations. 2022-12-29 19:06:31 +01:00
James Cole e031fffe65 Update translations 2022-12-29 15:49:24 +01:00
James Cole 5e3f9f9bce Expand search with external ID searches. 2022-12-29 15:42:26 +01:00
James Cole 8c320fd199 Implement custom trigger for recurring transactions 2022-12-29 15:42:02 +01:00
James Cole 85a2a87806 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	composer.lock
 2022-12-29 11:36:07 +01:00
James Cole 3666ef8c59 Fix piggy views. 2022-12-29 11:29:00 +01:00
James Cole bb11e61034 Clean up liability overview. 2022-12-27 07:01:13 +01:00
James Cole 80762616f3 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	app/Api/V1/Controllers/Models/AvailableBudget/DestroyController.php
#	config/firefly.php
#	frontend/package.json
#	frontend/src/i18n/fr_FR/index.js
#	frontend/src/i18n/pt_BR/index.js
#	frontend/src/i18n/ru_RU/index.js
#	frontend/src/i18n/sl_SI/index.js
#	frontend/src/i18n/zh_CN/index.js
#	frontend/yarn.lock
#	public/v3/index.html
#	public/v3/js/1473.9b55dc17.js
#	public/v3/js/150.35592a2c.js
#	public/v3/js/1501.3980515e.js
#	public/v3/js/1543.010ec22e.js
#	public/v3/js/1730.207e6e59.js
#	public/v3/js/1864.d9ea853e.js
#	public/v3/js/1951.a5d70097.js
#	public/v3/js/2106.33b7eabd.js
#	public/v3/js/2124.bfc4091d.js
#	public/v3/js/2194.4baebc21.js
#	public/v3/js/2372.f07615ae.js
#	public/v3/js/2407.747d87e4.js
#	public/v3/js/2476.8af9976c.js
#	public/v3/js/2686.5e278d64.js
#	public/v3/js/2700.1251f369.js
#	public/v3/js/3232.0964e736.js
#	public/v3/js/3903.4e461032.js
#	public/v3/js/4640.601878ff.js
#	public/v3/js/4782.e1382ab6.js
#	public/v3/js/4851.3c27e6c7.js
#	public/v3/js/5221.fded0f96.js
#	public/v3/js/5266.e820dd38.js
#	public/v3/js/5348.109b8049.js
#	public/v3/js/5439.d75e5cb4.js
#	public/v3/js/5724.8b5fcafb.js
#	public/v3/js/576.e26ddde9.js
#	public/v3/js/6072.21c05085.js
#	public/v3/js/6323.69d55ffd.js
#	public/v3/js/6676.60b155c0.js
#	public/v3/js/6691.80040366.js
#	public/v3/js/6719.f9d4744f.js
#	public/v3/js/6826.74ed4602.js
#	public/v3/js/6882.c5970da7.js
#	public/v3/js/6919.cc55656e.js
#	public/v3/js/7044.96c481ac.js
#	public/v3/js/7083.c223af4f.js
#	public/v3/js/7222.86a095eb.js
#	public/v3/js/7480.b9bd8fed.js
#	public/v3/js/7499.c362f695.js
#	public/v3/js/7544.47af6552.js
#	public/v3/js/7552.ebdf1aef.js
#	public/v3/js/7586.29cf8776.js
#	public/v3/js/7697.4338f28d.js
#	public/v3/js/773.ff7cb3ef.js
#	public/v3/js/7919.910d5ebb.js
#	public/v3/js/7956.3e1c81cf.js
#	public/v3/js/8044.169b21f8.js
#	public/v3/js/8218.966b669d.js
#	public/v3/js/8344.119567b0.js
#	public/v3/js/8376.477a5508.js
#	public/v3/js/8387.a4c1d7d6.js
#	public/v3/js/8405.62235b41.js
#	public/v3/js/8493.48ada210.js
#	public/v3/js/8611.3ab24e6d.js
#	public/v3/js/8907.233f4719.js
#	public/v3/js/8928.8127fcdf.js
#	public/v3/js/9009.d0e97de6.js
#	public/v3/js/9038.06ad98ab.js
#	public/v3/js/9069.e81f039c.js
#	public/v3/js/9287.bc57ab91.js
#	public/v3/js/9597.0c124ce8.js
#	public/v3/js/9606.ce293dd2.js
#	public/v3/js/app.13f6ce91.js
#	public/v3/js/chunk-common.98b27fd7.js
#	public/v3/js/vendor.92714ea3.js
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sl.json
#	resources/assets/js/locales/zh-cn.json
#	resources/lang/de_DE/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/pt_BR/firefly.php
#	resources/lang/sl_SI/firefly.php
#	resources/lang/zh_CN/firefly.php
 2022-12-24 17:34:20 +01:00
James Cole 7e63700ca2 Update JSON and JS 2022-12-24 10:18:50 +01:00
James Cole 2d9a3f5fc6 Updated translations 2022-12-24 09:53:54 +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
Janne Heß dcfcbfd9b5 Add search support for SEPA CT 2022-11-27 19:46:45 +01:00
James Cole acd9685578 Merge branch 'develop' into 5.8-dev 2022-11-04 05:50:12 +01:00
James Cole 15994c8c56 Add missing locale data 2022-11-04 05:49:46 +01:00
James Cole b942f351f8 Fix https://github.com/firefly-iii/firefly-iii/issues/6597 2022-11-04 05:49:32 +01:00
James Cole 817a9f57c4 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	config/firefly.php
#	frontend/src/i18n/bg_BG/index.js
#	frontend/src/i18n/cs_CZ/index.js
#	frontend/src/i18n/da_DK/index.js
#	frontend/src/i18n/de_DE/index.js
#	frontend/src/i18n/el_GR/index.js
#	frontend/src/i18n/en_GB/index.js
#	frontend/src/i18n/en_US/index.js
#	frontend/src/i18n/es_ES/index.js
#	frontend/src/i18n/fi_FI/index.js
#	frontend/src/i18n/fr_FR/index.js
#	frontend/src/i18n/hu_HU/index.js
#	frontend/src/i18n/id_ID/index.js
#	frontend/src/i18n/it_IT/index.js
#	frontend/src/i18n/ja_JP/index.js
#	frontend/src/i18n/nb_NO/index.js
#	frontend/src/i18n/nl_NL/index.js
#	frontend/src/i18n/pl_PL/index.js
#	frontend/src/i18n/pt_BR/index.js
#	frontend/src/i18n/pt_PT/index.js
#	frontend/src/i18n/ro_RO/index.js
#	frontend/src/i18n/ru_RU/index.js
#	frontend/src/i18n/sk_SK/index.js
#	frontend/src/i18n/sl_SI/index.js
#	frontend/src/i18n/sv_SE/index.js
#	frontend/src/i18n/tr_TR/index.js
#	frontend/src/i18n/uk_UA/index.js
#	frontend/src/i18n/vi_VN/index.js
#	frontend/src/i18n/zh_CN/index.js
#	frontend/src/i18n/zh_TW/index.js
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/bg.json
#	resources/assets/js/locales/cs.json
#	resources/assets/js/locales/da.json
#	resources/assets/js/locales/de.json
#	resources/assets/js/locales/el.json
#	resources/assets/js/locales/en-gb.json
#	resources/assets/js/locales/en.json
#	resources/assets/js/locales/es.json
#	resources/assets/js/locales/fi.json
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/hu.json
#	resources/assets/js/locales/id.json
#	resources/assets/js/locales/it.json
#	resources/assets/js/locales/ja.json
#	resources/assets/js/locales/nb.json
#	resources/assets/js/locales/nl.json
#	resources/assets/js/locales/pl.json
#	resources/assets/js/locales/pt.json
#	resources/assets/js/locales/ro.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sk.json
#	resources/assets/js/locales/sl.json
#	resources/assets/js/locales/sv.json
#	resources/assets/js/locales/tr.json
#	resources/assets/js/locales/uk.json
#	resources/assets/js/locales/vi.json
#	resources/assets/js/locales/zh-cn.json
#	resources/assets/js/locales/zh-tw.json
#	yarn.lock
 2022-11-02 05:00:59 +01:00
James Cole 7bb2f96ae2 Update meta files for new release. 2022-11-02 04:57:15 +01:00
James Cole e7e3370baa Fix https://github.com/firefly-iii/firefly-iii/issues/6581 2022-10-31 20:12:19 +01:00
James Cole d28326cc89 Restore todo's 2022-10-30 11:43:17 +01:00
James Cole e3181e90df Fix https://github.com/firefly-iii/firefly-iii/issues/6130 2022-10-30 06:45:56 +01:00
James Cole 486f25cd96 Update translations. 2022-10-29 07:59:49 +02:00
James Cole 612a395eb2 Merge branch 'develop' into 5.8-dev 2022-10-26 05:50:42 +02:00
James Cole a3b4d5ff62 Add missing locale data. 2022-10-26 05:50:06 +02:00
James Cole b613b56d1e Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	resources/views/list/groups.twig
 2022-10-24 19:59:26 +02:00
James Cole 6b7fc03f02 Fix style 2022-10-24 19:58:49 +02:00
James Cole 5999ee406c Fix style 2022-10-24 19:58:12 +02:00
James Cole e348127770 Merge branch 'develop' into 5.8-dev 2022-10-24 19:53:42 +02:00
James Cole b60a3be34b Fix style 2022-10-24 19:53:19 +02:00
James Cole e3bdc62ac4 Merge branch 'develop' into 5.8-dev 2022-10-24 19:48:13 +02:00
James Cole 83b8fdba05 Fix #6564 2022-10-24 19:42:06 +02:00
James Cole b21461c824 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	resources/views/auth/login.twig
#	resources/views/auth/mfa.twig
#	resources/views/auth/passwords/email.twig
#	resources/views/auth/passwords/reset.twig
#	resources/views/auth/register.twig
 2022-10-24 19:35:47 +02:00
James Cole d4738b21ab Make sure form elements are not spell checked. 2022-10-23 17:36:26 +02:00
James Cole f4af19e121 Merge branch 'develop' into 5.8-dev 
# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js
#	resources/assets/js/locales/pt-br.json
#	resources/lang/pt_BR/firefly.php
#	yarn.lock
 2022-10-23 14:49:54 +02:00
James Cole e229bd8121 Updated translations. 2022-10-22 07:34:05 +02:00
James Cole d31fa743d0 Add ability to set some transaction flags. Fixes #6526 2022-10-22 07:30:12 +02:00