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

249 Commits

Author SHA1 Message Date
Hillel Coren
f2cbfec926 Improved options when exporting data 2016-07-05 17:27:30 +03:00
Hillel Coren
979690d116 Improved options when exporting data 2016-07-05 16:09:52 +03:00
Hillel Coren
b5f606df47 Added and as email template variables 2016-07-04 21:47:05 +03:00
Hillel Coren
f0a52a1bf7 Shortening pro plan process 2016-07-04 11:22:10 +03:00
Hillel Coren
65d0e350d0 Fix for bold/modern designs on customize page 2016-07-04 10:46:41 +03:00
Hillel Coren
429aba9471 Remove customize save button if not pro 2016-07-04 10:43:04 +03:00
Hillel Coren
9603439a33 Added additional designs 2016-06-29 22:48:56 +03:00
Hillel Coren
0449fe2515 Minor text/styling fixes 2016-06-28 21:22:16 +03:00
Hillel Coren
d71cf4dd49 Payment fixes 2016-06-26 19:38:36 +03:00
Hillel Coren
6ad49cf281 Fixing payment hooks 2016-06-23 16:15:52 +03:00
Hillel Coren
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
Hillel Coren
1a9f7bf098 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-09 10:56:31 +03:00
Hillel Coren
ffa67cef3b Refactoring payments code... 2016-06-09 10:56:22 +03:00
Hillel Coren
31fc4ad59c Merge pull request #911 from haleksandre/invoice-subtotals
Add custom labelling and style to multiple labels and amount in the subtotals table
2016-06-09 09:05:57 +03:00
Alexandre Villeneuve
eafdc12fa5 Add style to multiple subtotals labels 2016-06-08 14:00:44 -04:00
Hillel Coren
d5cb8b3abe Minor fixes 2016-06-05 22:55:23 +03:00
Hillel Coren
706c26b4d5 Minor fixes 2016-06-05 21:05:11 +03:00
Hillel Coren
37a92fc853 Fix for online payments page 2016-06-04 22:11:46 +03:00
Hillel Coren
a7f92d0726 Merge pull request #901 from joshuadwire/wepay-integration
Wepay integration
2016-06-03 11:20:31 +03:00
Hillel Coren
0acf4ff1fc Support importing JSON file 2016-06-02 22:03:59 +03:00
Joshua Dwire
49d47bb9e3 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-06-01 16:46:03 -04:00
Hillel Coren
42ac9507e5 Enabled importing products 2016-05-31 23:15:55 +03:00
Hillel Coren
cc2364a989 Check company website is a valid url 2016-05-29 19:34:51 +03:00
Hillel Coren
0e75ddb5e6 Added setting to hide second tax rate 2016-05-29 12:26:02 +03:00
Joshua Dwire
4dded687b5 Tweak payment settings page 2016-05-25 15:55:23 -04:00
Joshua Dwire
7d55ab033b Merge branch 'wepay-ach' into wepay-integration 2016-05-25 11:11:47 -04:00
Joshua Dwire
c701c5563c Add payment settings block 2016-05-25 10:36:40 -04:00
Joshua Dwire
9d4b42a514 Mention in the invoice notification that the invoice will be auto billed on the due date 2016-05-24 23:14:19 -04:00
Hillel Coren
cdfaae2700 Minor change to client portal settings page 2016-05-22 20:31:26 +03:00
Hillel Coren
99da41669b Fixes for #442 and #702 2016-05-22 13:10:58 +03:00
Hillel Coren
617ac98a75 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-05-18 22:58:42 +03:00
Joshua Dwire
e05bbd18ef Fix JS error 2016-05-18 10:00:33 -04:00
Hillel Coren
510f5cffac Auto populate Stripe keys for testing 2016-05-18 11:05:00 +03:00
Joshua Dwire
4f3bb7eeb4 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-17 15:07:53 -04:00
Joshua Dwire
e905b29510 Partial WePay ACH support 2016-05-17 14:09:39 -04:00
Joshua Dwire
43fade2339 Support app fees and Canadian users 2016-05-17 11:32:17 -04:00
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
a482c63ee3 Payments bug fixes 2016-05-15 16:27:56 -04:00
Hillel Coren
3df6ad2529 Changes to support transifex.com 2016-05-15 23:16:08 +03:00
Hillel Coren
46cf89361f Support manually importing OFX files 2016-05-15 14:06:25 +03:00
Hillel Coren
b067697b1c Support manually importing OFX files 2016-05-15 13:58:11 +03:00
Joshua Dwire
9afd0741f7 Better WePay setup UI 2016-05-14 22:32:27 -04:00
Joshua Dwire
1524447cd4 WePay fixes; support account updater 2016-05-14 22:22:06 -04:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Joshua Dwire
ba000546c4 Better WePay switching 2016-05-12 11:09:07 -04:00
Joshua Dwire
88c9fc1ac1 Add WePay configuration UI 2016-05-11 22:55:37 -04:00
Joshua Dwire
fc029a62e1 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 22:32:28 -04:00
Joshua Dwire
88ec714cd5 Store Stripe card summary locally 2016-05-10 18:46:32 -04:00
Hillel Coren
ee579f91f3 Added plan help text 2016-05-10 21:17:46 +03:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00