Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 13:42:49 +01:00
Code Issues Releases Activity
5,171 Commits 7 Branches 919 Tags 2 GiB
b680891929
Commit Graph

391 Commits

Author SHA1 Message Date
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
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
f2e651d53f Added message if adding users insn't supported 2016-05-08 12:59:32 +03:00
Joshua Dwire
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
Hillel Coren
3ddad385a3 Fix for setting default HTML email template 2016-05-06 15:05:28 +03:00
Hillel Coren
6971060049 Added preview for email templates 2016-05-05 19:25:26 +03:00
Hillel Coren
c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
Hillel Coren
ef2bc3d811 White label changes 2016-05-05 09:52:59 +03:00
Joshua Dwire
ed1f2b6044 Handle failed payments 2016-04-30 17:54:56 -04:00
Joshua Dwire
e5fb354643 Support configuring Stripe for ACH and Plaid 2016-04-28 16:38:01 -04:00
Joshua Dwire
fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04:00
Hillel Coren
cfb4dc4351 Hide zapier button for resellers 2016-04-24 20:41:30 +03:00
Hillel Coren
cf75a2c2d2 Merge pull request #823 from joshuadwire/enterprise-plan 
Fix refunds; support using stored card; change proPlanModel link
 2016-04-21 10:39:34 +03:00
Joshua Dwire
9d27b68fb6 Fix refunds; support using stored card; change proPlanModel link 2016-04-20 16:53:56 -04:00
Hillel Coren
0dcee794b5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	resources/lang/en/texts.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/invoices/edit.blade.php
 2016-04-19 22:48:03 +03:00
Hillel Coren
32d5a25f61 Enabled specifying invoice padding 2016-04-19 14:26:42 +03:00
Hillel Coren
9f5fe33059 Added page size and live preview settings 2016-04-19 10:51:57 +03:00
Joshua Dwire
22f65e8108 Finalize multi-plan support 
* Allow admins to change plan
* Check features instead of plans
* Support linking/unlinking accounts
* Support creating/deleting accounts
 2016-04-18 22:35:18 -04:00
Joshua Dwire
63b2c2c6b1 More intuitive account management page 2016-04-16 22:28:11 -04:00
Joshua Dwire
e0568faae1 Merge pull request #3 from joshuadwire/attached-documents 
Fix logo filesystem usage
 2016-04-16 19:17:34 -04:00
Joshua Dwire
33b8566d18 Fix logo filesystem usage 2016-04-16 19:14:43 -04:00
Joshua Dwire
9b1bfef698 Add support for multiple plans/terms 2016-04-16 18:34:39 -04:00
Joshua Dwire
51cd82cba8 Move cancel account to new account management page 2016-04-16 10:58:53 -04:00
Hillel Coren
9b8b150766 Implemented enable_client_portal_dashboard 2016-04-13 22:08:41 +03:00
Hillel Coren
80c77adf03 Fix sizing of large logo 2016-04-13 18:49:39 +03:00
Hillel Coren
fdde60577c Fixed problem creating a new payment gateway 2016-04-08 10:38:11 +03:00
Joshua Dwire
2a7e8cb4b7 Add documents placeholder for emails 2016-03-23 21:25:33 -04:00
Joshua Dwire
f7d8f819b6 Add option to attach documents to invoice email 2016-03-23 19:20:08 -04:00
Joshua Dwire
942f543bbb Display documents in invoice PDF 2016-03-23 18:40:42 -04:00
Joshua Dwire
5640c74f35 Migrate logos to use Laravel Filesystem 2016-03-22 16:19:55 -04:00
Hillel Coren
6a55cf56a0 Updated placeholder for iframe url 2016-03-22 19:35:57 +02:00
Hillel Coren
beede39e85 Updated to the latest version of Laravel 2016-03-22 16:09:48 +02:00
Hillel Coren
dab023d898 Minor styling changes 2016-03-22 12:08:48 +02:00
Hillel Coren
c3c7f25b32 Clarified partial labels 2016-03-18 14:34:46 +02:00
Hillel Coren
9b9e99ee78 Added SagePay referral 2016-03-17 15:28:28 +02:00
Hillel Coren
9a29efbc6f Merge pull request #771 from joshuadwire/user-permissions 
User permissions
 2016-03-17 09:54:36 +02:00
Joshua Dwire
0148d06205 Add user permission support 2016-03-15 19:08:00 -04:00
Hillel Coren
e0499ccf67 Show 'Create first invoice' for sample message 2016-03-15 22:24:09 +02:00
Hillel Coren
a31d8b8176 Capitalize payment gateway fields 2016-03-15 13:57:50 +02:00
Hillel Coren
a2cbc1b225 Corrected setting password checkboxes 2016-03-08 19:42:22 +02:00
Joshua Dwire
82fadab632 Finalize support for emailing passwords 2016-03-07 20:25:26 -05:00
Joshua Dwire
0166576987 Fix password placeholder in email template 2016-03-05 18:16:23 -05:00
Joshua Dwire
d0d30e1e26 Add support for including password in email; include portal customizations 2016-03-05 18:09:50 -05:00
Joshua Dwire
903904d423 Merge Laravel 5.2 upgrade 2016-03-03 21:57:15 -05:00
Hillel Coren
aef4c6be98 Upgrade to Laravel 5.2 2016-03-02 15:36:42 +02:00
Hillel Coren
3b5311e960 Added setting to show/hide client portal dashboard 2016-03-01 09:36:37 +02:00
Joshua Dwire
6376302ed9 Add option for client portal password 2016-02-29 16:46:27 -05:00
Hillel Coren
553c548f31 Enabled setting recurring invoice number prefix 2016-02-28 20:36:11 +02:00
Hillel Coren
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
Hillel Coren
96e7fab55c Matched vendor when importing expenses 2016-02-27 22:41:23 +02:00
Hillel Coren
308e5a1656 Improvements to search 2016-02-25 23:33:48 +02:00
Hillel Coren
4a749d5868 Improvements to custom designer 2016-02-25 20:34:23 +02:00
Hillel Coren
689efc3e3e Lazy load images 2016-02-25 12:16:27 +02:00
Hillel Coren
6b64910c9d Prevent reloading page when showing/hiding archived 2016-02-18 20:14:48 +02:00
Hillel Coren
668eab0279 Hide ‘Client Portal’ settings for hosted users 2016-02-15 20:05:41 +02:00
Hillel Coren
6b8b59a407 Hide subdomain/iframe setting for self hosts 2016-02-14 21:13:11 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
Hillel Coren
8a9eb97134 Working on enabling showing currency code 2016-02-04 16:19:49 +02:00
Hillel Coren
2b3e35687a Bug fixes 2016-02-04 16:12:22 +02:00
Hillel Coren
cc49415a78 Added invoiceDate as email template variable 2016-02-03 22:10:09 +02:00
Hillel Coren
523b008d01 Added support for right aligning table columns 2016-02-01 15:58:52 +02:00
Hillel Coren
63c1293e3b Add Header/Footer options to invoice design settings 2016-01-31 23:55:02 +02:00
Hillel Coren
387f89440c Add Header/Footer options to invoice design settings 2016-01-31 23:42:20 +02:00
Hillel Coren
dafc5b9378 Added url type to invoice link website field 2016-01-31 22:36:06 +02:00
Hillel Coren
02f137f95f Implemented StackTraceJS 2016-01-31 21:36:50 +02:00
Hillel Coren
bdeb062657 Refining how expenses convert to products 2016-01-27 22:38:21 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
Hillel Coren
b24a6109ba Working on expenses 2016-01-21 21:15:30 +02:00
Hillel Coren
dff7ad91c8 Merge: Bugfixed version of Vendor / Expense module (#635) 2016-01-21 00:09:10 +02:00
Hillel Coren
9287118cd0 Merging: Bugfixed version of Vendor / Expense module #635 2016-01-20 16:06:17 +02:00
Hillel Coren
6166464003 Merge: Make automatic conversion of quote to invoice optional (#636) 2016-01-20 10:41:57 +02:00
Hillel Coren
bf778aa616 Initial work on OFX support 2016-01-20 01:07:31 +02:00
Hillel Coren
4d5aa1a712 Disabled autocomplete on self host system settings form 2016-01-18 12:53:26 +02:00
Hillel Coren
89ff1be14f Manually merging PR #630 2016-01-18 11:13:39 +02:00
steenrabol
6133c6ff07 Merge branch 'master' of https://github.com/invoiceninja/invoiceninja 
# Conflicts:
#	app/Http/Controllers/InvoiceController.php
#	resources/lang/en/texts.php
#	resources/views/invoices/edit.blade.php
 2016-01-11 20:39:18 +01:00
Hillel Coren
cf24684adb Check user is pro to use custom fonts 2016-01-11 14:50:17 +02:00
Hillel Coren
d72ff27e62 Improved invoice design form layout 2016-01-10 20:40:04 +02:00
Hillel Coren
c6ff456d4d Fixes #608 2016-01-10 14:37:23 +02:00
steenrabol
d8a501ed95 Posibility to modify payment terms 2016-01-07 20:39:51 +01:00
Hillel Coren
4549643fdc Bug fix 2016-01-07 09:40:46 +02:00
Hillel Coren
77f9e89b40 Added _id to header/body font properties 2016-01-07 09:19:57 +02:00
Hillel Coren
14192846e8 Merging: custom font support 2016-01-07 09:08:30 +02:00
Hillel Coren
f65dbde5bf Updated custom css textarea sizing 2016-01-06 12:26:47 +02:00
Hillel Coren
c5985ce6c4 Show change password button in self host install 2016-01-05 20:53:23 +02:00
Hillel Coren
0140da0ae2 Renamed client view to client portal 2016-01-03 21:10:20 +02:00
Hillel Coren
56330c1281 Merge pull request #588 from joshuadwire/custom-css 
Add custom CSS support
 2016-01-03 14:45:16 +02:00
Hillel Coren
db2e37d31b Hide payments file for non-Wave imports 2015-12-31 16:33:29 +02:00
Hillel Coren
35bb36fd34 Bug fixes 2015-12-31 12:23:39 +02:00
Joshua Dwire
b7687967a6 Add custom CSS support 
* Allow custom CSS for self-hosted white-label users or Pro
invoiceninja.com users
* Restrictive sanitization for CSS on invoiceninja.com
* Add .body class to body element to allow styling the body
* Add client_view_css column to accounts table
* English-only translation text
 2015-12-30 13:11:51 -05:00
Hillel Coren
60daef8d58 Bug fixes 2015-12-29 19:49:40 +02:00
Hillel Coren
2ead34fef0 Enabled setting reminder before/after due date or invoice date 2015-12-28 12:15:56 +02:00
Hillel Coren
991b19b2a2 Bug fixes 2015-12-24 13:17:11 +02:00
Hillel Coren
c0409b86fd Added custom labels to email variables 2015-12-23 16:21:48 +02:00
Hillel Coren
3f1891fa3b Bug fixes 2015-12-23 13:49:49 +02:00
Hillel Coren
9341ea0c87 Bug fixes 2015-12-22 14:06:53 +02:00
Hillel Coren
9603c43277 Bug fixes 2015-12-21 21:57:55 +02:00
Hillel Coren
4dc7a8d5f1 Working on email markup 2015-12-16 13:49:26 +02:00
Hillel Coren
08a4c4dcb4 Added email settings page 2015-12-15 22:25:12 +02:00
Hillel Coren
e893d74b41 Added company website 2015-12-14 23:05:17 +02:00
Hillel Coren
76689802d9 Working on data import 2015-12-10 13:03:45 +02:00
Hillel Coren
ff139bc09c Working on data import 2015-12-10 12:57:51 +02:00
Hillel Coren
e46d804cd7 Working on importing data from more providers 2015-12-07 23:41:48 +02:00
Hillel Coren
19ce3e3063 Add settings help texts 2015-12-03 17:35:41 +02:00
Hillel Coren
c5a1abf66f Added HTML email designs 2015-12-02 15:26:06 +02:00
Hillel Coren
165ecd0bf0 Added support for Stripe.js 2015-11-29 22:13:50 +02:00
Hillel Coren
ae57fdf9a3 Updated readme 2015-11-24 21:45:38 +02:00
Hillel Coren
61ed298699 Minor improvements 2015-11-21 23:10:26 +02:00
Hillel Coren
bcad8af535 Working on import 2015-11-18 19:16:23 +02:00
Hillel Coren
5c6b2fe906 Working on import 2015-11-18 16:40:50 +02:00
Hillel Coren
24bcb0e2e5 Merging import changes 2015-11-17 15:53:14 +02:00
Hillel Coren
1b099d09cc Check for large logo image files 2015-11-16 20:02:04 +02:00
Hillel Coren
f574a79fe6 Improved data export 2015-11-12 22:36:28 +02:00
Hillel Coren
6ae83e8469 Bug fixes 2015-11-11 14:20:51 +02:00
Hillel Coren
7273e39f1e Bug fixes 2015-11-11 14:17:58 +02:00
Hillel Coren
02aa10e41d Corrected form autocomplete behavior 2015-11-09 16:53:18 +02:00
Hillel Coren
436b8be8d9 Refactoring datatable code 2015-11-06 00:37:04 +02:00
Hillel Coren
0953fbe7cd Added Quill to email signature 2015-11-05 12:02:14 +02:00
Hillel Coren
cb243fec0a Working on the API 2015-11-05 10:44:48 +02:00
Hillel Coren
d0f8ee7797 Added HTML editor for client emails 2015-11-04 23:52:12 +02:00
Hillel Coren
65e959e84d Added system settings page 2015-11-04 15:57:59 +02:00
Hillel Coren
9b840a24dd Enabled social login 2015-11-01 20:21:11 +02:00
Hillel Coren
11d9192a0f Fixes #492 2015-10-31 23:56:49 +02:00
Hillel Coren
aa0a35f9d8 Added default quote terms 2015-10-29 16:42:05 +02:00
Hillel Coren
4a3beeeae7 Bug fixes 2015-10-25 13:08:11 +02:00
Hillel Coren
7ca98c9080 Custom invoice/quote numbers 2015-10-22 21:48:12 +03:00
Hillel Coren
47f38ad54e Added support for default taxes 2015-10-21 14:11:08 +03:00
Hillel Coren
88c215d1df Bug fixes 2015-10-20 11:23:38 +03:00
Hillel Coren
9283362d28 Bug fixes 2015-10-18 10:30:28 +03:00
Hillel Coren
c24b2f352d Updated version 2015-10-16 08:32:02 +03:00
Hillel Coren
1ab154aba9 Bug fixes 2015-10-15 22:37:01 +03:00
Hillel Coren
a4960245c2 Bug fixes 2015-10-15 09:19:41 +03:00
Hillel Coren
8da5517206 Bug fixes 2015-10-14 23:56:17 +03:00
Hillel Coren
d34fbcf726 Styling forms 2015-10-14 20:18:19 +03:00
Hillel Coren
831c81a4b9 Improved settings navigation 2015-10-14 17:15:39 +03:00
Hillel Coren
d3550903f4 Bug fix 2015-10-14 08:18:14 +03:00
Hillel Coren
aef0fe8430 Added client dashboard 2015-10-13 18:44:01 +03:00
Hillel Coren
2dfc053cbc Bug fixes 2015-10-13 10:11:44 +03:00
Hillel Coren
1d04bc2a05 Added custom invoice text fields 2015-10-11 17:41:09 +03:00
Hillel Coren
cb16e7f950 Added support for basic markdown 2015-10-01 23:02:22 +03:00
Hillel Coren
f8b449a471 Added warning when form token is about to expire 2015-09-28 23:37:32 +03:00
Hillel Coren
4268c18f8a Fixed money format in PDF for EU 2015-09-25 12:57:40 +03:00
Hillel Coren
6b063abe9a Bug fixes 2015-09-21 00:05:02 +03:00
Hillel Coren
98cabd4138 Added auto-reminder emails 2015-09-17 22:01:06 +03:00
Hillel Coren
4741fad4be Added auto-billing and per-client language support 2015-09-10 20:50:09 +03:00
Hillel Coren
3fdad48179 API improvements 2015-09-07 12:07:55 +03:00
Hillel Coren
ba50e701c8 Integration tests 2015-08-30 15:08:15 +03:00
Hillel Coren
d9e08da031 Added inline documentation 2015-08-16 20:14:03 +03:00
Hillel Coren
9e6b25bcc4 Bug fixes 2015-08-14 15:04:33 +03:00
Hillel Coren
dc8bd36e76 Moved line item tax amounts to invoice subtotals section 2015-08-12 22:16:02 +03:00
Hillel Coren
0e15c12298 Bug fixes 2015-08-11 17:38:36 +03:00
Hillel Coren
4b7d143630 Minor fixes 2015-08-03 22:08:07 +03:00
Hillel Coren
4fa4f65005 Support updating invoices through the API 2015-07-30 17:44:47 +03:00
Hillel Coren
ba8419356d Moved invoice design files 2015-07-28 10:00:00 +03:00
Hillel Coren
76a53ed5dc Working on invoice customizer 2015-07-26 23:05:38 +03:00
Hillel Coren
912fe5b7a3 Working on invoice customizations 2015-07-24 17:13:17 +03:00
Hillel Coren
35d794b36f Enabled customizing invoice designs 2015-07-21 21:51:56 +03:00
Hillel Coren
b9c00a0531 Re-worked editing task details 2015-07-12 22:43:45 +03:00
Hillel Coren
839fc6bb75 Removed product key length limit 2015-06-14 11:55:02 +03:00
Hillel Coren
fcaacdf48b Bug fixes 2015-06-10 23:55:23 +03:00