4636 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hillel Coren	3680985a20	Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop	2016-11-15 21:28:34 +02:00
Hillel Coren	abc082aba4	Merge pull request #1146 from joshuadwire/2016-11-bluevine-integration ... BlueVine Integration	2016-11-15 21:28:17 +02:00
Hillel Coren	7e80f4de2e	Fix subscription JSON response	2016-11-15 10:39:35 +02:00
Joshua Dwire	d157093215	Put BlueVine promo code into a partial template file	2016-11-14 13:42:59 -05:00
Joshua Dwire	c04a92b836	Exclude deleted payments from 12-month revenue	2016-11-14 13:42:27 -05:00
Joshua Dwire	3d84e408bb	Only do annual income calculations if we're going to show the BlueVinePromo.	2016-11-14 13:42:09 -05:00
Joshua Dwire	632bff872e	Build assets	2016-11-14 13:34:40 -05:00
Joshua Dwire	179713711f	Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration	2016-11-14 13:34:27 -05:00
Hillel Coren	9b379a7976	Fix initial sidebar display	2016-11-14 20:21:44 +02:00
Hillel Coren	3ec1b90649	Fix initial sidebar display	2016-11-14 20:21:30 +02:00
Hillel Coren	a70380dd88	Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop	2016-11-14 15:13:58 +02:00
David Bomba	b7a5ae6059	Handle null invoice object in task (#1153)	2016-11-14 21:25:16 +11:00
David Bomba	fa39434ac9	Tasks via API (#1152) ... * revert error reporting * Add Task attributes	2016-11-14 20:43:10 +11:00
Hillel Coren	df20a294c1	Improved nav sidebar height	2016-11-14 10:27:47 +02:00
Hillel Coren	80620b7881	Updated readme	2016-11-13 23:48:14 +02:00
Hillel Coren	94890af980	Updated readme	2016-11-13 23:47:51 +02:00
Hillel Coren	12d313c64a	Hide delete product #1149	2016-11-13 09:20:44 +02:00
Hillel Coren	712fe3f03a	Hide delete product #1149	2016-11-13 09:20:30 +02:00
Hillel Coren	a9a94df973	Fix for expense documents	2016-11-13 09:14:40 +02:00
Hillel Coren	d53d7739b4	Fix for expense documents	2016-11-13 09:14:25 +02:00
Hillel Coren	79d745a26b	Simplify logo URL code	2016-11-11 12:57:28 +02:00
Hillel Coren	8c2e5ebdbf	Simplify logo URL code	2016-11-11 12:57:12 +02:00
Joshua Dwire	20d994a71f	Update built files	2016-11-10 18:29:57 -05:00
Joshua Dwire	82167de1d2	Merge remote-tracking branch 'upstream/develop' into 2016-11-bluevine-integration	2016-11-10 18:29:13 -05:00
Joshua Dwire	5bee41789f	Show BlueVine quote and redirect to BlueVine	2016-11-10 18:24:54 -05:00
Hillel Coren	38ed834019	Flush cache after running UpdateSeeder	2016-11-09 16:18:50 +02:00
Hillel Coren	e10d8d9c19	Flush cache after running UpdateSeeder	2016-11-09 16:18:35 +02:00
Hillel Coren	b4ef3b2284	Update check balance test	2016-11-09 16:13:26 +02:00
Hillel Coren	41b24edeb3	Update check balance test	2016-11-09 16:13:13 +02:00
Hillel Coren	61a898a71d	Update checkdata script	2016-11-09 16:09:19 +02:00
Hillel Coren	b19a1d73de	Minor text update	2016-11-09 16:08:33 +02:00
Hillel Coren	bc8c24a67c	Update checkdata script	2016-11-09 16:08:22 +02:00
Hillel Coren	bf77c8eaa6	Added Zapier to the readme	2016-11-07 17:43:17 +02:00
Hillel Coren	790cf67c46	Added Zapier to the readme	2016-11-07 17:42:54 +02:00
Hillel Coren	e5abb048f4	Fix for tests	2016-11-06 20:16:24 +02:00
Hillel Coren	f35b168445	Working on tests	2016-11-06 19:49:17 +02:00
Hillel Coren	660727d23b	Remove duplicate line of code	2016-11-06 19:42:43 +02:00
Hillel Coren	5b71b665be	Merge branch 'release-2.8.0'	2016-11-06 19:37:03 +02:00
Hillel Coren	382295d89d	Merge branch 'develop' into release-2.8.0	2016-11-06 19:36:16 +02:00
Hillel Coren	ed7e8baaef	Updated language files	2016-11-06 19:35:28 +02:00
Hillel Coren	b620356db1	Merge branch 'release-2.8.0'	2016-11-06 19:29:19 +02:00
Hillel Coren	7155524575	Update version	2016-11-06 15:58:00 +02:00
Hillel Coren	905593b525	Prevent emailing recurring invoice through API	2016-11-06 15:57:33 +02:00
Hillel Coren	fbf5e726fb	Added 'pro' label to navigation when on trial	2016-11-06 15:32:25 +02:00
Hillel Coren	a76e9ae437	Log email error for self host installs	2016-11-06 15:21:09 +02:00
Hillel Coren	26f4a84897	Track campaign fields with company	2016-11-06 14:16:18 +02:00
Hillel Coren	0a20460242	Added dashboard data to API tests	2016-11-06 14:00:37 +02:00
Hillel Coren	31d5e28b69	Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop	2016-11-06 13:45:09 +02:00
Hillel Coren	ef44a95902	Working on signature feature	2016-11-06 13:44:58 +02:00
David Bomba	c905e781c0	revert error reporting (#1142)	2016-11-05 12:32:06 +11:00