| 
							
							
								 Hillel Coren | 5d7f7ec02c | Merge pull request #946 from codedge/#942-Refactoring-dead-code-unused-uses #942 refactoring dead code unused uses | 2016-07-04 09:38:50 +03:00 |  | 
			
				
					| 
							
							
								 Holger Lösken | a114f60127 | Adding translation support for languages - Languages can now be translated via texts.php | 2016-07-04 01:02:38 +02:00 |  | 
			
				
					| 
							
							
								 Holger Lösken | 0fbda85a59 | Code Refactoring - Removed unused uses
- Type hinting for method parameters
- Removed commented code
- Introduced comments for classes and methods
- Short array syntax | 2016-07-03 16:19:22 +00:00 |  | 
			
				
					| 
							
							
								 Holger Lösken | b13b9a2d7d | Fix hardcoded translations for industry, country and payment types - Fixes #426, resolves #426 | 2016-07-03 09:24:55 +00:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c1713c190c | Fix for go pro process | 2016-06-28 21:21:54 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1a9f7bf098 | Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop | 2016-06-09 10:56:31 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | ffa67cef3b | Refactoring payments code... | 2016-06-09 10:56:22 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 31fc4ad59c | Merge pull request #911 from haleksandre/invoice-subtotals Add custom labelling and style to multiple labels and amount in the subtotals table | 2016-06-09 09:05:57 +03:00 |  | 
			
				
					| 
							
							
								 Alexandre Villeneuve | eafdc12fa5 | Add style to multiple subtotals labels | 2016-06-08 14:00:44 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d5669fdbf9 | Minor fixes | 2016-06-05 21:08:41 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 706c26b4d5 | Minor fixes | 2016-06-05 21:05:11 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 49d47bb9e3 | Merge remote-tracking branch 'upstream/develop' into wepay-integration | 2016-06-01 16:46:03 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 607fb58c29 | Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop Conflicts:
	app/Models/Account.php | 2016-05-29 12:27:14 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 0e75ddb5e6 | Added setting to hide second tax rate | 2016-05-29 12:26:02 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | cca6dcfc4a | Merge pull request #878 from benb969/invoices_types add support to multiple invoice types | 2016-05-29 12:21:57 +03:00 |  | 
			
				
					| 
							
							
								 ben | dadac05532 | add support to multiple invoice types | 2016-05-29 12:02:44 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 145c394e6b | Ensure all files are deleted with the account | 2016-05-26 20:48:45 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | f233582ea8 | Ensure all files are deleted with the account | 2016-05-26 20:48:27 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | c701c5563c | Add payment settings block | 2016-05-25 10:36:40 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 861672e9e9 | Fix for deleting account | 2016-05-17 15:05:07 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | faec0a2f04 | Fix for deleting account | 2016-05-17 15:03:17 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | a82437b2bc | Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop Conflicts:
	app/Http/routes.php
	resources/lang/en/texts.php | 2016-05-16 11:34:00 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | f6942a199f | Merge remote-tracking branch 'upstream/develop' into wepay-integration | 2016-05-15 21:21:59 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b067697b1c | Support manually importing OFX files | 2016-05-15 13:58:11 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 947cb4a6f7 | Better WePay configuration support | 2016-05-14 17:23:20 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 2933ec97ca | Fix for saving client portal setting in self host | 2016-05-12 20:29:33 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 3202d2480f | Fix for saving client portal setting in self host | 2016-05-12 20:26:36 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | ba000546c4 | Better WePay switching | 2016-05-12 11:09:07 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 41f4c98e08 | Merge remote-tracking branch 'upstream/develop' into payments-changes | 2016-05-10 10:25:42 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | fec948f1e8 | Fixed searching for non-admins | 2016-05-08 21:29:49 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 6971060049 | Added preview for email templates | 2016-05-05 19:25:26 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | bce4395f82 | Added preview for email templates | 2016-05-05 17:51:52 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c79d9fe24c | Added preview for email templates | 2016-05-05 17:46:22 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | b8170f0324 | Support refunds from the admin UI | 2016-04-23 16:40:19 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | cf75a2c2d2 | Merge pull request #823 from joshuadwire/enterprise-plan Fix refunds; support using stored card; change proPlanModel link | 2016-04-21 10:39:34 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 9d27b68fb6 | Fix refunds; support using stored card; change proPlanModel link | 2016-04-20 16:53:56 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 0dcee794b5 | Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop Conflicts:
	resources/lang/en/texts.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/invoices/edit.blade.php | 2016-04-19 22:48:03 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 0fd39e5be0 | Only allow pro trials | 2016-04-19 10:28:27 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 32d5a25f61 | Enabled specifying invoice padding | 2016-04-19 14:26:42 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | cd52faa3bf | Automatically disable live preview when using a large font | 2016-04-19 14:12:02 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9f5fe33059 | Added page size and live preview settings | 2016-04-19 10:51:57 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 22f65e8108 | Finalize multi-plan support * Allow admins to change plan
* Check features instead of plans
* Support linking/unlinking accounts
* Support creating/deleting accounts | 2016-04-18 22:35:18 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 454e9bc861 | Refactor getPlanDetails | 2016-04-17 12:55:03 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 030d4ed4da | Fix renewals; fix plan edge cases | 2016-04-16 22:09:01 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | e0568faae1 | Merge pull request #3 from joshuadwire/attached-documents Fix logo filesystem usage | 2016-04-16 19:17:34 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 33b8566d18 | Fix logo filesystem usage | 2016-04-16 19:14:43 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 9b1bfef698 | Add support for multiple plans/terms | 2016-04-16 18:34:39 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 51cd82cba8 | Move cancel account to new account management page | 2016-04-16 10:58:53 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9b8b150766 | Implemented enable_client_portal_dashboard | 2016-04-13 22:08:41 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 3cb3126f98 | Hide sample document from invoice design page | 2016-04-13 21:50:54 +03:00 |  |