1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

108 Commits

Author SHA1 Message Date
Hillel Coren
a82437b2bc Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
Conflicts:
	app/Http/routes.php
	resources/lang/en/texts.php
2016-05-16 11:34:00 +03:00
Joshua Dwire
f6942a199f Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-15 21:21:59 -04:00
Joshua Dwire
a482c63ee3 Payments bug fixes 2016-05-15 16:27:56 -04:00
Joshua Dwire
1524447cd4 WePay fixes; support account updater 2016-05-14 22:22:06 -04:00
Joshua Dwire
ce04c994dd Support payments and storing cards via WePay. 2016-05-13 09:30:22 -04:00
Hillel Coren
32ab340b74 Added fake card details for test payment 2016-05-13 16:00:07 +03:00
Hillel Coren
751b084a59 Fix javasript typo 2016-05-12 22:35:33 +03:00
Joshua Dwire
0d41d8aeb6 Payments bug fixes - Part 2 2016-05-11 12:53:43 -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
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
88ec714cd5 Store Stripe card summary locally 2016-05-10 18:46:32 -04: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
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
Joshua Dwire
cf98c37f40 Better Braintree support 2016-05-06 17:05:42 -04:00
Joshua Dwire
70b9c9bba7 Require authorization for ACH 2016-05-06 11:21:06 -04:00
Joshua Dwire
37f4430e62 Move payment methods to dashboard when enabled 2016-05-06 11:06:01 -04:00
Joshua Dwire
77bd6f7bc5 Restyle add bank account page 2016-05-06 10:50:50 -04:00
Joshua Dwire
d78b874838 Add Plaid support 2016-04-30 22:45:51 -04:00
Joshua Dwire
92552dc94f Remove obsolete payment page 2016-04-30 17:56:40 -04:00
Joshua Dwire
c536bd8569 Add basic ACH support 2016-04-29 17:50:21 -04:00
Joshua Dwire
1cb2b9dc25 Use existing PaymentType instead of CardType 2016-04-27 22:13:51 -04:00
Joshua Dwire
fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04:00
Hillel Coren
0621817660 Added client side card check with StripeJS 2016-03-14 12:12:09 +02:00
Hillel Coren
eb6cd45913 Minor fixes 2016-03-03 21:39:15 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
Hillel Coren
c14133d66e Added new logo 2016-02-03 10:08:28 +02:00
Hillel Coren
89622f86e2 Fix for #661 2016-01-28 16:07:03 +02:00
Hillel Coren
1ac12e1506 Added basic stats for resellers 2016-01-28 14:04:55 +02:00
Hillel Coren
360b59baa0 Working on expenses 2016-01-22 00:29:10 +02:00
Hillel Coren
e46d804cd7 Working on importing data from more providers 2015-12-07 23:41:48 +02:00
Hillel Coren
1a474f362f Added support for country specific Euro formatting 2015-12-07 15:34:55 +02:00
Hillel Coren
165ecd0bf0 Added support for Stripe.js 2015-11-29 22:13:50 +02:00
Hillel Coren
4a0906a92c Bug fixes 2015-11-18 23:37:11 +02:00
Hillel Coren
b55a3226b7 Starting on stripejs 2015-11-09 21:24:22 +02:00
Hillel Coren
02aa10e41d Corrected form autocomplete behavior 2015-11-09 16:53:18 +02:00
Hillel Coren
72c7cbb237 Added 'apply credit' action 2015-11-04 09:48:47 +02:00
Hillel Coren
9b840a24dd Enabled social login 2015-11-01 20:21:11 +02:00
Hillel Coren
404435a145 Refactored to events 2015-10-28 21:22:07 +02:00
Hillel Coren
3fdad48179 API improvements 2015-09-07 12:07:55 +03:00
Hillel Coren
0183c02ef6 Added online payment acceptance test 2015-09-01 21:40:30 +03:00
Hillel Coren
914334511e Enhancements to the dashboard 2015-07-29 22:55:12 +03:00
Hillel Coren
b9c00a0531 Re-worked editing task details 2015-07-12 22:43:45 +03:00
Hillel Coren
a301e58609 Enabled sending payment confirmation email for manual payment entries 2015-06-14 20:30:01 +03:00
Hillel Coren
1c1bef3abb Bug fixes 2015-06-10 11:34:20 +03:00
Hillel Coren
b80842759e Bug fixes 2015-06-04 23:53:58 +03:00
Hillel Coren
edec5028c6 Bug fixes 2015-05-19 22:14:00 +03:00
Hillel Coren
fcbec2617b Bug fixes 2015-05-10 22:02:35 +03:00
Hillel Coren
f41e0d999b Bug fixes 2015-05-09 21:25:16 +03:00
Hillel Coren
bc10719fbe Added support for custom subdomains 2015-04-28 23:13:52 +03:00
Hillel Coren
dc6ed9fca1 Updating design 2015-04-22 22:21:04 +03:00
Hillel Coren
e95b6461bb Working on L5 2015-04-20 17:34:23 +03:00
Hillel Coren
be327fbcbf Added support for Bitcoin 2015-04-15 19:35:41 +03:00
Jeramy Simpson
c1db859c8e L5 Updates 2015-04-06 10:28:43 +10:00
Hillel Coren
83a48df567 Working on L5 2015-04-02 16:06:16 +03:00
Hillel Coren
4fc7e3f5d1 Reworking events for L5 2015-03-31 20:42:37 +03:00
Jeramy Simpson
04c392136e Add Files 2015-03-17 07:45:25 +10:00