James Cole 
							
						 
					 
					
						
						
							
						
						7e67eb17e0 
					 
					
						
						
							
							All new translations for  #218  
						
						
						
						
					 
					
						2016-03-20 11:38:01 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						ef6ef57e67 
					 
					
						
						
							
							Various code cleanup things.  
						
						
						
						
					 
					
						2016-03-19 16:51:52 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						0404735ccb 
					 
					
						
						
							
							This is the cleaned up version of the controller  #219  
						
						
						
						
					 
					
						2016-03-19 16:24:35 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						a29eb9b993 
					 
					
						
						
							
							This is the controller for two factor authentication.  #219  
						
						
						
						
					 
					
						2016-03-19 16:22:57 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						8f3572f2d3 
					 
					
						
						
							
							Correctly save 2fa secret.  
						
						
						
						
					 
					
						2016-03-19 07:59:55 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						fb165ef28b 
					 
					
						
						
							
							Do not give the user the secret.  
						
						
						
						
					 
					
						2016-03-19 07:56:57 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						a26acf4a25 
					 
					
						
						
							
							Clean up mail thing.  
						
						
						
						
					 
					
						2016-03-18 20:30:07 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						645400e17f 
					 
					
						
						
							
							Clean up mail thing.  
						
						
						
						
					 
					
						2016-03-18 20:29:51 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						f6303deaa4 
					 
					
						
						
							
							Error when blocked user logs in  
						
						
						
						
					 
					
						2016-03-18 11:22:58 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						d3a3083b85 
					 
					
						
						
							
							Error when blocked user logs in  
						
						
						
						
					 
					
						2016-03-18 11:20:54 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						fca21bab4d 
					 
					
						
						
							
							Error when blocked user logs in  
						
						
						
						
					 
					
						2016-03-18 11:16:05 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						9c58b77f01 
					 
					
						
						
							
							Error when blocked user logs in  
						
						
						
						
					 
					
						2016-03-18 11:10:51 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						b5c5f67fcc 
					 
					
						
						
							
							Catch possible NULL  
						
						
						
						
					 
					
						2016-03-18 10:53:59 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						fe9b8e834d 
					 
					
						
						
							
							Change the precision. Should not influence anything.  
						
						
						
						
					 
					
						2016-03-16 17:47:07 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						a220094941 
					 
					
						
						
							
							Remove param doc. [skip ci]  
						
						... 
						
						
						
						Signed-off-by: James Cole <thegrumpydictator@gmail.com > 
						
						
					 
					
						2016-03-14 21:03:35 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						ababdacf89 
					 
					
						
						
							
							Some code cleanup  
						
						... 
						
						
						
						Signed-off-by: James Cole <thegrumpydictator@gmail.com > 
						
						
					 
					
						2016-03-14 20:53:56 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						114dd5fc2a 
					 
					
						
						
							
							Rename method.  
						
						... 
						
						
						
						Signed-off-by: James Cole <thegrumpydictator@gmail.com > 
						
						
					 
					
						2016-03-14 20:52:08 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						631bafc6ab 
					 
					
						
						
							
							Small bug fixes.  
						
						
						
						
					 
					
						2016-03-14 20:47:13 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						be58da539e 
					 
					
						
						
							
							Fix various small issues.  
						
						
						
						
					 
					
						2016-03-14 20:38:23 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						ce80fb39e8 
					 
					
						
						
							
							Fix for  #185  
						
						
						
						
					 
					
						2016-03-12 14:20:45 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						2f19ff314b 
					 
					
						
						
							
							Fix for  #185  
						
						
						
						
					 
					
						2016-03-12 14:18:28 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						a0fd4b505a 
					 
					
						
						
							
							Fix for  #185  
						
						
						
						
					 
					
						2016-03-12 11:07:54 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						919aa70251 
					 
					
						
						
							
							Account controller  #185  
						
						
						
						
					 
					
						2016-03-12 11:05:26 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						1aea4045a3 
					 
					
						
						
							
							Fixes   #151  
						
						
						
						
					 
					
						2016-03-12 07:44:20 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						c26bf557d0 
					 
					
						
						
							
							Controller can let you edit new dates  #122  
						
						
						
						
					 
					
						2016-03-12 07:37:00 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						5d50f92dd3 
					 
					
						
						
							
							Issue  #208  
						
						
						
						
					 
					
						2016-03-12 07:04:47 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						5310ccebbe 
					 
					
						
						
							
							New ability to disable 2fa.  
						
						... 
						
						
						
						Signed-off-by: James Cole <thegrumpydictator@gmail.com > 
						
						
					 
					
						2016-03-07 20:28:26 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						ccd55257cd 
					 
					
						
						
							
							Add php doc.  
						
						... 
						
						
						
						Signed-off-by: James Cole <thegrumpydictator@gmail.com > 
						
						
					 
					
						2016-03-07 20:19:05 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						583687f3a7 
					 
					
						
						
							
							Better FF name for multiple accounts.  
						
						
						
						
					 
					
						2016-03-07 20:17:43 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						e06dc86bf7 
					 
					
						
						
							
							Fix some logic in the preferences controller.  
						
						
						
						
					 
					
						2016-03-07 20:14:24 +01:00 
						 
				 
			
				
					
						
							
							
								zjean 
							
						 
					 
					
						
						
							
						
						0c009445d4 
					 
					
						
						
							
							Added 2fa code validation  
						
						
						
						
					 
					
						2016-03-03 21:14:53 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						4a9b693da8 
					 
					
						
						
							
							Fix sum [skip ci]  
						
						
						
						
					 
					
						2016-03-03 10:39:11 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						fff35aa820 
					 
					
						
						
							
							Reinstated sum of tag.  
						
						
						
						
					 
					
						2016-03-03 10:37:06 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						fcf16051a2 
					 
					
						
						
							
							Some general code cleanup.  
						
						
						
						
					 
					
						2016-03-03 08:29:56 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						2606d77c62 
					 
					
						
						
							
							Fix show tag [skip ci]  
						
						
						
						
					 
					
						2016-03-02 20:40:43 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						7234f011ec 
					 
					
						
						
							
							Clean up method relying on old transaction journal code.  
						
						
						
						
					 
					
						2016-03-02 20:11:28 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						5b949d6e00 
					 
					
						
						
							
							Move some stuff around.  
						
						
						
						
					 
					
						2016-03-02 19:41:22 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						9b69a6addd 
					 
					
						
						
							
							Lots of todo's [skip ci]  
						
						
						
						
					 
					
						2016-03-02 13:51:56 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						500243b0b3 
					 
					
						
						
							
							This fixes most of the tests.  
						
						
						
						
					 
					
						2016-03-02 13:37:28 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						3ef84dc1fc 
					 
					
						
						
							
							Cleanup and fix tests.  
						
						
						
						
					 
					
						2016-03-02 13:13:33 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						bbfc962727 
					 
					
						
						
							
							Include tags in multi year report [skip ci]  
						
						
						
						
					 
					
						2016-03-02 07:08:08 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						01be5e3e23 
					 
					
						
						
							
							Tag report.  
						
						
						
						
					 
					
						2016-03-01 21:31:25 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						8e45959483 
					 
					
						
						
							
							#193  forgot to change file size thing.  
						
						
						
						
					 
					
						2016-02-25 15:06:01 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						6858d67897 
					 
					
						
						
							
							#193  
						
						
						
						
					 
					
						2016-02-25 15:04:17 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						9b23cbd2c2 
					 
					
						
						
							
							#193  
						
						
						
						
					 
					
						2016-02-25 15:02:05 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						69a8cad47b 
					 
					
						
						
							
							Attachment download (issue  #193 )  
						
						
						
						
					 
					
						2016-02-25 14:53:26 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						ecefcfabc0 
					 
					
						
						
							
							This is a partial fix for issue  #151 . It does not filter on account selection.  
						
						
						
						
					 
					
						2016-02-24 17:37:08 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						8e42e71528 
					 
					
						
						
							
							End of month...  
						
						
						
						
					 
					
						2016-02-24 16:01:08 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						a2275ae111 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/JC5/firefly-iii  into develop  
						
						... 
						
						
						
						# By Robert Horlings
# Via James Cole (2) and Robert Horlings (1)
* 'develop' of https://github.com/JC5/firefly-iii :
  Bugfix for a bug when adding a tag in a rule
  Bugfix in redirect after creating a new rule 
						
						
					 
					
						2016-02-24 14:49:42 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						3976803d8f 
					 
					
						
						
							
							Same method of determining the applicable range as the "no category" view. Thanks to @roberthorlings in issue  #151  
						
						
						
						
					 
					
						2016-02-24 14:49:36 +01:00