3197 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	0ca073291e	Make storing card summary locally part of payments changes	2016-05-10 19:17:14 -04:00
Joshua Dwire	cc5cb091d7	Store Braintree card summary locally	2016-05-10 19:16:53 -04:00
Joshua Dwire	88ec714cd5	Store Stripe card summary locally	2016-05-10 18:46:32 -04:00
Hillel Coren	1dc692d578	Updated readme	2016-05-10 22:51:17 +03: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	9d906299f3	Merge branch 'release-2.5.2' into develop	2016-05-10 21:41:30 +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
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
David Bomba	050b79cc75	user transformer - add fields	2016-05-10 09:26:44 +10: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
Hillel Coren	12c185ca49	Fix for regex issue with product autocomplete	2016-05-09 20:57:23 +03:00
Hillel Coren	7317bfc8c9	Fixed issue with invoice history	2016-05-09 20:35:50 +03:00
Hillel Coren	786b6567b6	Hide unit cost if the quantity column is hidden	2016-05-09 17:40:55 +03:00
Hillel Coren	8bd2e84bc8	Track plan start date when manually applying a license	2016-05-09 15:07:01 +03:00
David Bomba	dbdd1ac155	working with permissions	2016-05-09 10:28:47 +10:00
David Bomba	5233047ab1	working with permissions	2016-05-09 10:09:51 +10:00
David Bomba	985c4eda34	working with permissions	2016-05-09 10:02:15 +10:00
David Bomba	f6abdedfac	User Transformer permissions	2016-05-09 09:54:40 +10: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	4712780ff6	Fix for logo in bold design header	2016-05-08 19:25:29 +03:00
Hillel Coren	6b4d07346b	Update alt tags	2016-05-08 19:09:18 +03:00
Hillel Coren	852b2f24a9	Updated readme	2016-05-08 19:01:08 +03:00
Hillel Coren	e551bb8dee	Updated readme	2016-05-08 19:00:26 +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	7c67e66fb0	Sync ninja client when updating plan	2016-05-08 15:37:32 +03:00
Hillel Coren	f2e651d53f	Added message if adding users insn't supported	2016-05-08 12:59:32 +03:00
David Bomba	b16ab9058f	Merge remote-tracking branch 'upstream/develop' into develop	2016-05-08 18:48:31 +10:00
Hillel Coren	eff9ba5ac0	Merge pull request #846 from Rayvw/feature/improve-dynamic-dates ... Improved dynamic dates of recurring invoices	2016-05-08 11:20:18 +03:00
Hillel Coren	89b5d73615	Fix for loading tokens	2016-05-08 10:05:16 +03:00
Hillel Coren	cf9dbae1d1	Remove duplicate Auth include	2016-05-08 09:33:19 +03:00
Hillel Coren	c604ac5210	Merge branch 'joshuadwire-laravel-acl' into develop	2016-05-08 09:27:32 +03:00