James Cole
							
						 
					 | 
					
						
						
							
						
						49560ca6a6
					 | 
					
						
						
							
							Merge branch 'develop' into 5.8-dev
						
						
						
						
						
						
						
						# Conflicts:
#	composer.lock
#	config/firefly.php
#	public/v1/js/create_transaction.js
#	public/v1/js/edit_transaction.js
#	public/v1/js/profile.js 
						
						
					 | 
					
						2022-10-16 19:13:15 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						5038ed7708
					 | 
					
						
						
							
							Update build files
						
						
						
						
						
						
					 | 
					
						2022-10-16 16:07:48 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						d9245f06f7
					 | 
					
						
						
							
							Add option to delete webhooks.
						
						
						
						
						
						
					 | 
					
						2022-09-18 05:49:56 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						ad9efde2d0
					 | 
					
						
						
							
							Expand webhook code.
						
						
						
						
						
						
					 | 
					
						2022-09-17 07:08:30 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						b4f929b325
					 | 
					
						
						
							
							Rebuild frontend with new libraries.
						
						
						
						
						
						
					 | 
					
						2021-01-14 19:07:04 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						ab0e77a2e8
					 | 
					
						
						
							
							New and optimised Vue code, courtesy of @GaryQ
						
						
						
						
						
						
					 | 
					
						2020-02-19 17:13:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						64a6661ea4
					 | 
					
						
						
							
							Update email address.
						
						
						
						
						
						
					 | 
					
						2020-02-16 14:00:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						041357c2ff
					 | 
					
						
						
							
							First steps for #2920
						
						
						
						
						
						
					 | 
					
						2020-01-04 07:24:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						ce44edcf63
					 | 
					
						
						
							
							Fix #2945
						
						
						
						
						
						
					 | 
					
						2020-01-03 11:30:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						b2808d6a0c
					 | 
					
						
						
							
							Fix root copyright notices, after a tip from @GaryQ [skip ci]
						
						
						
						
						
						
					 | 
					
						2020-01-03 06:27:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						fc78c32fca
					 | 
					
						
						
							
							Add newline to files
						
						
						
						
						
						
					 | 
					
						2019-08-17 12:09:03 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						d5c5fa4fad
					 | 
					
						
						
							
							Lots of new code for new transaction screen.
						
						
						
						
						
						
					 | 
					
						2019-05-04 20:58:11 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						27802c930f
					 | 
					
						
						
							
							Remove trial code, restore repository. Should not have committed this. Oh well. Let's continue this in a branch like I'm supposed to.
						
						
						
						
						
						
					 | 
					
						2019-01-06 16:23:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						337c289a74
					 | 
					
						
						
							
							This combination of JS things works.
						
						
						
						
						
						
					 | 
					
						2019-01-06 13:37:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						961e7e92b3
					 | 
					
						
						
							
							Some new files for JS rendering of new layout.
						
						
						
						
						
						
					 | 
					
						2019-01-04 16:37:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						577f024310
					 | 
					
						
						
							
							Make code default for React things.
						
						
						
						
						
						
					 | 
					
						2019-01-03 19:01:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						17359c5e42
					 | 
					
						
						
							
							Various experiments with JS and React and what-not.
						
						
						
						
						
						
					 | 
					
						2019-01-01 15:41:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						91deac706c
					 | 
					
						
						
							
							Some new code for the new layout.
						
						
						
						
						
						
					 | 
					
						2018-12-23 07:21:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						88bab888d8
					 | 
					
						
						
							
							Update CSS and JS libs.
						
						
						
						
						
						
					 | 
					
						2018-08-25 07:56:10 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						3d06f0ac14
					 | 
					
						
						
							
							Remove unused dependencies
						
						
						
						
						
						
					 | 
					
						2018-02-06 18:15:26 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						e77a1e403f
					 | 
					
						
						
							
							Expand config for localisation
						
						
						
						
						
						
					 | 
					
						2018-02-06 10:56:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						d1e60cd546
					 | 
					
						
						
							
							First step towards Laravel 5.5
						
						
						
						
						
						
					 | 
					
						2017-09-09 21:57:24 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |