| 
							
							
								 David Bomba | 1da8f6bc26 | bug fixes | 2016-01-30 20:57:47 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | cc40f51f84 | working on product API | 2016-01-30 20:56:27 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 020e428677 | testing email functionality: | 2016-01-29 12:47:35 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | e245b6f639 | Updated texts file | 2016-01-28 16:34:22 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 89622f86e2 | Fix for #661 | 2016-01-28 16:07:03 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9d3d58def1 | Merge branch 'master' of github.com:hillelcoren/invoice-ninja | 2016-01-28 14:05:01 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1ac12e1506 | Added basic stats for resellers | 2016-01-28 14:04:55 +02:00 |  | 
			
				
					| 
							
							
								 David Bomba | cae3b48cd4 | Restore Invoice from API | 2016-01-28 13:31:19 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 165a382637 | Restore an invoice from the API | 2016-01-28 12:55:15 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | bdeb062657 | Refining how expenses convert to products | 2016-01-27 22:38:21 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | a7f2d3354c | Resolved issue with expenses and multi-tenancy | 2016-01-27 20:31:08 +02:00 |  | 
			
				
					| 
							
							
								 David Bomba | 84895907d1 | Merge pull request #662 from turbo124/master update invoice status via API | 2016-01-27 21:01:24 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | fa2187ce20 | update invoice status via API | 2016-01-27 21:00:00 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 6455e25c3a | Merge pull request #660 from turbo124/master Include archived clients | 2016-01-27 14:32:09 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 76f4530ffd | include archived clients | 2016-01-27 14:31:38 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 910e9db7a0 | Merge pull request #659 from turbo124/master Added ability to convert a quote to an invoice through the API | 2016-01-27 12:57:28 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 4799b2e86c | Added ability to convert a quote to an invoice through the API | 2016-01-27 12:56:24 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 2db27caf90 | Merge pull request #658 from turbo124/master Bug fixes | 2016-01-27 11:40:41 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 71b2970279 | Bug fixes | 2016-01-27 11:36:21 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 4f5dd12ea0 | Merge pull request #657 from turbo124/master Bug Fixes | 2016-01-27 07:53:22 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | c2bb8711a0 | Bug Fixed | 2016-01-27 07:52:30 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9c96f09fc0 | Merge branch 'master' of github.com:hillelcoren/invoice-ninja | 2016-01-26 22:22:40 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | efc9ab4f9e | Working on OFX support | 2016-01-26 22:22:33 +02:00 |  | 
			
				
					| 
							
							
								 David Bomba | e57f8f3c2e | Swagger Typo fix | 2016-01-26 22:37:16 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | a4df265d09 | Update client via API | 2016-01-26 22:36:00 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | e4a6effc60 | Merge pull request #642 from sakalauskas/dev-api Fixed ping route & added a way to find client by email address or if … | 2016-01-24 19:54:01 +02:00 |  | 
			
				
					| 
							
							
								 Laurynas Sakalauskas | 2478ec59a4 | Revert store() method | 2016-01-24 17:06:34 +00:00 |  | 
			
				
					| 
							
							
								 Laurynas Sakalauskas | 68665d2972 | Added filtering by email | 2016-01-24 16:59:01 +00:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 74a3dcf9d2 | Working on expenses | 2016-01-23 23:36:31 +02:00 |  | 
			
				
					| 
							
							
								 Laurynas Sakalauskas | 0d2025c834 | Fixed ping route & added a way to find client by email address or if not exist - create a new | 2016-01-22 10:33:38 +00:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 360b59baa0 | Working on expenses | 2016-01-22 00:29:10 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7a26dd610c | Working on expenses | 2016-01-21 22:36:49 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b24a6109ba | Working on expenses | 2016-01-21 21:15:30 +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 | bf778aa616 | Initial work on OFX support | 2016-01-20 01:07:31 +02:00 |  | 
			
				
					| 
							
							
								 steenrabol | 2525f68a39 | Expense / Vendor module bug fix | 2016-01-19 20:35:15 +01:00 |  | 
			
				
					| 
							
							
								 steenrabol | e7a658aaf6 | Expenses bug fix | 2016-01-19 14:01:19 +01: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 |  | 
			
				
					| 
							
							
								 David Bomba | eeb977bab3 | Added delete invoice functionality | 2016-01-16 17:07:29 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 12d3444808 | By default include trashed invoices | 2016-01-16 09:22:22 +11:00 |  | 
			
				
					| 
							
							
								 steenrabol | f550e3734f | bug fix to expense module - was not able to add a contact to a new vendor | 2016-01-15 11:31:12 +01:00 |  | 
			
				
					| 
							
							
								 David Bomba | ca591f4451 | return archived invoice as success | 2016-01-15 14:05:16 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 175c685032 | Enabled creating recurring invoices through the API | 2016-01-13 16:58:39 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b5cf87bc0d | Bug fixes | 2016-01-12 11:18:35 +02:00 |  | 
			
				
					| 
							
							
								 David Bomba | 3e0b6948b5 | Send down all quotes and recurring invoices in invoices GET call | 2016-01-12 13:02:08 +11: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 |  |