James Cole
							
						 
					 | 
					
						
						
							
						
						e421b29b01
					 | 
					
						
						
							
							Clean up code and comments.
						
						
						
						
						
						
					 | 
					
						2023-02-22 18:14:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						789935cf1c
					 | 
					
						
						
							
							Clean up code.
						
						
						
						
						
						
					 | 
					
						2023-02-12 07:23:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						927d607b1a
					 | 
					
						
						
							
							Remove code coverage ignore instructions
						
						
						
						
						
						
					 | 
					
						2023-02-12 07:15:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						7225474621
					 | 
					
						
						
							
							Clean up and fix API routes.
						
						
						
						
						
						
					 | 
					
						2023-02-12 06:53:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						dbf3e76ecc
					 | 
					
						
						
							
							Various PSR12 code cleanup
						
						
						
						
						
						
					 | 
					
						2022-12-29 19:41:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						80762616f3
					 | 
					
						
						
							
							Merge branch 'develop' into 5.8-dev
						
						
						
						
						
						
						
						# Conflicts:
#	app/Api/V1/Controllers/Models/AvailableBudget/DestroyController.php
#	config/firefly.php
#	frontend/package.json
#	frontend/src/i18n/fr_FR/index.js
#	frontend/src/i18n/pt_BR/index.js
#	frontend/src/i18n/ru_RU/index.js
#	frontend/src/i18n/sl_SI/index.js
#	frontend/src/i18n/zh_CN/index.js
#	frontend/yarn.lock
#	public/v3/index.html
#	public/v3/js/1473.9b55dc17.js
#	public/v3/js/150.35592a2c.js
#	public/v3/js/1501.3980515e.js
#	public/v3/js/1543.010ec22e.js
#	public/v3/js/1730.207e6e59.js
#	public/v3/js/1864.d9ea853e.js
#	public/v3/js/1951.a5d70097.js
#	public/v3/js/2106.33b7eabd.js
#	public/v3/js/2124.bfc4091d.js
#	public/v3/js/2194.4baebc21.js
#	public/v3/js/2372.f07615ae.js
#	public/v3/js/2407.747d87e4.js
#	public/v3/js/2476.8af9976c.js
#	public/v3/js/2686.5e278d64.js
#	public/v3/js/2700.1251f369.js
#	public/v3/js/3232.0964e736.js
#	public/v3/js/3903.4e461032.js
#	public/v3/js/4640.601878ff.js
#	public/v3/js/4782.e1382ab6.js
#	public/v3/js/4851.3c27e6c7.js
#	public/v3/js/5221.fded0f96.js
#	public/v3/js/5266.e820dd38.js
#	public/v3/js/5348.109b8049.js
#	public/v3/js/5439.d75e5cb4.js
#	public/v3/js/5724.8b5fcafb.js
#	public/v3/js/576.e26ddde9.js
#	public/v3/js/6072.21c05085.js
#	public/v3/js/6323.69d55ffd.js
#	public/v3/js/6676.60b155c0.js
#	public/v3/js/6691.80040366.js
#	public/v3/js/6719.f9d4744f.js
#	public/v3/js/6826.74ed4602.js
#	public/v3/js/6882.c5970da7.js
#	public/v3/js/6919.cc55656e.js
#	public/v3/js/7044.96c481ac.js
#	public/v3/js/7083.c223af4f.js
#	public/v3/js/7222.86a095eb.js
#	public/v3/js/7480.b9bd8fed.js
#	public/v3/js/7499.c362f695.js
#	public/v3/js/7544.47af6552.js
#	public/v3/js/7552.ebdf1aef.js
#	public/v3/js/7586.29cf8776.js
#	public/v3/js/7697.4338f28d.js
#	public/v3/js/773.ff7cb3ef.js
#	public/v3/js/7919.910d5ebb.js
#	public/v3/js/7956.3e1c81cf.js
#	public/v3/js/8044.169b21f8.js
#	public/v3/js/8218.966b669d.js
#	public/v3/js/8344.119567b0.js
#	public/v3/js/8376.477a5508.js
#	public/v3/js/8387.a4c1d7d6.js
#	public/v3/js/8405.62235b41.js
#	public/v3/js/8493.48ada210.js
#	public/v3/js/8611.3ab24e6d.js
#	public/v3/js/8907.233f4719.js
#	public/v3/js/8928.8127fcdf.js
#	public/v3/js/9009.d0e97de6.js
#	public/v3/js/9038.06ad98ab.js
#	public/v3/js/9069.e81f039c.js
#	public/v3/js/9287.bc57ab91.js
#	public/v3/js/9597.0c124ce8.js
#	public/v3/js/9606.ce293dd2.js
#	public/v3/js/app.13f6ce91.js
#	public/v3/js/chunk-common.98b27fd7.js
#	public/v3/js/vendor.92714ea3.js
#	resources/assets/js/locales/fr.json
#	resources/assets/js/locales/ru.json
#	resources/assets/js/locales/sl.json
#	resources/assets/js/locales/zh-cn.json
#	resources/lang/de_DE/firefly.php
#	resources/lang/nl_NL/firefly.php
#	resources/lang/pt_BR/firefly.php
#	resources/lang/sl_SI/firefly.php
#	resources/lang/zh_CN/firefly.php 
						
						
					 | 
					
						2022-12-24 17:34:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						5f6c84ab4c
					 | 
					
						
						
							
							Reset after deletion
						
						
						
						
						
						
					 | 
					
						2022-12-24 08:44:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						1667b88dcd
					 | 
					
						
						
							
							Use PSR-12 code style
						
						
						
						
						
						
					 | 
					
						2022-10-30 14:23:00 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						1209c4e76a
					 | 
					
						
						
							
							Reformat various code.
						
						
						
						
						
						
					 | 
					
						2022-03-29 14:56:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						d7e6a7b125
					 | 
					
						
						
							
							Fix https://github.com/firefly-iii/firefly-iii/issues/5670
						
						
						
						
						
						
					 | 
					
						2022-02-03 13:16:20 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						1efbbe4b84
					 | 
					
						
						
							
							Append API links
						
						
						
						
						
						
					 | 
					
						2021-09-19 10:20:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						4003cea759
					 | 
					
						
						
							
							Code reordering and reformatting. I should really start employing style CI.
						
						
						
						
						
						
					 | 
					
						2021-09-18 10:26:12 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						3589c9f60f
					 | 
					
						
						
							
							Various code cleanup.
						
						
						
						
						
						
					 | 
					
						2021-09-18 10:20:19 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						3ec9753808
					 | 
					
						
						
							
							Various code cleanup.
						
						
						
						
						
						
					 | 
					
						2021-05-24 08:22:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						5abbb8a807
					 | 
					
						
						
							
							Code cleanup.
						
						
						
						
						
						
					 | 
					
						2021-03-28 11:39:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						206845575c
					 | 
					
						
						
							
							Code cleanup
						
						
						
						
						
						
					 | 
					
						2021-03-21 09:15:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cole
							
						 
					 | 
					
						
						
							
						
						cfa9e8b318
					 | 
					
						
						
							
							Set up and manage rule endpoints.
						
						
						
						
						
						
					 | 
					
						2021-03-06 17:43:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |