4630 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hillel Coren	f94146fb5e	Fix for JSON payment import	2016-11-28 10:56:59 +02:00
Hillel Coren	408aede80a	Fix for JSON payment import	2016-11-28 10:55:00 +02:00
Hillel Coren	5de414ee4d	Fix for database migration	2016-11-27 17:20:01 +02:00
Hillel Coren	b2c93897ed	Fix for database migration	2016-11-27 17:19:31 +02:00
Hillel Coren	1819f72847	Merge fix to show archived payments to clients	2016-11-27 17:04:47 +02:00
Hillel Coren	86c00170bc	Merge templates fix	2016-11-27 17:02:58 +02:00
Hillel Coren	3a65c8905c	Merge templates fix	2016-11-27 17:02:07 +02:00
Hillel Coren	682ce02995	Merge dashboard fix	2016-11-27 17:00:29 +02:00
Hillel Coren	54a1594bb3	Merge CloudFlare IP fix	2016-11-27 16:59:24 +02:00
Hillel Coren	a99079da95	Improve error if email fails to send	2016-11-27 16:58:32 +02:00
Hillel Coren	e522f254a8	Updated readme	2016-11-27 15:58:38 +02:00
Hillel Coren	b03b1ec6cd	Updated readme	2016-11-27 15:58:28 +02:00
Hillel Coren	fda58719d5	Clarify error when emailing invoice to contact without email address	2016-11-27 15:58:01 +02:00
Hillel Coren	547a8e80b9	Clarify JSON import/export help	2016-11-27 15:46:45 +02:00
Hillel Coren	e9a5d60d7f	Working on bulk lists	2016-11-27 14:20:58 +02:00
Hillel Coren	ae28c3c5c3	Working on bulk list changes	2016-11-27 11:46:32 +02:00
Hillel Coren	12fd825de5	Working on datatables on vendor page	2016-11-25 16:02:39 +02:00
Hillel Coren	a518e9fba4	Working on datatables on client page	2016-11-25 14:45:37 +02:00
Hillel Coren	b83647facc	Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop	2016-11-25 12:53:44 +02:00
Hillel Coren	1323f21867	Working on datatables on client page	2016-11-25 12:53:35 +02:00
David Bomba	c771b12494	enable stateless social login (#1170)	2016-11-25 20:56:48 +11:00
Hillel Coren	eb710348bf	Refactor datatable sort columns	2016-11-24 11:46:57 +02:00
Hillel Coren	5c6c9e399b	Working on datatables	2016-11-24 11:41:11 +02:00
Hillel Coren	ad29ecf6df	Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop	2016-11-24 11:22:52 +02:00
Hillel Coren	8bac6b6c27	Working on adding bulk actions to client page	2016-11-24 11:22:37 +02:00
Hillel Coren	f9f7217b86	Merge pull request #1168 from FR6/develop ... Report settings: Date Range: Added "This Year" to the list of shortcuts	2016-11-23 19:55:32 +02:00
Francis Houle	63f525c5e3	report settings: date range: add This Year shortcut	2016-11-23 16:32:11 +00:00
Hillel Coren	1cc5795aa8	Show archived payments in client portal	2016-11-22 21:17:32 +02:00
Hillel Coren	a8321e2ac3	Fix for #1157: error on templates page	2016-11-22 20:47:47 +02:00
Hillel Coren	c0679cf197	Fix to show real IP when using CloudFlare	2016-11-22 20:46:40 +02:00
Hillel Coren	d891aaedef	Fix logo path in HTML email	2016-11-20 20:10:14 +02:00
Hillel Coren	2aa303944b	Fix logo path in HTML email	2016-11-20 20:09:40 +02:00
Hillel Coren	27ad5d03b8	Fix modern alignment	2016-11-20 20:03:05 +02:00
Hillel Coren	856944104e	Fix modern alignment	2016-11-20 20:02:41 +02:00
Hillel Coren	ccecb65f58	Working on status selector	2016-11-20 16:08:36 +02:00
Hillel Coren	23c098014a	Improved status selection	2016-11-18 15:31:43 +02:00
Hillel Coren	3c5ecd57f4	Updated version	2016-11-17 16:29:29 +02:00
Hillel Coren	fce46114bc	Working on list status select	2016-11-17 16:29:02 +02:00
Hillel Coren	de2825750d	Add eager loading to API tasks	2016-11-16 13:12:10 +02:00
Hillel Coren	04bbf1b2ae	Fix for migration	2016-11-16 12:52:39 +02:00
Hillel Coren	2f396a2994	Improved nav sidebar height	2016-11-16 12:44:28 +02:00
Hillel Coren	966d3cedba	Fix for PayFast	2016-11-16 12:41:59 +02:00
Hillel Coren	2cd574d349	Fix for PayFast	2016-11-16 12:41:47 +02:00
Hillel Coren	e1a84a29e1	Tweaks to BlueVine	2016-11-16 12:41:32 +02:00
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