| 
							
							
								 Hillel Coren | 147c51f6f9 | Clean up diffs between branches | 2016-05-10 22:39:54 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1a4984cb2d | Bumped version number to 2.5.2 | 2016-05-10 21:30:48 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | ee7dbc710c | Updated version | 2016-05-10 21:27:17 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 41f4c98e08 | Merge remote-tracking branch 'upstream/develop' into payments-changes | 2016-05-10 10:25:42 -04:00 |  | 
			
				
					| 
							
							
								 David Bomba | e795ac28cd | Merge remote-tracking branch 'upstream/develop' into develop | 2016-05-10 09:26:15 +10:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 20f6f32a06 | Update UI for configuring auto bill | 2016-05-09 16:29:02 -04:00 |  | 
			
				
					| 
							
							
								 David Bomba | 5197db449e | Merge remote-tracking branch 'upstream/develop' into develop | 2016-05-09 09:03:39 +10:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 9b0f086cbd | Only show user’s own tokens | 2016-05-08 21:50:35 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 06437327fc | Fixed change password for non-admins | 2016-05-08 21:31:23 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | fec948f1e8 | Fixed searching for non-admins | 2016-05-08 21:29:49 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 594b0e1bef | Implemented server-side analytics tracking for revenue | 2016-05-08 16:54:16 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 0fc44962d4 | Add Braintree/PayPal support | 2016-05-06 22:33:03 -04:00 |  | 
			
				
					| 
							
							
								 David Bomba | 1bef3b0791 | Merge remote-tracking branch 'upstream/develop' into develop | 2016-05-07 08:44:39 +10:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | cf98c37f40 | Better Braintree support | 2016-05-06 17:05:42 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 9a64db3234 | Allow client to choose auto bill settings | 2016-05-06 13:26:37 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | c79d9fe24c | Added preview for email templates | 2016-05-05 17:46:22 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | c551077a7b | Merge remote-tracking branch 'upstream/develop' into develop | 2016-05-03 10:17:45 +10:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 65d70c620e | Enabled setting per_page for API results | 2016-05-02 23:06:36 +03:00 |  | 
			
				
					| 
							
							
								 David Bomba | 7cac31e7a6 | Fix for cloning invoices from API | 2016-05-02 19:40:54 +10:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 1d6011caad | Working on permissions in the API | 2016-05-02 11:38:01 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 933f2968d6 | Working on form requests | 2016-05-01 22:30:39 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | ed1f2b6044 | Handle failed payments | 2016-04-30 17:54:56 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | c536bd8569 | Add basic ACH support | 2016-04-29 17:50:21 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | e5fb354643 | Support configuring Stripe for ACH and Plaid | 2016-04-28 16:38:01 -04:00 |  | 
			
				
					| 
							
							
								 Philipp Hug | 3ab4c0964d | whitelabeling: allow more settings from environment. | 2016-04-28 16:08:24 +02:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 38b6c94fe7 | Fix for quote api controller in routes files | 2016-04-28 15:10:53 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 1cb2b9dc25 | Use existing PaymentType instead of CardType | 2016-04-27 22:13:51 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | fe2a1fe66a | Add Braintree support | 2016-04-26 19:59:52 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 42c1f537bc | Store/display credit card type, expiration and last 4 digits | 2016-04-23 22:10:51 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | b8170f0324 | Support refunds from the admin UI | 2016-04-23 16:40:19 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | ad68d64dca | Changes for white label license | 2016-04-21 22:01:17 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | fb975db1f2 | Merge pull request #815 from joshuadwire/enterprise-plan Enterprise plan bug fixes | 2016-04-19 17:40:17 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 0fd39e5be0 | Only allow pro trials | 2016-04-19 10:28:27 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | a805e2b8bb | Merge pull request #814 from joshuadwire/enterprise-plan Enterprise plan | 2016-04-19 12:01:56 +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 | 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 | b2de7c84eb | Changed /forgot to /recover_password | 2016-04-15 13:25:58 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 3303c00067 | Fix for Cybersource | 2016-04-11 22:09:05 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | b296c55911 | Add back legacy routes | 2016-04-11 11:34:02 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 2a328627ac | Bumped version to 2.5.1.3 | 2016-04-09 23:03:32 +03:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 6f097c34c2 | Updated version number | 2016-03-31 17:28:35 +03:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | cd8290946e | Add client portal documents tab | 2016-03-24 11:58:30 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | e6056104bd | Display documents and zip download on client invoice page | 2016-03-23 22:41:19 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 2a7e8cb4b7 | Add documents placeholder for emails | 2016-03-23 21:25:33 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | f7d8f819b6 | Add option to attach documents to invoice email | 2016-03-23 19:20:08 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 942f543bbb | Display documents in invoice PDF | 2016-03-23 18:40:42 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | d810ba7f6b | Improved document support | 2016-03-23 15:41:05 -04:00 |  | 
			
				
					| 
							
							
								 Joshua Dwire | 88808d44bf | Add support for invoice attachments | 2016-03-22 22:23:45 -04:00 |  | 
			
				
					| 
							
							
								 Hillel Coren | 7576fb94b3 | Bumped version number to 2.5.1.1 | 2016-03-22 19:52:50 +02:00 |  |