3039 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hillel Coren	74fc00f3d8	Merge branch 'release-2.5.1.1' into develop	2016-03-22 19:53:08 +02:00
Hillel Coren	fad0eee1b5	Merge branch 'release-2.5.1.1'	2016-03-22 19:52:56 +02:00
Hillel Coren	7576fb94b3	Bumped version number to 2.5.1.1	2016-03-22 19:52:50 +02:00
Hillel Coren	9336605788	Updated language files	2016-03-22 19:50:55 +02:00
Hillel Coren	bf4d438458	Merge branch 'release-2.5.1' into develop	2016-03-22 19:41:47 +02:00
Hillel Coren	a61f5cc98a	Merge branch 'release-2.5.1' ... Conflicts: app/Ninja/Mailers/ContactMailer.php	2016-03-22 19:41:35 +02:00
Hillel Coren	abf2fcc09c	Bumped version number to 2.5.1	2016-03-22 19:38:51 +02:00
Hillel Coren	6a55cf56a0	Updated placeholder for iframe url	2016-03-22 19:35:57 +02:00
Hillel Coren	b0a4a9b31c	Cleaning up log files	2016-03-22 17:14:40 +02:00
Hillel Coren	5c1e9900d3	Fix for #779	2016-03-22 16:37:14 +02:00
Hillel Coren	beede39e85	Updated to the latest version of Laravel	2016-03-22 16:09:48 +02:00
Hillel Coren	ddbc254d4b	Add link to payments from invoice page	2016-03-22 15:17:46 +02:00
Hillel Coren	9fe89eea1c	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-03-22 14:38:26 +02:00
Hillel Coren	958cf4e8b7	Added support for Google Maps API key	2016-03-22 14:38:22 +02:00
Hillel Coren	2a7c84714d	Minor style fixes	2016-03-22 14:25:30 +02:00
David Bomba	493c31b430	Merge pull request #778 from turbo124/develop ... Dashboard API implementation	2016-03-22 21:23:18 +11:00
David Bomba	8e5d15dfbe	Dashboard API	2016-03-22 21:21:05 +11:00
Hillel Coren	86cda04806	Minor styling fix	2016-03-22 12:18:20 +02:00
David Bomba	d83a02f80f	Dashboard API	2016-03-22 21:17:52 +11:00
David Bomba	0ec1fcbd23	Dashboard API	2016-03-22 21:13:24 +11:00
David Bomba	6e7c19b38e	Dashboard API	2016-03-22 21:08:58 +11:00
Hillel Coren	dab023d898	Minor styling changes	2016-03-22 12:08:48 +02:00
David Bomba	85633d3464	Dashboard API	2016-03-22 21:06:57 +11:00
David Bomba	b8560187f5	Dashboard API	2016-03-22 21:04:23 +11:00
David Bomba	431c9a899f	Dashboard API	2016-03-22 20:54:36 +11:00
David Bomba	7bc703e5dd	Dashboard API	2016-03-22 20:50:11 +11:00
David Bomba	06d796a318	Dashboard API	2016-03-22 20:43:08 +11:00
David Bomba	56b863a89a	Working on Dashboard API	2016-03-22 19:50:09 +11:00
Hillel Coren	c66e933de5	Minor improvements to client portal styling	2016-03-21 22:34:30 +02:00
Hillel Coren	c9e0119bc2	Added permissions settings help	2016-03-21 22:00:59 +02:00
Hillel Coren	56ad438dd3	Add payment details to invoice report	2016-03-21 16:06:50 +02:00
Hillel Coren	40ce28c433	Made dropdown shadows consistent	2016-03-21 13:42:00 +02:00
David Bomba	166811e3e9	Merge remote-tracking branch 'upstream/develop' into develop	2016-03-20 16:59:57 +11:00
David Bomba	4e758a4f0b	Merge pull request #777 from joshuadwire/user-permissions ... Fix invoice links on dashboard	2016-03-20 16:59:37 +11:00
Joshua Dwire	5152500277	Fix invoice links on dashboard	2016-03-19 21:57:20 -04:00
David Bomba	e4a723b6ea	Merge remote-tracking branch 'upstream/develop' into develop	2016-03-20 09:38:19 +11:00
David Bomba	c25cd7f232	working on dashboard for API	2016-03-20 09:38:05 +11:00
Hillel Coren	09414ca3f5	Fix for #776 Deleting expense vendor results in error	2016-03-19 23:30:23 +02:00
David Bomba	b4e9dc3063	Merge remote-tracking branch 'upstream/develop' into develop	2016-03-19 20:26:57 +11:00
Hillel Coren	c41b7de514	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-03-18 14:34:53 +02:00
Hillel Coren	c3c7f25b32	Clarified partial labels	2016-03-18 14:34:46 +02:00
Hillel Coren	1eab8da671	Merge pull request #775 from joshuadwire/invoice-sort-date ... Sort by date for expenses, payments, quotes and invoices	2016-03-18 11:36:39 +02:00
Joshua Dwire	4d4f4140b6	Set sorting columns	2016-03-17 18:04:03 -04:00
Hillel Coren	f445c912f7	Merge pull request #773 from joshuadwire/user-permissions ... User Permissions Bug Fixes	2016-03-17 22:57:24 +02:00
Joshua Dwire	ec1bc6f2cf	Bug fixes	2016-03-17 10:11:14 -04:00
Hillel Coren	9b9e99ee78	Added SagePay referral	2016-03-17 15:28:28 +02:00
Hillel Coren	9a29efbc6f	Merge pull request #771 from joshuadwire/user-permissions ... User permissions	2016-03-17 09:54:36 +02:00
Hillel Coren	8cd56fa969	Minor fixes	2016-03-17 09:54:32 +02:00
David Bomba	e6d7b5e233	merge	2016-03-17 07:54:09 +11:00
Joshua Dwire	2cd7228074	Restrict access to tax rates and products	2016-03-15 22:45:11 -04:00