mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-10-31 01:17:33 -04:00 
			
		
		
		
	Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop
This commit is contained in:
		
						commit
						3fce64005c
					
				| @ -1 +1 @@ | |||||||
| 5.3.56 | 5.3.57 | ||||||
| @ -14,8 +14,8 @@ return [ | |||||||
|     'require_https' => env('REQUIRE_HTTPS', true), |     'require_https' => env('REQUIRE_HTTPS', true), | ||||||
|     'app_url' => rtrim(env('APP_URL', ''), '/'), |     'app_url' => rtrim(env('APP_URL', ''), '/'), | ||||||
|     'app_domain' => env('APP_DOMAIN', 'invoicing.co'), |     'app_domain' => env('APP_DOMAIN', 'invoicing.co'), | ||||||
|     'app_version' => '5.3.56', |     'app_version' => '5.3.57', | ||||||
|     'app_tag' => '5.3.56', |     'app_tag' => '5.3.57', | ||||||
|     'minimum_client_version' => '5.0.16', |     'minimum_client_version' => '5.0.16', | ||||||
|     'terms_version' => '1.0.1', |     'terms_version' => '1.0.1', | ||||||
|     'api_secret' => env('API_SECRET', ''), |     'api_secret' => env('API_SECRET', ''), | ||||||
|  | |||||||
| @ -18027,6 +18027,37 @@ offers a blessing: | |||||||
| May you do good and not evil | May you do good and not evil | ||||||
| May you find forgiveness for yourself and forgive others | May you find forgiveness for yourself and forgive others | ||||||
| May you share freely, never taking more than you give. | May you share freely, never taking more than you give. | ||||||
|  | -------------------------------------------------------------------------------- | ||||||
|  | states_rebuilder | ||||||
|  | 
 | ||||||
|  | // Copyright 2019 The MELLATI Meftah. All rights reserved. | ||||||
|  | // | ||||||
|  | // Redistribution and use in source and binary forms, with or without | ||||||
|  | // modification, are permitted provided that the following conditions are | ||||||
|  | // met: | ||||||
|  | // | ||||||
|  | //    * Redistributions of source code must retain the above copyright | ||||||
|  | // notice, this list of conditions and the following disclaimer. | ||||||
|  | //    * Redistributions in binary form must reproduce the above | ||||||
|  | // copyright notice, this list of conditions and the following disclaimer | ||||||
|  | // in the documentation and/or other materials provided with the | ||||||
|  | // distribution. | ||||||
|  | //    * Neither the name of Google Inc. nor the names of its | ||||||
|  | // contributors may be used to endorse or promote products derived from | ||||||
|  | // this software without specific prior written permission. | ||||||
|  | // | ||||||
|  | // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||||||
|  | // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||||||
|  | // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||||||
|  | // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||||||
|  | // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||||||
|  | // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||||||
|  | // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||||||
|  | // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||||||
|  | // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||||||
|  | // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||||||
|  | // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
|  | 
 | ||||||
| -------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- | ||||||
| super_editor | super_editor | ||||||
| 
 | 
 | ||||||
|  | |||||||
							
								
								
									
										6
									
								
								public/flutter_service_worker.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								public/flutter_service_worker.js
									
									
									
									
										vendored
									
									
								
							| @ -25,14 +25,14 @@ const RESOURCES = { | |||||||
| "assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f", | "assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f", | ||||||
| "assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "015400679694f1f51047e46da0e1dc98", | "assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "015400679694f1f51047e46da0e1dc98", | ||||||
| "assets/AssetManifest.json": "38d9aea341601f3a5c6fa7b5a1216ea5", | "assets/AssetManifest.json": "38d9aea341601f3a5c6fa7b5a1216ea5", | ||||||
| "assets/NOTICES": "224588855e3a5da7f1c34f0db1837839", | "assets/NOTICES": "9a4bf0423a5e265f38c4df37f7a0a913", | ||||||
| "assets/fonts/MaterialIcons-Regular.otf": "4e6447691c9509f7acdbf8a931a85ca1", | "assets/fonts/MaterialIcons-Regular.otf": "4e6447691c9509f7acdbf8a931a85ca1", | ||||||
| "favicon.ico": "51636d3a390451561744c42188ccd628", | "favicon.ico": "51636d3a390451561744c42188ccd628", | ||||||
| "/": "06217baba16a2e300052fe3239cbc479", | "/": "9a6d03b86fbbbe937744bd4e18e8f03a", | ||||||
| "version.json": "a00481850d5c63ba5df4e22636643438", | "version.json": "a00481850d5c63ba5df4e22636643438", | ||||||
| "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35", | "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35", | ||||||
| "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed", | "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed", | ||||||
| "main.dart.js": "973fc4472caa919c3214ec5a4049102b", | "main.dart.js": "299333488d94a781eef76d041cb91148", | ||||||
| "favicon.png": "dca91c54388f52eded692718d5a98b8b", | "favicon.png": "dca91c54388f52eded692718d5a98b8b", | ||||||
| "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40", | "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40", | ||||||
| "canvaskit/profiling/canvaskit.js": "3783918f48ef691e230156c251169480", | "canvaskit/profiling/canvaskit.js": "3783918f48ef691e230156c251169480", | ||||||
|  | |||||||
							
								
								
									
										239431
									
								
								public/main.dart.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										239431
									
								
								public/main.dart.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										241319
									
								
								public/main.foss.dart.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										241319
									
								
								public/main.foss.dart.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										236340
									
								
								public/main.html.dart.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										236340
									
								
								public/main.html.dart.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										14748
									
								
								public/main.next.dart.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14748
									
								
								public/main.next.dart.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										14168
									
								
								public/main.profile.dart.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14168
									
								
								public/main.profile.dart.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -233,7 +233,7 @@ trait MockAccountData | |||||||
|         $user_id = $user->id; |         $user_id = $user->id; | ||||||
|         $this->user = $user; |         $this->user = $user; | ||||||
| 
 | 
 | ||||||
|         auth()->login($user); |         // auth()->login($user);
 | ||||||
| 
 | 
 | ||||||
|         CreateCompanyTaskStatuses::dispatchNow($this->company, $this->user); |         CreateCompanyTaskStatuses::dispatchNow($this->company, $this->user); | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user