| 
							
							
								 James Cole | 53c7c6685b | New language! | 2019-08-08 17:05:13 +02:00 |  | 
			
				
					| 
							
							
								 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 | 00d785d891 | New middleware that should make sure the new forms redirect as well. | 2019-08-05 19:45:20 +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 | 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 | 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 | 2bf3bdb3de | Basic MFA view | 2019-08-03 19:49:38 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 0b8427f881 | Add some TODO's, refactor some code. | 2019-08-03 19:17:59 +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 | 2d7494f8cd | Fix similar XSS issues. | 2019-08-03 05:08:35 +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 | 15d4d185bb | Fix #2363 | 2019-08-02 20:57:36 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 3435cb937c | Merge tag '4.7.17.4' into develop 4.7.17.4
# Conflicts:
#	config/firefly.php
#	resources/views/v1/transactions/convert.twig | 2019-08-02 17:10:55 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 2ddf48f15c | Fix #2366 | 2019-08-02 16:46:45 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 3ad4e04e2a | Fix #2364 | 2019-08-02 16:43:36 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 427de0594d | Fix #2363 | 2019-08-02 16:42:16 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 6ac08de71d | First steps for reconciliation fix. | 2019-08-02 16:31:36 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 3dbde59787 | Fix #2331 | 2019-08-02 05:44:51 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | ac903b88ba | Fix search | 2019-08-02 05:32:30 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | fc70afa3ea | Improve test coverage. | 2019-08-02 05:25:24 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 81dce5d7c7 | Fix #2179 | 2019-08-01 06:22:07 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5524941c90 | Update rule handling and views. | 2019-07-27 15:01:13 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | d94d34ca63 | Expand test coverage. | 2019-07-26 17:48:24 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 1e7e0facf1 | Improve test coverage. | 2019-07-22 19:23:14 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 58d370a893 | Fix #1860 | 2019-07-20 22:32:32 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 3b8e95fcca | Fix #1652 | 2019-07-20 16:48:35 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 889b7e9a18 | Improve mass controller and test controllers. | 2019-07-20 16:02:50 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 6d34cfb940 | Implemented new link thing. | 2019-07-20 06:47:34 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 4de537ce76 | New code for edit transaction, and some tests. | 2019-07-19 16:08:42 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | a42992efb0 | Merge tag '4.7.17.3' into develop 4.7.17.3
# Conflicts:
#	changelog.md
#	config/firefly.php | 2019-07-16 19:24:07 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | f795cb07e1 | Fixes #2339 | 2019-07-16 19:22:35 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 17a66b3056 | Fixes #2337 | 2019-07-16 19:22:14 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 2772a1bb3b | Now supports file uploads | 2019-07-15 21:00:35 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 24efe9a096 | Attempt to fix uploads. | 2019-07-13 20:58:00 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 7fd3f77c3e | Make sure the convert controller works again. | 2019-07-05 19:43:16 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 3c5c14ff5a | Refactored the bulk edit controller. | 2019-07-04 17:31:47 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5bbe1eab7c | Expand test coverage and improve transaction management code. | 2019-07-01 20:22:35 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 6197c77303 | Improve recurrences | 2019-06-29 19:47:40 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | cf904eb677 | Big bunch of code to improve test coverage. | 2019-06-25 19:24:01 +02:00 |  | 
			
				
					| 
							
							
								 Sander Kleykens | 9e9e5bd6dd | CSV file fix for ING Belgium Parse the description and opposing account information (IBAN and name) from ING Belgium CSV files. | 2019-06-23 22:24:52 +02:00 |  |