| 
							
							
								 Joshua Dwire | c701c5563c | Add payment settings block | 2016-05-25 10:36:40 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 1f11d88d6b | Store ip addresses for payments and payment methods | 2016-05-24 18:00:59 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 29c4f16970 | Fix contact authentication | 2016-05-24 17:45:38 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 724f5738aa | Add contact_key | 2016-05-24 17:02:28 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | ea2f154b1f | Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop | 2016-05-24 10:18:21 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7cc29de881 | Bumped version | 2016-05-24 10:18:10 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | e201651aa6 | Bumped version | 2016-05-24 10:17:53 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | 5f928ecf01 | Merge remote-tracking branch 'upstream/develop' into develop | 2016-05-24 14:26:19 +10:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 541b19cd5f | Updated vendor expenses to new datatable class | 2016-05-23 21:03:01 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | e7bf0599db | Separated out entity datatable classes | 2016-05-23 19:52:20 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 260b9212b9 | Renamed PublicClientController to ClientPortalController | 2016-05-23 11:31:49 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | f19058e35e | Improved message after update | 2016-05-23 09:18:39 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 86240affab | Show company name in client portal dashboard activities | 2016-05-23 09:02:31 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 371f224c24 | Minor fixes for invoice export | 2016-05-22 20:01:37 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | d0232e00f6 | Hide outstanding on dashboard from non-admins | 2016-05-22 15:31:41 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | 1e370d2cce | Implement DocumentAPIController | 2016-05-21 18:44:53 +10:00 |  | 
			
				
					| 
							
							
								 David Bomba | eb1d5be47c | bugs in dashboardapicontroller | 2016-05-21 09:17:53 +10:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 6caf1ff30d | Minor fixes | 2016-05-19 09:47:57 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | ef65bb7d84 | Merge pull request #879 from joshuadwire/wepay-integration Wepay integration - Part 3 | 2016-05-18 19:22:44 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | f0d276be4c | Listen for WePay IPNs | 2016-05-18 09:51:20 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 17ea888e90 | Bumped version number | 2016-05-18 10:12:58 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 8be1771f47 | Bumped version number | 2016-05-18 10:12:33 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 2e1d340d27 | Merge pull request #875 from joshuadwire/wepay-integration Wepay integration - Part 2 | 2016-05-17 22:25:59 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 4f3bb7eeb4 | Merge remote-tracking branch 'upstream/develop' into wepay-integration | 2016-05-17 15:07:53 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | e905b29510 | Partial WePay ACH support | 2016-05-17 14:09:39 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 43fade2339 | Support app fees and Canadian users | 2016-05-17 11:32:17 -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 | 3ed5fdf09f | Disabled iOS push notifications by default | 2016-05-17 14:36:12 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 38866ff6f0 | Disabled iOS push notifications by default | 2016-05-17 14:35:16 +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 |  | 
			
				
					| 
							
							
								 Hillel Coren | 5e7cdddc3e | Merge pull request #863 from joshuadwire/wepay-integration Wepay integration - Part 1 | 2016-05-16 11:29:37 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | 1d05525ee3 | typo | 2016-05-16 12:30:24 +10:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | f6942a199f | Merge remote-tracking branch 'upstream/develop' into wepay-integration | 2016-05-15 21:21:59 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | a482c63ee3 | Payments bug fixes | 2016-05-15 16:27:56 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 3df6ad2529 | Changes to support transifex.com | 2016-05-15 23:16:08 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b067697b1c | Support manually importing OFX files | 2016-05-15 13:58:11 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | d99d81d655 | Make autobill setting numbers match token settings | 2016-05-14 23:15:22 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 9afd0741f7 | Better WePay setup UI | 2016-05-14 22:32:27 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 1524447cd4 | WePay fixes; support account updater | 2016-05-14 22:22:06 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 947cb4a6f7 | Better WePay configuration support | 2016-05-14 17:23:20 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | ce04c994dd | Support payments and storing cards via WePay. | 2016-05-13 09:30:22 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b111adaf17 | Added  and removed extra lables from activity messages | 2016-05-13 15:35:59 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | fba37171ae | Support query counter in webapp as well as API | 2016-05-13 12:08:41 +03: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 |  | 
			
				
					| 
							
							
								 Hillel Coren | 6a86764dee | Fix for #859 | 2016-05-12 12:45:36 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 110af6f28b | Fix for #859 | 2016-05-12 12:44:22 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 88c9fc1ac1 | Add WePay configuration UI | 2016-05-11 22:55:37 -04:00 |  |