| 
							
							
								 James Cole | 6829003f5e | Change to safer hash methods. | 2020-04-11 06:42:21 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5445752588 | Update some phpdocs, courtesy of Psalm. | 2020-03-25 07:03:23 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 2b6c3fd743 | Code cleanup that (hopefully) matches style CI | 2020-03-17 15:01:00 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 3771cc3b75 | Update email address | 2020-01-31 07:32:04 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 92158e52ef | Update copyright of Firefly III to the GNU Affero General Public License as suggested by @nxxxse in #2607. This applies to all code in this commit from this moment onwards. | 2019-10-02 06:37:26 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5fb7635100 | Remove double lines from code. | 2019-08-28 16:28:14 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 23479790fe | Code cleanup | 2019-08-17 10:47:10 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | c32f3254c5 | Make sure 2FA works as expected. | 2019-08-08 17:52:37 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 2147caf3ef | Fix tests | 2019-08-04 11:12:24 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | a328d393d3 | Clear cache | 2019-08-04 07:29:31 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | d38766e5db | Firefly III can generate new backup codes. | 2019-08-04 07:21:11 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 616d921bef | Can disable MFA | 2019-08-04 07:09:51 +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 | 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 | 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 | b7a4b0fdfd | Refactored a lot of tests. | 2019-07-21 17:15:06 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 71fb9d8fa5 | Code cleaning stuff. | 2019-02-13 17:38:41 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 2a30293905 | Improve test coverage. | 2018-12-12 20:30:25 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 0d36d43eda | Initial code for LDAP authentication. | 2018-10-13 15:06:56 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 33fe6dbfa3 | First step in improving test coverage. | 2018-08-30 20:58:07 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | b605ede74e | Move methods to traits. | 2018-08-10 17:05:37 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5908b4b000 | Route fixes and fix tests. | 2018-08-09 19:44:36 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 9865800e39 | Refactor many request related methods into (complex) trait. | 2018-08-09 17:46:14 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 7943164375 | Change scope of methods, add some notes. Prep for refactoring. | 2018-08-09 16:07:33 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5908c0ce8c | Code cleanup and realign. | 2018-08-06 19:14:30 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 4d5bdd25a8 | Add phpdocs everywhere. | 2018-07-22 08:10:16 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 44fb307da4 | Code cleanup. | 2018-07-20 14:34:56 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 7b41c5b301 | Cast all translations to strings. | 2018-07-15 09:38:49 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 89834baf01 | Refactor references to static facades. Improve budget controller code. | 2018-07-14 16:08:34 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 2b4088c5f7 | Some code cleanup. | 2018-07-13 15:50:42 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5665f127aa | Improve code quality. | 2018-07-09 19:24:08 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | b315882f58 | Various code cleanup. | 2018-07-08 12:08:53 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 2f2f907ffe | Various code optimalisations. | 2018-07-08 07:59:58 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | c9356c1237 | Restructure code to rename a variable. | 2018-06-30 05:21:21 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 793cfcb2c5 | Code for #1503 | 2018-06-23 17:59:37 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | a7b8470d9e | Expand test coverage. | 2018-06-01 22:04:52 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | f78b8f9267 | Some code for #1272 | 2018-04-24 19:26:16 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 36a5f17af2 | Code cleanup as described in #1272 | 2018-04-22 17:12:22 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 8032684ad0 | Some code cleanup for #1272 | 2018-04-22 17:10:11 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | d48fb3ba55 | Create keys by hand if not existing. | 2018-04-02 15:26:33 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 8c024a1ae9 | Create default token if none exist. | 2018-04-02 15:17:03 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | a3c34e6b3c | Code cleanup | 2018-04-02 15:10:40 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 720dcb0fe5 | Fix #1300 | 2018-03-27 19:29:58 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | b12872e5de | Various code cleanup. | 2018-03-11 16:24:07 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | aad0864018 | Various code cleanup [skip ci] | 2018-03-10 22:38:20 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | dff2d716a1 | Move 2FA to profile #1153 | 2018-03-09 05:45:22 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 8bd76d1ff0 | Various code cleanup. | 2017-12-22 18:32:43 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | a69aad878e | Fix #1056 | 2017-12-19 19:25:50 +01:00 |  |