Hillel Coren
|
f5eddcbc62
|
Merge pull request #857 from bSzala/polish_currency
Add Polish currency into a CurrenciesSeeder
|
2016-05-12 12:06:49 +03:00 |
|
Joshua Dwire
|
88c9fc1ac1
|
Add WePay configuration UI
|
2016-05-11 22:55:37 -04:00 |
|
David Bomba
|
e738a58a42
|
Merge pull request #858 from turbo124/develop
Permissions fields for Invoice Transformer
|
2016-05-12 08:29:55 +10:00 |
|
David Bomba
|
7c0e2f4420
|
added in additional fields for Invoice Transformer
|
2016-05-12 08:28:49 +10:00 |
|
David Bomba
|
2b23a80fda
|
rewind
|
2016-05-12 08:27:21 +10:00 |
|
Hillel Coren
|
7ad81bdf5e
|
Merge pull request #856 from bSzala/translation
Working on polish translations
|
2016-05-11 23:18:29 +03:00 |
|
Bartlomiej Szala
|
8185e87d0d
|
Add Polish currency into a CurrenciesSeeder
|
2016-05-11 22:12:00 +02:00 |
|
Bartlomiej Szala
|
ae6d85bb49
|
Working on texts translations
|
2016-05-11 20:59:40 +02:00 |
|
Hillel Coren
|
4a84b16b68
|
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
|
2016-05-11 21:56:43 +03:00 |
|
Hillel Coren
|
b56ac2145d
|
Merge pull request #855 from joshuadwire/payments-changes
More payments bug fixes
|
2016-05-11 21:54:32 +03:00 |
|
Joshua Dwire
|
f060a24f12
|
Merge remote-tracking branch 'upstream/develop' into wepay-integration
|
2016-05-11 14:47:28 -04:00 |
|
Joshua Dwire
|
573c17431f
|
More bug fixes
|
2016-05-11 14:12:52 -04:00 |
|
Hillel Coren
|
269aaa73bf
|
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
|
2016-05-11 20:00:12 +03:00 |
|
Hillel Coren
|
b5a03915e2
|
Merge pull request #854 from joshuadwire/payments-changes
Payments bug fixes - Part 2
|
2016-05-11 19:55:36 +03:00 |
|
Joshua Dwire
|
0d41d8aeb6
|
Payments bug fixes - Part 2
|
2016-05-11 12:53:43 -04:00 |
|
Hillel Coren
|
60ad92c2f0
|
Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
|
2016-05-11 18:45:11 +03:00 |
|
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
|
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
|
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 |
|