Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,714 Commits 7 Branches 902 Tags
Commit Graph

2714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hillel Coren
1073a80b44 Merge pull request #794 from jeroenpeters1986/jeroenpeters1986-793-whitelabel-images 
#793: Reference pro_plan images with templatetag
 2016-05-10 12:26:32 +03:00
Hillel Coren
4de7dff68c Merge pull request #796 from bnova-stefan/master 
Updated resources/lang/de texts.php
 2016-05-10 12:22:48 +03:00
Hillel Coren
03c3c8a263 Merge pull request #825 from installtech/patch-3 
Added some french translations
 2016-05-10 12:21:17 +03:00
Hillel Coren
b06c5403b9 Merge pull request #832 from nerdoc/patch-15 
German Typo correction
 2016-05-10 12:19:48 +03:00
Hillel Coren
8d5c438d1e Merge pull request #837 from invoiceninja/revert-833-patch-17 
Revert "German translations"
 2016-04-30 21:03:01 +03:00
Hillel Coren
5fde7a5207 Revert "German translations" 2016-04-30 21:02:17 +03:00
Hillel Coren
2959705c44 Merge pull request #833 from nerdoc/patch-17 
German translations
 2016-04-30 21:02:10 +03:00
Christian González
4bc95c4b98 German translations 2016-04-29 06:45:30 +02:00
Christian González
89cf0509d5 Typo correction 2016-04-29 06:04:04 +02:00
Aïssa
13f5d80ee6 Added some french translations 2016-04-26 00:31:48 +02:00
Hillel Coren
f31aacbab8 Separated out log messages 2016-04-10 23:05:41 +03:00
Hillel Coren
e5b414aca9 Fixed payment list in client portal 2016-04-10 22:54:48 +03:00
Hillel Coren
1ece4f5534 Git update 2016-04-10 10:09:46 +03:00
Hillel Coren
80d0dda1e0 Bumped version to 2.5.1.3 v2.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
Stefan Welsch
26130680e3 Update texts.php 
update due date translation
 2016-04-03 10:16:05 +02:00
Stefan Welsch
eed5074cab Update texts.php 
Add and correct some german translations
 2016-04-02 12:39:18 +02:00
Jeroen
be9163a926 #793: Reference pro_plan images with templatetag 
Updated references to the pro_plan before- and after-images with the asset-templatetag. They were referenced by `ninja.dev`, which doesn't resolve on a lot of computers
 2016-03-31 23:08:10 +02:00
Hillel Coren
8dd9e99112 Updated version number v2.5.1.2 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' v2.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
v2.5.1 		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