Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Code Issues Releases Activity
3,019 Commits 7 Branches 919 Tags 2 GiB
6a86764dee
Commit Graph

3019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hillel Coren
6a86764dee Fix for #859 2016-05-12 12:45:36 +03:00
Hillel Coren
da911d090e Merge branch 'release-2.5.2' 
Conflicts:
	app/Http/Controllers/AppController.php
	app/Http/routes.php
	app/Models/Account.php
	app/Models/Invitation.php
	composer.json
	composer.lock
	resources/lang/de/texts.php
	resources/lang/fr/texts.php
	resources/views/header.blade.php
 2016-05-10 21:41:13 +03:00
Hillel Coren
1a4984cb2d Bumped version number to 2.5.2 2016-05-10 21:30:48 +03:00
Hillel Coren
ee7dbc710c Updated version 2016-05-10 21:27:17 +03:00
Hillel Coren
a503697152 Updated lang files 2016-05-10 21:25:57 +03:00
Hillel Coren
ee579f91f3 Added plan help text 2016-05-10 21:17:46 +03:00
Hillel Coren
01869d852c Merge fix #794 2016-05-10 12:31:28 +03:00
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
d34441b039 Merge translation fix #796 2016-05-10 12:26:30 +03:00
Hillel Coren
e7e7476505 Merge translation fix #825 2016-05-10 12:24:21 +03:00
Hillel Coren
d56a75ca5e Merge translation fix #832 2016-05-10 12:22:50 +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
2a90a548dd Fix for data viz 2016-05-10 12:20:53 +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
2345ff11ed Don't focus client select if client is already selected 2016-05-10 10:44:26 +03:00
Hillel Coren
12c185ca49 Fix for regex issue with product autocomplete 2016-05-09 20:57:23 +03:00
Hillel Coren
7317bfc8c9 Fixed issue with invoice history 2016-05-09 20:35:50 +03:00
Hillel Coren
786b6567b6 Hide unit cost if the quantity column is hidden 2016-05-09 17:40:55 +03:00
Hillel Coren
8bd2e84bc8 Track plan start date when manually applying a license 2016-05-09 15:07:01 +03:00
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
06437327fc Fixed change password for non-admins 2016-05-08 21:31:23 +03:00
Hillel Coren
fec948f1e8 Fixed searching for non-admins 2016-05-08 21:29:49 +03:00
Hillel Coren
4712780ff6 Fix for logo in bold design header 2016-05-08 19:25:29 +03:00
Hillel Coren
6b4d07346b Update alt tags 2016-05-08 19:09:18 +03:00
Hillel Coren
852b2f24a9 Updated readme 2016-05-08 19:01:08 +03:00
Hillel Coren
e551bb8dee Updated readme 2016-05-08 19:00:26 +03:00
Hillel Coren
eb814eec71 Added Czech #844 2016-05-08 18:57:32 +03:00
Hillel Coren
594b0e1bef Implemented server-side analytics tracking for revenue 2016-05-08 16:54:16 +03:00
Hillel Coren
7c67e66fb0 Sync ninja client when updating plan 2016-05-08 15:37:32 +03:00
Hillel Coren
f2e651d53f Added message if adding users insn't supported 2016-05-08 12:59:32 +03:00
Hillel Coren
eff9ba5ac0 Merge pull request #846 from Rayvw/feature/improve-dynamic-dates 
Improved dynamic dates of recurring invoices
 2016-05-08 11:20:18 +03:00
Hillel Coren
89b5d73615 Fix for loading tokens 2016-05-08 10:05:16 +03:00
Hillel Coren
cf9dbae1d1 Remove duplicate Auth include 2016-05-08 09:33:19 +03:00
Hillel Coren
c604ac5210 Merge branch 'joshuadwire-laravel-acl' into develop 2016-05-08 09:27:32 +03:00
Hillel Coren
bacf5bf856 Merge branch 'laravel-acl' of git://github.com/joshuadwire/invoiceninja into joshuadwire-laravel-acl 
Conflicts:
	app/Providers/AuthServiceProvider.php
 2016-05-08 09:27:18 +03:00
Raymond
986156117e Copy custom values of invoice items 2016-05-07 15:29:27 +02:00
Raymond
e4ce4e0fc8 Added dynamic dates to custom invoice fields + fixed bug in processing of notes, terms and footer. 2016-05-07 15:06:56 +02:00
Raymond
320e11fedb Fixed bug processing date variables upon saving a recurring invoice 2016-05-07 11:39:34 +02:00
Joshua Dwire
c4b17fedd8 Fix permissions bugs 2016-05-06 15:05:28 -04:00
Joshua Dwire
475f5430f3 Update BaseService.php 2016-05-06 14:54:58 -04:00
Joshua Dwire
bfb4267f43 Fix permissions bug for recurring invoices 2016-05-06 14:29:44 -04:00
Hillel Coren
7296c15730 Fix for footer font size in iOS mail 2016-05-06 15:54:58 +03:00
Hillel Coren
902827b7ac Put back custom fonts from client emails (it works in iOS) 2016-05-06 15:35:24 +03:00
Hillel Coren
a67fe34ba0 Removed custom fonts from client emails 2016-05-06 15:28:43 +03:00
Hillel Coren
3ddad385a3 Fix for setting default HTML email template 2016-05-06 15:05:28 +03:00
Hillel Coren
5322e16a4c Ensure contacts remain in the same order when saved 2016-05-05 23:09:11 +03:00
Hillel Coren
5bedba1474 Show if client is deleted on invoice page 2016-05-05 22:59:33 +03:00
Hillel Coren
5249ae0291 Added Pakistani Rupee 2016-05-05 22:49:09 +03:00
Hillel Coren
32c912f7b1 Added vat number to ninja clients 2016-05-05 22:34:45 +03:00