221 Commits

Author	SHA1	Message	Date
Hillel Coren	0e75ddb5e6	Added setting to hide second tax rate	2016-05-29 12:26:02 +03:00
Hillel Coren	cdfaae2700	Minor change to client portal settings page	2016-05-22 20:31:26 +03:00
Hillel Coren	99da41669b	Fixes for #442 and #702	2016-05-22 13:10:58 +03:00
Hillel Coren	617ac98a75	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-18 22:58:42 +03:00
Joshua Dwire	e05bbd18ef	Fix JS error	2016-05-18 10:00:33 -04:00
Hillel Coren	510f5cffac	Auto populate Stripe keys for testing	2016-05-18 11:05:00 +03:00
Joshua Dwire	4f3bb7eeb4	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-05-17 15:07:53 -04:00
Joshua Dwire	43fade2339	Support app fees and Canadian users	2016-05-17 11:32:17 -04: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
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	46cf89361f	Support manually importing OFX files	2016-05-15 14:06:25 +03:00
Hillel Coren	b067697b1c	Support manually importing OFX files	2016-05-15 13:58:11 +03: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	ba000546c4	Better WePay switching	2016-05-12 11:09:07 -04:00
Joshua Dwire	88c9fc1ac1	Add WePay configuration UI	2016-05-11 22:55:37 -04:00
Joshua Dwire	fc029a62e1	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 22:32:28 -04:00
Joshua Dwire	88ec714cd5	Store Stripe card summary locally	2016-05-10 18:46:32 -04:00
Hillel Coren	ee579f91f3	Added plan help text	2016-05-10 21:17:46 +03:00
Joshua Dwire	41f4c98e08	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 10:25:42 -04:00
Hillel Coren	9b0f086cbd	Only show user’s own tokens	2016-05-08 21:50:35 +03:00
Hillel Coren	f2e651d53f	Added message if adding users insn't supported	2016-05-08 12:59:32 +03:00
Joshua Dwire	0fc44962d4	Add Braintree/PayPal support	2016-05-06 22:33:03 -04:00
Hillel Coren	3ddad385a3	Fix for setting default HTML email template	2016-05-06 15:05:28 +03:00
Hillel Coren	6971060049	Added preview for email templates	2016-05-05 19:25:26 +03:00
Hillel Coren	c79d9fe24c	Added preview for email templates	2016-05-05 17:46:22 +03:00
Hillel Coren	ef2bc3d811	White label changes	2016-05-05 09:52:59 +03:00
Joshua Dwire	ed1f2b6044	Handle failed payments	2016-04-30 17:54:56 -04:00
Joshua Dwire	e5fb354643	Support configuring Stripe for ACH and Plaid	2016-04-28 16:38:01 -04:00
Joshua Dwire	fe2a1fe66a	Add Braintree support	2016-04-26 19:59:52 -04:00
Hillel Coren	cfb4dc4351	Hide zapier button for resellers	2016-04-24 20:41:30 +03:00
Hillel Coren	cf75a2c2d2	Merge pull request #823 from joshuadwire/enterprise-plan ... Fix refunds; support using stored card; change proPlanModel link	2016-04-21 10:39:34 +03:00
Joshua Dwire	9d27b68fb6	Fix refunds; support using stored card; change proPlanModel link	2016-04-20 16:53:56 -04:00
Hillel Coren	0dcee794b5	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: resources/lang/en/texts.php resources/views/accounts/invoice_design.blade.php resources/views/invoices/edit.blade.php	2016-04-19 22:48:03 +03:00
Hillel Coren	32d5a25f61	Enabled specifying invoice padding	2016-04-19 14:26:42 +03:00
Hillel Coren	9f5fe33059	Added page size and live preview settings	2016-04-19 10:51:57 +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	63b2c2c6b1	More intuitive account management page	2016-04-16 22:28:11 -04:00
Joshua Dwire	e0568faae1	Merge pull request #3 from joshuadwire/attached-documents ... Fix logo filesystem usage	2016-04-16 19:17:34 -04:00
Joshua Dwire	33b8566d18	Fix logo filesystem usage	2016-04-16 19:14:43 -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	9b8b150766	Implemented enable_client_portal_dashboard	2016-04-13 22:08:41 +03:00
Hillel Coren	80c77adf03	Fix sizing of large logo	2016-04-13 18:49:39 +03:00
Hillel Coren	fdde60577c	Fixed problem creating a new payment gateway	2016-04-08 10:38:11 +03: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