| 
							
							
								 Holger Lösken | 337ed1c719 | - Fix #426, closes #426 - Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php | 2016-07-03 09:26:08 +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 | 5ff69c6f29 | Payments refactor | 2016-06-20 17:14:43 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | a7f92d0726 | Merge pull request #901 from joshuadwire/wepay-integration Wepay integration | 2016-06-03 11:20:31 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 0acf4ff1fc | Support importing JSON file | 2016-06-02 22:03:59 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 49d47bb9e3 | Merge remote-tracking branch 'upstream/develop' into wepay-integration | 2016-06-01 16:46:03 -04:00 |  | 
			
				
					| 
							
							
								 ben | dadac05532 | add support to multiple invoice types | 2016-05-29 12:02:44 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | d19a3715f9 | Warn user when editing an ACH auto bill invoice | 2016-05-25 11:07:20 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7317bfc8c9 | Fixed issue with invoice history | 2016-05-09 20:35:50 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | e6bcdb36b3 | Removed extra entity load in the repos save function | 2016-05-02 20:42:13 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 4db5a19885 | Refactored API index methods | 2016-05-01 23:55:13 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | e7296cf513 | Working on form requests | 2016-05-01 22:36:12 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7f168f87b9 | Working on form requests | 2016-05-01 22:33:01 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 933f2968d6 | Working on form requests | 2016-05-01 22:30:39 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9979eba5d9 | Working on custom route model binding | 2016-04-28 15:16:33 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | ce2392563d | Removed checkSubPermissions flag | 2016-04-27 23:56:14 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | fc0d4d3edd | Finish migrating to Laravel ACL | 2016-04-25 21:53:39 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | fdf1b25b16 | Begin adding authorization policies | 2016-04-23 11:52:36 -04: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 |  | 
			
				
					| 
							
							
								 Hillel Coren | 769465542d | Show info icon as orange if invitation opened but not viewed | 2016-04-09 23:36:32 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | f91f32323f | Reworking taxes | 2016-03-29 17:30:28 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d2d22fbb50 | Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop Conflicts:
	resources/views/invoices/knockout.blade.php | 2016-03-27 18:20:48 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d70bc4e922 | Support multiple tax rates | 2016-03-27 18:06:02 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | b5a948583e | Remove debug code and fix minor bugs | 2016-03-24 19:55:56 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 5e62d7d296 | Allow documents to be attached to expenses | 2016-03-24 18:15:52 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | bff6782026 | Add support for uploading documents on older browsers | 2016-03-24 15:13:54 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 942f543bbb | Display documents in invoice PDF | 2016-03-23 18:40:42 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 88808d44bf | Add support for invoice attachments | 2016-03-22 22:23:45 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | ddbc254d4b | Add link to payments from invoice page | 2016-03-22 15:17:46 +02:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 4d4f4140b6 | Set sorting columns | 2016-03-17 18:04:03 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | ec1bc6f2cf | Bug fixes | 2016-03-17 10:11:14 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 90e1f6695c | Improve user permission support * Hide links based on permissions
* Restrict editing/creating within other UI | 2016-03-15 22:07:11 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 0148d06205 | Add user permission support | 2016-03-15 19:08:00 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 4912c40650 | Fix to show all clients when cloning | 2016-03-09 13:35:46 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | aef4c6be98 | Upgrade to Laravel 5.2 | 2016-03-02 15:36:42 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 25f5cdbcdd | Added check to ensure expense currency matches client\invoice currency | 2016-01-31 15:10:33 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | bdeb062657 | Refining how expenses convert to products | 2016-01-27 22:38:21 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | efc9ab4f9e | Working on OFX support | 2016-01-26 22:22:33 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | dff7ad91c8 | Merge: Bugfixed version of Vendor / Expense module (#635) | 2016-01-21 00:09:10 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9287118cd0 | Merging: Bugfixed version of Vendor / Expense module #635 | 2016-01-20 16:06:17 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 6166464003 | Merge: Make automatic conversion of quote to invoice optional (#636) | 2016-01-20 10:41:57 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 89ff1be14f | Manually merging PR #630 | 2016-01-18 11:13:39 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | cbe2b2905e | Added autolink to emails and fixed checkout.com integration | 2016-01-18 10:30:42 +02:00 |  | 
			
				
					| 
							
							
								 steenrabol | bcffedcbd3 | update from master | 2016-01-11 20:41:02 +01:00 |  | 
			
				
					| 
							
							
								 steenrabol | 6133c6ff07 | Merge branch 'master' of https://github.com/invoiceninja/invoiceninja # Conflicts:
#	app/Http/Controllers/InvoiceController.php
#	resources/lang/en/texts.php
#	resources/views/invoices/edit.blade.php | 2016-01-11 20:39:18 +01:00 |  | 
			
				
					| 
							
							
								 steenrabol | 3e9e28f06f | Expense module | 2016-01-10 11:25:05 +01:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 14192846e8 | Merging: custom font support | 2016-01-07 09:08:30 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7beeb78126 | Enabled updating/archiving invoice through the API | 2016-01-06 22:46:11 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 6e98e9b60d | Merge pull request #594 from joshuadwire/more-payment-terms Add due date settings for recurring invoices | 2016-01-06 12:07:05 +02:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 103bce3f48 | Make recurring invoice due date settings more translatable | 2016-01-01 17:37:47 -05:00 |  |