966 Commits

Author	SHA1	Message	Date
Hillel Coren	dc1bcfbd9e	Updates to white label marketing	2016-07-03 17:46:41 +03:00
Hillel Coren	d22d8f8d01	Fix for website link in client portal dashboard	2016-07-03 17:13:45 +03:00
Hillel Coren	03b696ac9e	Prevent downloading cloned invoice PDF before saving	2016-07-03 16:23:16 +03:00
vagrant	3e912db1cb	Resolve conflicts	2016-07-03 09:34:34 +00:00
Holger Lösken	1aa0110580	Return $LANG array for Transifex	2016-07-03 09:27:49 +00:00
Holger Lösken	337ed1c719	- Fix #426, closes #426 ... - Moved translations for industries, countries into texts.php - Removed nested arrays in texts.php	2016-07-03 09:26:08 +00:00
Holger Lösken	b13b9a2d7d	Fix hardcoded translations for industry, country and payment types ... - Fixes #426, resolves #426	2016-07-03 09:24:55 +00:00
Holger Lösken	da87f9342d	Return $LANG array for Transifex	2016-07-03 11:06:34 +02:00
Hillel Coren	f9aee23de8	Merge pull request #923 from vincentdh/develop ... Add Mailgun API in mail drivers	2016-07-03 11:58:24 +03:00
Holger Lösken	96d15ccb2d	- Fix #426, closes #426 ... - Moved translations for industries, countries into texts.php - Removed nested arrays in texts.php	2016-07-02 23:18:13 +02:00
Holger Lösken	fdb8c707e1	Fix hardcoded translations for industry, country and payment types ... - Fixes #426, resolves #426	2016-07-01 23:19:09 +02:00
Hillel Coren	ff911888ec	Merging tranlations from Transifex	2016-06-30 21:26:14 +03:00
Holger Lösken	ae78a177b0	Fix #562 ... Make „Manual entry“ translatable	2016-06-30 14:38:55 +02:00
Hillel Coren	9603439a33	Added additional designs	2016-06-29 22:48:56 +03:00
Hillel Coren	0449fe2515	Minor text/styling fixes	2016-06-28 21:22:16 +03:00
Hillel Coren	af4cb1dac8	Fix for client portal header navigation	2016-06-26 19:48:15 +03:00
Hillel Coren	d71cf4dd49	Payment fixes	2016-06-26 19:38:36 +03:00
Hillel Coren	7c0875841a	Fixed autobill message in emails	2016-06-26 12:59:42 +03:00
Hillel Coren	74e5b80f8c	Fix for add company link	2016-06-25 22:05:08 +03:00
Hillel Coren	6ad49cf281	Fixing payment hooks	2016-06-23 16:15:52 +03:00
Hillel Coren	dcdfb4f21c	Check to prevent duplicate gateways	2016-06-22 20:13:45 +03:00
Hillel Coren	e2ddabe95d	Minor fixes for payments	2016-06-22 12:22:38 +03:00
Hillel Coren	c9a19cbd76	Fixes for WePay	2016-06-21 19:10:22 +03:00
Hillel Coren	8a6227bf89	Fix for tests	2016-06-21 12:40:10 +03:00
Hillel Coren	5ff69c6f29	Payments refactor	2016-06-20 17:14:43 +03:00
vincentdh	5875b70496	Add Mailgun API as mail driver ... Add Mailgun API as a mail driver. Can be configured from the System Settings page.	2016-06-19 13:51:22 -04:00
Hillel Coren	1a9f7bf098	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-06-09 10:56:31 +03:00
Hillel Coren	ffa67cef3b	Refactoring payments code...	2016-06-09 10:56:22 +03:00
Hillel Coren	31fc4ad59c	Merge pull request #911 from haleksandre/invoice-subtotals ... Add custom labelling and style to multiple labels and amount in the subtotals table	2016-06-09 09:05:57 +03:00
Alexandre Villeneuve	eafdc12fa5	Add style to multiple subtotals labels	2016-06-08 14:00:44 -04:00
Hillel Coren	7a0ca450a8	Fix payments for clients w/o an email address	2016-06-08 08:43:21 +03:00
Hillel Coren	a91f257f01	Moved up handleDocumentUploaded counter	2016-06-07 21:46:07 +03:00
Hillel Coren	d5cb8b3abe	Minor fixes	2016-06-05 22:55:23 +03:00
Hillel Coren	706c26b4d5	Minor fixes	2016-06-05 21:05:11 +03:00
Hillel Coren	5c7a15ff83	Minor fixes	2016-06-05 19:10:15 +03:00
Hillel Coren	8b2f7eb39f	Check for blank api secret	2016-06-05 18:50:41 +03:00
Hillel Coren	37a92fc853	Fix for online payments page	2016-06-04 22:11:46 +03:00
Hillel Coren	a7f92d0726	Merge pull request #901 from joshuadwire/wepay-integration ... Wepay integration	2016-06-03 11:20:31 +03:00
Hillel Coren	0acf4ff1fc	Support importing JSON file	2016-06-02 22:03:59 +03:00
Joshua Dwire	49d47bb9e3	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-06-01 16:46:03 -04:00
Hillel Coren	e312f00b80	Don't refresh PDF after file uploaded	2016-06-01 17:32:51 +03:00
Hillel Coren	1bed3dbdf5	Display number of documents	2016-06-01 16:49:33 +03:00
Hillel Coren	901464380e	Prevent downloading PDF if this invoice hasn't been saved	2016-06-01 16:39:07 +03:00
Hillel Coren	42ac9507e5	Enabled importing products	2016-05-31 23:15:55 +03:00
Hillel Coren	e7caa58d75	Changed route to use plurarl 'documents'	2016-05-30 13:43:41 +03:00
Hillel Coren	2f3c309d41	Remove fallback support for dropzone	2016-05-30 11:51:41 +03:00
Hillel Coren	cc2364a989	Check company website is a valid url	2016-05-29 19:34:51 +03:00
Hillel Coren	d175fc872a	Don't render pdf if not attached and fix typo	2016-05-29 19:32:45 +03:00
Hillel Coren	a7f9847978	Fix for when document is too large	2016-05-29 18:42:36 +03:00
Hillel Coren	d174a2555b	Fix for max file size	2016-05-29 18:39:42 +03:00
Hillel Coren	b5a9656e3d	Fix for cloning quote	2016-05-29 16:45:16 +03:00
Hillel Coren	a9302d4d01	Fixes for is_quote	2016-05-29 15:34:44 +03:00
Hillel Coren	607fb58c29	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: app/Models/Account.php	2016-05-29 12:27:14 +03:00
Hillel Coren	0e75ddb5e6	Added setting to hide second tax rate	2016-05-29 12:26:02 +03:00
Hillel Coren	cca6dcfc4a	Merge pull request #878 from benb969/invoices_types ... add support to multiple invoice types	2016-05-29 12:21:57 +03:00
ben	dadac05532	add support to multiple invoice types	2016-05-29 12:02:44 +03:00
Hillel Coren	2043621ac9	Fix for deleting documents	2016-05-26 19:02:53 +03:00
Hillel Coren	c55d6510bf	Show permissions if not enabled	2016-05-26 16:04:53 +03:00
Joshua Dwire	acbc0e887f	Support adding WePay ACH from payment page	2016-05-25 16:54:49 -04:00
Joshua Dwire	4dded687b5	Tweak payment settings page	2016-05-25 15:55:23 -04:00
Joshua Dwire	c9f00274b1	Support storing WePay bank tokens	2016-05-25 15:04:58 -04:00
Hillel Coren	44fb6682e4	Prevent saving expense before documents have uploaded	2016-05-25 22:01:15 +03:00
Joshua Dwire	6ddbbbc64d	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-05-25 11:14:14 -04:00
Joshua Dwire	7d55ab033b	Merge branch 'wepay-ach' into wepay-integration	2016-05-25 11:11:47 -04:00
Joshua Dwire	d19a3715f9	Warn user when editing an ACH auto bill invoice	2016-05-25 11:07:20 -04:00
Joshua Dwire	c701c5563c	Add payment settings block	2016-05-25 10:36:40 -04:00
Hillel Coren	df2a652798	Change document to click to full size	2016-05-25 15:18:12 +03:00
Hillel Coren	ba561c7d0d	Prevent clicking save while document is still uploading	2016-05-25 14:42:20 +03:00
Hillel Coren	1531727188	Prevent setting pdfstring when saving an invoice	2016-05-25 12:10:22 +03:00
Hillel Coren	ee2ef4608e	Lazy load invoice documents	2016-05-25 11:59:46 +03:00
Joshua Dwire	9d4b42a514	Mention in the invoice notification that the invoice will be auto billed on the due date	2016-05-24 23:14:19 -04:00
Joshua Dwire	724f5738aa	Add contact_key	2016-05-24 17:02:28 -04:00
Hillel Coren	541b19cd5f	Updated vendor expenses to new datatable class	2016-05-23 21:03:01 +03:00
Hillel Coren	f19058e35e	Improved message after update	2016-05-23 09:18:39 +03:00
Hillel Coren	6cfee6ec70	Open document when clicked	2016-05-22 22:14:47 +03:00
Hillel Coren	cdfaae2700	Minor change to client portal settings page	2016-05-22 20:31:26 +03:00
Hillel Coren	3b0feef87f	Fix for attached PDF being in the wrong language	2016-05-22 20:26:19 +03:00
Hillel Coren	ac09d86f68	Show warning when changing recurring invoice start date	2016-05-22 19:51:09 +03:00
Hillel Coren	142082b447	Remove download PDF from recurring invoices	2016-05-22 18:11:24 +03:00
Hillel Coren	99da41669b	Fixes for #442 and #702	2016-05-22 13:10:58 +03:00
Hillel Coren	6caf1ff30d	Minor fixes	2016-05-19 09:47:57 +03:00
Hillel Coren	617ac98a75	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-18 22:58:42 +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	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
Hillel Coren	2e1d340d27	Merge pull request #875 from joshuadwire/wepay-integration ... Wepay integration - Part 2	2016-05-17 22:25:59 +03:00
Hillel Coren	0dd55b4cf2	Merge pull request #873 from vincentdh/patch-3 ... use_card_on_file translation ambiguous	2016-05-17 22:19:51 +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
Hillel Coren	a2998a8cfb	Added Croatian	2016-05-17 20:22:41 +03:00
vincentdh	f532639e3c	use_card_on_file translation ambiguous	2016-05-17 12:59:55 -04:00
Joshua Dwire	43fade2339	Support app fees and Canadian users	2016-05-17 11:32:17 -04:00
Bartlomiej Szala	9c0202713a	Enable swap symbol for currencies	2016-05-16 22:37:16 +02: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	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	1faf0a477a	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-15 22:55:25 +03:00
Bartlomiej Szala	5eaa90fd05	Add new translations into texts file	2016-05-15 21:49:58 +02: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
Hillel Coren	52fe1b0dec	Added missing text value	2016-05-15 10:06:14 +03:00
Joshua Dwire	d99d81d655	Make autobill setting numbers match token settings	2016-05-14 23:15:22 -04:00
Joshua Dwire	919aec2192	Better refund handling	2016-05-14 23:03:39 -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	32ab340b74	Added fake card details for test payment	2016-05-13 16:00:07 +03:00
Hillel Coren	df3a103825	Added missing report field	2016-05-13 15:26:22 +03:00
Hillel Coren	751b084a59	Fix javasript typo	2016-05-12 22:35:33 +03:00
Joshua Dwire	ba000546c4	Better WePay switching	2016-05-12 11:09:07 -04:00
Hillel Coren	1777f467f0	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-12 12:10:11 +03:00
Joshua Dwire	88c9fc1ac1	Add WePay configuration UI	2016-05-11 22:55:37 -04:00
Hillel Coren	7ad81bdf5e	Merge pull request #856 from bSzala/translation ... Working on polish translations	2016-05-11 23:18:29 +03:00
Bartlomiej Szala	ae6d85bb49	Working on texts translations	2016-05-11 20:59:40 +02:00
Hillel Coren	269aaa73bf	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-11 20:00:12 +03:00
Joshua Dwire	0d41d8aeb6	Payments bug fixes - Part 2	2016-05-11 12:53:43 -04:00
Hillel Coren	60ad92c2f0	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-11 18:45:11 +03:00
Joshua Dwire	fb4806dab7	Include email for PayPal	2016-05-11 11:30:17 -04:00
Joshua Dwire	981045b28b	Better Stripe support	2016-05-11 09:57:44 -04:00
Hillel Coren	f03adc767e	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-11 09:28:55 +03:00
Hillel Coren	0f95799f33	Improved 'return to app' button logic	2016-05-11 09:22:43 +03:00
Joshua Dwire	fc029a62e1	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 22:32:28 -04:00
Joshua Dwire	b8514436a9	Pad last 4 card digits to a string of length 4, since we're storing it as an int	2016-05-10 19:17:41 -04:00
Joshua Dwire	88ec714cd5	Store Stripe card summary locally	2016-05-10 18:46:32 -04:00
Hillel Coren	b3439d9ab7	Clean up diffs between branches	2016-05-10 22:41:30 +03:00
Hillel Coren	147c51f6f9	Clean up diffs between branches	2016-05-10 22:39:54 +03:00
Hillel Coren	3c21179e4e	Fixed white label after image	2016-05-10 21:42:50 +03:00
Hillel Coren	a503697152	Updated lang files	2016-05-10 21:25:57 +03:00
Hillel Coren	ee579f91f3	Added plan help text	2016-05-10 21:17:46 +03:00
Joshua Dwire	ad39f106db	Remove email parameter when creating credit card token	2016-05-10 11:24:04 -04:00
Joshua Dwire	07a82870e1	Merge in change to include email when creating Stripe customer	2016-05-10 10:27:21 -04:00
Joshua Dwire	41f4c98e08	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 10:25:42 -04:00
Hillel Coren	01869d852c	Merge fix #794	2016-05-10 12:31:28 +03:00
Hillel Coren	d34441b039	Merge translation fix #796	2016-05-10 12:26:30 +03:00
Hillel Coren	e7e7476505	Merge translation fix #825	2016-05-10 12:24:21 +03:00
Hillel Coren	d56a75ca5e	Merge translation fix #832	2016-05-10 12:22:50 +03:00
Hillel Coren	2a90a548dd	Fix for data viz	2016-05-10 12:20:53 +03:00
Hillel Coren	2345ff11ed	Don't focus client select if client is already selected	2016-05-10 10:44:26 +03:00
Joshua Dwire	20f6f32a06	Update UI for configuring auto bill	2016-05-09 16:29:02 -04:00
Hillel Coren	9b0f086cbd	Only show user’s own tokens	2016-05-08 21:50:35 +03:00
Hillel Coren	6b4d07346b	Update alt tags	2016-05-08 19:09:18 +03:00
Hillel Coren	eb814eec71	Added Czech #844	2016-05-08 18:57:32 +03:00
Hillel Coren	594b0e1bef	Implemented server-side analytics tracking for revenue	2016-05-08 16:54:16 +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
Joshua Dwire	cf98c37f40	Better Braintree support	2016-05-06 17:05:42 -04:00
Joshua Dwire	9ed44bdfe4	Merge pull request #4 from joshuadwire/laravel-acl ... Laravel acl	2016-05-06 14:17:16 -04:00
Joshua Dwire	9a64db3234	Allow client to choose auto bill settings	2016-05-06 13:26:37 -04:00