| 
							
							
								 James Cole | d25d0454fc | Code clean up | 2016-09-16 12:15:58 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | f38984398d | Code clean up [skip ci] | 2016-09-16 12:07:45 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | fccdf56c5d | Fixed some query things. | 2016-09-16 09:09:54 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 629baf9de5 | Added invoice date Signed-off-by: James Cole <thegrumpydictator@gmail.com> | 2016-09-10 18:36:52 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 176752e219 | Code for optional fields #301 Signed-off-by: James Cole <thegrumpydictator@gmail.com> | 2016-09-09 11:19:40 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5c7df5c04d | Copyright notices. [skip ci] Signed-off-by: James Cole <thegrumpydictator@gmail.com> | 2016-05-20 12:41:23 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 7dd858be39 | Fix bugs. | 2016-05-20 11:27:41 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 66d7fd7d4c | Declare strict types. | 2016-05-20 08:57:45 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | dda3082c7e | Some code cleanup. | 2016-05-20 08:00:35 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 962965b5b7 | Code cleanup. | 2016-05-15 18:36:40 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | aa59227786 | Fixed transactions and attachments. | 2016-05-13 09:55:06 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 7c39a04c4b | Cleanup. | 2016-05-11 17:33:22 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 934656c954 | Some small changes. | 2016-05-11 07:57:16 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | d233a2df3c | Merge branch 'develop' of https://github.com/JC5/firefly-iii into develop * 'develop' of https://github.com/JC5/firefly-iii:
  Should fix frontpage.
# Conflicts:
#	app/Models/TransactionJournal.php
#	app/Repositories/Account/AccountRepository.php | 2016-05-11 06:08:05 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 7c7740d3ba | Should fix frontpage. | 2016-05-10 09:33:23 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 6d944ec98f | More cleanup for budgets. | 2016-05-06 06:15:46 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | eb3d2b1749 | Building split transactions and fixing tests. | 2016-05-05 18:59:46 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 1fd7852309 | Fix query thing. | 2016-04-30 20:24:47 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 9baadd3793 | Use other method of collecting query fields. #142 | 2016-04-29 21:52:15 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 42c3d1fa68 | Expanding support for split transactions #142 | 2016-04-29 21:36:59 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 5ed53d5f04 | Some new code for CSV. | 2016-04-08 20:36:11 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | c8440af9a5 | PHP7 compatible function definitions. | 2016-04-06 09:27:45 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | 3fbedf323f | Fix list for no budget #159 | 2016-04-01 16:23:12 +02:00 |  | 
			
				
					| 
							
							
								 James Cole | c058629172 | Small bug fixes. Signed-off-by: James Cole <thegrumpydictator@gmail.com> | 2016-03-14 20:51:34 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 631bafc6ab | Small bug fixes. | 2016-03-14 20:47:13 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 8f1bf846fe | Journal allows date edits and sets fields as dates #122 | 2016-03-12 07:37:13 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | f9de65c035 | Expand phpdoc. | 2016-03-12 07:36:23 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 6f95e9a3cb | Fix some decrypt bugs. | 2016-03-12 07:17:00 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | d054e085d6 | This will make triggers check existing fields first. | 2016-03-12 07:02:39 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 5b949d6e00 | Move some stuff around. | 2016-03-02 19:41:22 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 500243b0b3 | This fixes most of the tests. | 2016-03-02 13:37:28 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | ca32ae4561 | Fix is / is not already joined. | 2016-03-02 12:52:36 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 6b277c5e67 | Fix bill overview. | 2016-03-02 12:47:15 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 1ac64fd0b3 | Last updates, fixes the main list. | 2016-03-02 12:33:07 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | f2c1dd41d0 | Expanded Amount and expanded TransactionJournal to include source and destination information. | 2016-03-02 12:25:00 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | b317d1a171 | First attempt at scopeExpanded(), included some new fields in QUERYFIELDS. | 2016-03-02 12:09:34 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | b00c7b0ce3 | New constant that defines which fields a journal query is expected to load. | 2016-03-02 12:03:53 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | a61eafeac2 | Will now look for new field "transaction_type_type" | 2016-03-02 12:03:04 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 9f16799453 | Re-added phpdoc. | 2016-03-02 11:59:39 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 74fe0ee4e4 | Add some todo things, removed "withrelevantdata". This breaks FF | 2016-03-02 11:58:31 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | e8880232b3 | Removed "transaction_type" | 2016-03-02 11:57:02 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 556e9f1df7 | Removed "source_account" attribute. | 2016-03-02 11:56:47 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | beb301e781 | Removed "destination_account" | 2016-03-02 11:54:03 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 056c809754 | Removed amount_positive. This breaks the other half. | 2016-03-02 11:53:23 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | fa47eac9ff | Removed "amount" attribute. This breaks half of Firefly III. | 2016-03-02 11:52:52 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | bf4a7846dd | Removed boolean for left join that was never called more than twice anyway. | 2016-03-02 11:52:17 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | b0cc6dd714 | - Removed php doc. - Added book_date and rent_date as fillable fields. | 2016-03-02 11:50:37 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 49292bbb2d | New model for future implementation of #164 | 2016-02-10 16:26:42 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 4ef840e210 | More test data tweaks. | 2016-02-05 15:20:44 +01:00 |  | 
			
				
					| 
							
							
								 James Cole | 7343304284 | Code cleanup. | 2016-02-04 07:28:39 +01:00 |  |