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 
						 
				 
			
				
					
						
							
							
								Robert Horlings 
							
						 
					 
					
						
						
							
						
						9ce9caba02 
					 
					
						
						
							
							Bugfix in redirect after creating a new rule  
						
						
						
						
					 
					
						2016-02-24 10:21:04 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						07f4995c8f 
					 
					
						
						
							
							First start of new report.  
						
						
						
						
					 
					
						2016-02-23 20:23:10 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						8200c7248a 
					 
					
						
						
							
							Helper for help text.  
						
						
						
						
					 
					
						2016-02-23 20:22:53 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						bd9f1d5398 
					 
					
						
						
							
							Rename export date range in other forms. Makes the rule group runner by @roberthorlings more consistent.  
						
						
						
						
					 
					
						2016-02-23 19:59:41 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						35863c8d3a 
					 
					
						
						
							
							This should fix the tests.  
						
						
						
						
					 
					
						2016-02-23 17:55:56 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						f716692591 
					 
					
						
						
							
							New route and method. Work in progress.  
						
						
						
						
					 
					
						2016-02-23 16:15:53 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						28a4f724d5 
					 
					
						
						
							
							Use Requests library to get help from Github.  
						
						
						
						
					 
					
						2016-02-23 16:12:59 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						61efabb3b5 
					 
					
						
						
							
							Added sub title  
						
						
						
						
					 
					
						2016-02-23 16:02:37 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						594f9822c7 
					 
					
						
						
							
							Fix parameters, re-order.  
						
						
						
						
					 
					
						2016-02-23 15:54:13 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Horlings 
							
						 
					 
					
						
						
							
						
						59127e4029 
					 
					
						
						
							
							Added button to specify parameters and execute the job  
						
						
						
						
					 
					
						2016-02-23 14:18:09 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						ad8d945c1d 
					 
					
						
						
							
							Make sure all the users accounts are included so internal transfers are ignored. [skip ci]  
						
						
						
						
					 
					
						2016-02-23 09:22:18 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						3f829a3114 
					 
					
						
						
							
							Restore original functionality.  
						
						
						
						
					 
					
						2016-02-23 07:31:01 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						deeeb06488 
					 
					
						
						
							
							Added debug info to the export routine.  
						
						
						
						
					 
					
						2016-02-23 06:39:01 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						2ddacf48d4 
					 
					
						
						
							
							Removed unused parameter and added caching. [skip ci]  
						
						
						
						
					 
					
						2016-02-18 10:12:07 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						2e7c26c539 
					 
					
						
						
							
							New chart called "net worth".  
						
						
						
						
					 
					
						2016-02-18 10:04:53 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						31d6789ff0 
					 
					
						
						
							
							Type hinting.  
						
						
						
						
					 
					
						2016-02-18 06:54:50 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						651297fa0b 
					 
					
						
						
							
							Method can be private.  
						
						
						
						
					 
					
						2016-02-18 06:29:04 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						1b2873fc5f 
					 
					
						
						
							
							Some phpdoc.  
						
						
						
						
					 
					
						2016-02-18 06:28:46 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						1bcc975d7b 
					 
					
						
						
							
							Some new phpDoc and refactoring.  
						
						
						
						
					 
					
						2016-02-18 06:15:01 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						98fd5b8858 
					 
					
						
						
							
							Invert stuff so chart works again.  
						
						
						
						
					 
					
						2016-02-17 22:35:57 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						a178fed0c6 
					 
					
						
						
							
							Code cleanup courtesy of Scrutiniser CI.  
						
						
						
						
					 
					
						2016-02-17 21:55:00 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						b1c2f8faa1 
					 
					
						
						
							
							Various code cleaning things.  
						
						
						
						
					 
					
						2016-02-17 21:14:32 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						6c22bad77a 
					 
					
						
						
							
							Revamped a part of the rule test code.  
						
						... 
						
						
						
						- clean way of constructing triggers
- processor can be constructed in a number of ways.
- cleaner transaction matcher using collections instead of arrays 
						
						
					 
					
						2016-02-17 21:03:59 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						1902787104 
					 
					
						
						
							
							Removed constructor.  
						
						
						
						
					 
					
						2016-02-17 20:23:53 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						b3e32db073 
					 
					
						
						
							
							Rename variables.  
						
						
						
						
					 
					
						2016-02-17 20:23:14 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						01d53bdb85 
					 
					
						
						
							
							Use request instead of complex method.  
						
						
						
						
					 
					
						2016-02-17 20:22:25 +01:00 
						 
				 
			
				
					
						
							
							
								James Cole 
							
						 
					 
					
						
						
							
						
						f9e2a677d9 
					 
					
						
						
							
							Offload stuff to repositories for rules and rule groups, see issue  #185  
						
						
						
						
					 
					
						2016-02-17 17:27:41 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Horlings 
							
						 
					 
					
						
						
							
						
						919187f7fd 
					 
					
						
						
							
							Made performance settings for testing triggers configurable  
						
						
						
						
					 
					
						2016-02-17 16:39:26 +01:00