12043 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
James Cole	564f00561e	New language!	2019-08-08 17:04:17 +02:00
James Cole	c27db00550	Updated strings.	2019-08-08 17:04:06 +02:00
James Cole	717d1a3612	Getting close enough for inclusion.	2019-08-08 17:03:19 +02:00
James Cole	9bd238b45f	Switch some fields.	2019-08-07 18:52:42 +02:00
James Cole	d81128d8c6	Fix help for transaction thing.	2019-08-07 18:51:35 +02:00
James Cole	bdf76cf9b2	Reference .env file.	2019-08-06 19:24:25 +02:00
James Cole	aabf8ce8cc	Fix redirect in link controller.	2019-08-06 19:23:18 +02:00
James Cole	8bcf8095a9	Switch around text [skip ci]	2019-08-06 05:42:15 +02:00
James Cole	efc6b0e45a	Add a todo [skip ci]	2019-08-06 05:39:05 +02:00
James Cole	00d785d891	New middleware that should make sure the new forms redirect as well.	2019-08-05 19:45:20 +02:00
James Cole	e37100ae97	Sync between command line and FF	2019-08-05 17:07:19 +02:00
James Cole	a077d58e9c	Update libraries, add some views.	2019-08-04 19:54:31 +02:00
James Cole	cc56a981cd	Fix problem with type of transaction.	2019-08-04 17:26:00 +02:00
James Cole	2147caf3ef	Fix tests	2019-08-04 11:12:24 +02:00
James Cole	62b5cf04ad	Refactor tests and code to handle new 2FA methods.	2019-08-04 10:27:37 +02:00
James Cole	d3be043aa7	Some experimental docker changes.	2019-08-04 08:01:13 +02:00
James Cole	933f02d1d9	Extra upgrade text.	2019-08-04 07:43:01 +02:00
James Cole	02c92318fb	One command to upgrade, not 27	2019-08-04 07:41:32 +02:00
James Cole	a328d393d3	Clear cache	2019-08-04 07:29:31 +02:00
James Cole	a06868b0c3	Add element for cash account.	2019-08-04 07:29:25 +02:00
James Cole	d38766e5db	Firefly III can generate new backup codes.	2019-08-04 07:21:11 +02:00
James Cole	e41211bed7	Can use backup codes to login.	2019-08-04 07:10:18 +02:00
James Cole	0b6c3efe8d	Can now disable MFA	2019-08-04 07:10:05 +02:00
James Cole	616d921bef	Can disable MFA	2019-08-04 07:09:51 +02:00
James Cole	ea52a52022	New MFA submit routine with history.	2019-08-04 07:00:47 +02:00
James Cole	cc76be1aad	Enable the creation of a MFA token in users auth app, and store the MFA secret in profile.	2019-08-03 20:09:09 +02:00
James Cole	2554840714	Index can now handle new MFA method.	2019-08-03 19:57:24 +02:00
James Cole	e1e351aad7	Add new MFA middleware	2019-08-03 19:54:30 +02:00
James Cole	e9de7bbf15	Disable the MFA middleware.	2019-08-03 19:53:30 +02:00
James Cole	2bf3bdb3de	Basic MFA view	2019-08-03 19:49:38 +02:00
James Cole	0a2bc99630	Republish configuration file, and edit it.	2019-08-03 19:49:32 +02:00
James Cole	7f1bd19e45	remove "twoFactorAuthEnabled" from preferences. Kill switches for all code that references them (easier for refactor)	2019-08-03 19:46:12 +02:00
James Cole	f8d2292fa8	Upgrade libraries.	2019-08-03 19:35:20 +02:00
James Cole	b0bd35503f	Add MFA code in prep of new MFA routine	2019-08-03 19:19:55 +02:00
James Cole	0b8427f881	Add some TODO's, refactor some code.	2019-08-03 19:17:59 +02:00
James Cole	cf121fea50	Improve test coverage.	2019-08-03 14:45:37 +02:00
James Cole	75c2529d3e	Improve test coverage.	2019-08-03 10:50:43 +02:00
James Cole	b8b59b13a7	Allow bread crumb for bills.	2019-08-03 08:33:05 +02:00
James Cole	12c1fa2367	Add new search keywords	2019-08-03 08:32:55 +02:00
James Cole	febaab62f7	Various fixes. Sorry, lazy day.	2019-08-03 06:27:56 +02:00
James Cole	43dbad4e4c	Merge tag '4.7.17.6' into develop ... 4.7.17.6 # Conflicts: # .travis.yml # app/Http/Controllers/Import/JobConfigurationController.php # app/Http/Controllers/Transaction/SingleController.php # config/firefly.php	2019-08-03 05:11:58 +02:00
James Cole	2089ee14e9	Merge branch 'hotfix/4.7.17.6'	2019-08-03 05:10:21 +02:00
James Cole	ec8e1d5a7a	Version update	2019-08-03 05:10:06 +02:00
James Cole	2d7494f8cd	Fix similar XSS issues.	2019-08-03 05:08:35 +02:00
James Cole	8717f469b1	Fix #2370	2019-08-03 05:08:20 +02:00
James Cole	40dd2e0f7f	Improve test coverage.	2019-08-03 04:46:47 +02:00
James Cole	00dee03709	Update version again.	2019-08-02 21:21:38 +02:00
James Cole	ca9f8b56f7	Merge tag '4.7.17.5' into develop ... 4.7.17.5 # Conflicts: # resources/views/v1/transactions/convert.twig	2019-08-02 20:59:57 +02:00
James Cole	ece0c99dbb	Merge branch 'hotfix/4.7.17.5'	2019-08-02 20:59:23 +02:00
James Cole	b217acfe26	New version + correct credits.	2019-08-02 20:59:06 +02:00