1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Commit Graph

2699 Commits

Author SHA1 Message Date
Hillel Coren
1ece4f5534 Git update 2016-04-10 10:09:46 +03:00
Hillel Coren
80d0dda1e0 Bumped version to 2.5.1.3 2016-04-09 23:03:51 +03:00
Hillel Coren
65164cbaf3 Fixes #798 Setup error 2016-04-09 23:00:55 +03:00
Hillel Coren
263fe35923 Updated postmark driver for Laravel 5.2 2016-04-08 12:14:09 +03:00
Hillel Coren
4fe3887468 Merge fix for #800 2016-04-08 10:42:14 +03:00
Hillel Coren
8dd9e99112 Updated version number 2016-03-31 17:28:04 +03:00
Hillel Coren
0c4cbd69bd Merge bug fixes from develop branch 2016-03-31 17:27:18 +03:00
Hillel Coren
6a6c932bf6 Merge fix #787 for spaces in .env file 2016-03-31 17:14:34 +03:00
Hillel Coren
90baeb5018 Fixed invitation iframe URL 2016-03-24 09:15:02 +02:00
Hillel Coren
39f426e352 Prevent duplicate deletions 2016-03-23 15:02:53 +02:00
Hillel Coren
4eae70400e Updated travis branch 2016-03-22 20:00:41 +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