Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 03:37:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,194 Commits 7 Branches 902 Tags
Commit Graph

4194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hillel Coren
0f47cbef51 Merge pull request #853 from joshuadwire/payments-changes 
Payments bug fixes
 2016-05-11 18:42:16 +03:00
Joshua Dwire
581ae1baa6 Handle currency not set 2016-05-11 11:30:45 -04:00
Joshua Dwire
fb4806dab7 Include email for PayPal 2016-05-11 11:30:17 -04:00
Joshua Dwire
981045b28b Better Stripe support 2016-05-11 09:57:44 -04:00
Hillel Coren
f03adc767e Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-05-11 09:28:55 +03:00
Hillel Coren
727fd49801 Merge pull request #847 from joshuadwire/payments-changes 
Payments changes
 2016-05-11 09:26:41 +03:00
Hillel Coren
0f95799f33 Improved 'return to app' button logic 2016-05-11 09:22:43 +03:00
Joshua Dwire
fc029a62e1 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 22:32:28 -04:00
Joshua Dwire
258401715c Update billing address when adding payment method 2016-05-10 22:15:32 -04:00
Joshua Dwire
745a6b7d84 Merge pull request #7 from joshuadwire/wepay-integration 
Fix gateway ids
 2016-05-10 21:37:05 -04:00
Joshua Dwire
dcf231c6a5 Fix gateway ids 2016-05-10 21:30:52 -04:00
Joshua Dwire
8b10460307 Merge pull request #6 from joshuadwire/wepay-integration 
Store card summary locally
 2016-05-10 19:26:44 -04:00
Joshua Dwire
6138e1132f Make sure payments reference newly added payment methods 2016-05-10 19:18:12 -04:00
Joshua Dwire
104264607b Pad last 4 card digits to a string of length 4, since we're storing it as an int 2016-05-10 19:17:55 -04:00
Joshua Dwire
b8514436a9 Pad last 4 card digits to a string of length 4, since we're storing it as an int 2016-05-10 19:17:41 -04:00
Joshua Dwire
0ca073291e Make storing card summary locally part of payments changes 2016-05-10 19:17:14 -04:00
Joshua Dwire
cc5cb091d7 Store Braintree card summary locally 2016-05-10 19:16:53 -04:00
Joshua Dwire
88ec714cd5 Store Stripe card summary locally 2016-05-10 18:46:32 -04:00
Hillel Coren
1dc692d578 Updated readme 2016-05-10 22:51:17 +03:00
Hillel Coren
b3439d9ab7 Clean up diffs between branches 2016-05-10 22:41:30 +03:00
Hillel Coren
147c51f6f9 Clean up diffs between branches 2016-05-10 22:39:54 +03:00
Hillel Coren
3c21179e4e Fixed white label after image 2016-05-10 21:42:50 +03:00
Hillel Coren
9d906299f3 Merge branch 'release-2.5.2' into develop 2016-05-10 21:41:30 +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
v2.5.2 		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
Joshua Dwire
ad39f106db Remove email parameter when creating credit card token 2016-05-10 11:24:04 -04:00
Joshua Dwire
07a82870e1 Merge in change to include email when creating Stripe customer 2016-05-10 10:27:21 -04:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04: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
David Bomba
050b79cc75 user transformer - add fields 2016-05-10 09:26:44 +10:00
David Bomba
e795ac28cd Merge remote-tracking branch 'upstream/develop' into develop 2016-05-10 09:26:15 +10:00
Joshua Dwire
20f6f32a06 Update UI for configuring auto bill 2016-05-09 16:29:02 -04: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
David Bomba
dbdd1ac155 working with permissions 2016-05-09 10:28:47 +10:00
David Bomba
5233047ab1 working with permissions 2016-05-09 10:09:51 +10:00