| 
							
							
								 James Cole | 22ab9ebb2f | Included tests for the category controller. | 2015-04-05 19:43:20 +02:00 |  | 
			
				
					| 
							
							
								 Balazs Varkonyi | 28216cbcb5 | Removed merge conflict from CategoryController | 2015-04-04 01:56:19 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | a115960411 | Merge branch 'release/3.3.6' Conflicts:
	app/Http/Controllers/CategoryController.php | 2015-04-03 23:31:29 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 83f32478fa | Fixed more redirections. | 2015-04-01 09:43:19 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | bea321939e | Code rearrange and optimise. | 2015-03-29 21:27:51 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | fcc22c692a | Merge branch 'release/3.3.3' | 2015-03-27 09:36:03 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | a83fe2caea | Correct ordering (everywhere). | 2015-03-27 07:32:06 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | fcc47b58b4 | Return to edit / create screen when user indicates. | 2015-03-26 17:45:03 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | a867b60af0 | Update CategoryController.php | 2015-03-25 16:14:28 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 26eafb0bd2 | Update CategoryController.php | 2015-03-25 16:13:39 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 0b028a8923 | Correctly order account names. | 2015-03-10 17:26:31 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 1139f950ed | Fixed some views. | 2015-03-04 21:11:47 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | f5437a17f8 | Lots of changes. | 2015-03-04 09:42:47 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 8f578ed95a | Search controller. | 2015-02-27 11:09:23 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | d36b2318fd | New code for bills. | 2015-02-25 15:19:14 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | d83b508bbc | Add and remove transactions. | 2015-02-24 22:53:38 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 5a0a28a04c | Stuff for categories. | 2015-02-22 16:19:32 +01:00 |  |