762 Commits

Author	SHA1	Message	Date
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
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
Hillel Coren	1777f467f0	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-12 12:10:11 +03: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
Joshua Dwire	70b9c9bba7	Require authorization for ACH	2016-05-06 11:21:06 -04:00
Joshua Dwire	37f4430e62	Move payment methods to dashboard when enabled	2016-05-06 11:06:01 -04:00
Joshua Dwire	77bd6f7bc5	Restyle add bank account page	2016-05-06 10:50:50 -04:00
Hillel Coren	902827b7ac	Put back custom fonts from client emails (it works in iOS)	2016-05-06 15:35:24 +03:00