| 
							
							
								 David Bomba | 7a1072f8f2 | add expenses, contacts, tasks and is_system to activity transformer | 2016-10-29 16:01:25 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 346dde8e97 | Fix for parseCSV constructor error | 2016-10-28 14:35:32 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | 0dc1a5f73f | Merge remote-tracking branch 'upstream/develop' into develop | 2016-10-28 20:07:46 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | bd624710a8 | Minor fixes | 2016-10-28 12:01:35 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | 8f1a9a2e5d | Expense Categories route (#1125) * Expense categories
* add dependencies
* expense categories
* expense categories
* expense categories
* Change expense categories into a resource route | 2016-10-28 19:37:28 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | b507254087 | Change expense categories into a resource route | 2016-10-28 19:36:26 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 5cbfbda947 | Merge remote-tracking branch 'upstream/develop' into develop | 2016-10-28 19:34:03 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | bb0ce2da38 | Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop | 2016-10-28 09:43:07 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 522cabe0a1 | Fix for permissions change | 2016-10-28 09:42:49 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | dedb85c8d6 | Add / Update expense categories from API (#1124) * Expense categories
* add dependencies
* expense categories
* expense categories
* expense categories | 2016-10-28 12:59:57 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | f647c6c48c | expense categories | 2016-10-28 08:49:40 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | cd98ad43e0 | expense categories | 2016-10-28 08:48:57 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 9cf55301e8 | expense categories | 2016-10-28 08:47:20 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 06533b2430 | add dependencies | 2016-10-28 07:50:16 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 301032c905 | Expense categories | 2016-10-28 07:48:34 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7465eb1631 | Include taxes in expense amount | 2016-10-27 17:26:42 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c3c0ece14a | Round qty in product report | 2016-10-27 16:45:06 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | a4b919f188 | Fix for tests | 2016-10-27 12:56:21 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 185958ba2c | Fix for logos in production | 2016-10-27 12:03:25 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 5b80e32fa7 | Add ability to enable\disable modules | 2016-10-27 11:57:51 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 4a94633add | Fix for pdfmake watermark | 2016-10-26 12:44:04 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 14352741be | Removed wordWrapText | 2016-10-26 12:21:48 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 00d7df8850 | Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop | 2016-10-26 10:32:44 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 83c229028b | Merge pull request #1113 from gpasztor87/develop Update User model | 2016-10-26 10:32:33 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 47381d54f2 | Don’t show history select if no options | 2016-10-26 10:28:38 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b7c783aa15 | Support sending API secret as header | 2016-10-26 10:24:16 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c82e8476dc | Fix for Travis | 2016-10-26 10:05:22 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 3b94b38216 | Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop | 2016-10-26 06:23:35 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | 33008a7544 | Merge pull request #1120 from turbo124/develop Bug Fix UserAccount object | 2016-10-26 12:02:52 +11:00 |  | 
			
				
					| 
							
							
								 David Bomba | 0bef2a0d1a | Changed  object back to | 2016-10-26 12:01:36 +11:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 070bb72601 | Add author name to footer #1052 | 2016-10-25 20:37:34 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 51b8cc288f | Fix for formIsChanged | 2016-10-25 20:27:24 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 87c65c3453 | Change logout/erase button to red | 2016-10-25 20:25:00 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 3023eeb058 | Fix for uploading multiple documents | 2016-10-25 20:16:29 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 368dbd1fde | Upgraded to sweetalert2 | 2016-10-25 18:24:59 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7fcc634a74 | Redirect to dashboard when switching accounts if viewing an entity | 2016-10-25 17:29:37 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c0a3971ca5 | Store sidebar state in localstorage | 2016-10-25 17:07:56 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 5e5f15667c | Update license to standard AAL | 2016-10-25 15:07:30 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 188a475af4 | Update license to standard AAL | 2016-10-25 15:00:39 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 12d9bac3fd | Added fields for future features | 2016-10-23 14:41:26 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 6a55cf5b43 | Add API support for expenses | 2016-10-23 11:01:21 +03:00 |  | 
			
				
					| 
							
							
								 Pásztor Gábor | 3296fb344e | Update User model | 2016-10-22 20:13:37 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 4320a72692 | Add company plan to user account API response | 2016-10-21 14:29:01 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | fc683784fc | Remove duplicate activity records for expenses and tasks | 2016-10-21 09:54:28 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 8fb8b63a13 | Track changes to expenses in activities | 2016-10-20 23:18:42 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 83b66c880b | Track changes to expenses in activities | 2016-10-20 23:17:37 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 040fb76a48 | UI to apply white label license | 2016-10-20 21:35:59 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 37ce8dbd76 | Fix for currency symbol | 2016-10-20 18:16:32 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d92f7fadc0 | Fix for currency symbol | 2016-10-20 18:14:54 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 4c5b4d5164 | Filter buy now clients and invoices | 2016-10-20 17:50:59 +03:00 |  |