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

884 Commits

Author SHA1 Message Date
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
Hillel Coren
2a90a548dd Fix for data viz 2016-05-10 12:20:53 +03:00
Hillel Coren
2345ff11ed Don't focus client select if client is already selected 2016-05-10 10:44:26 +03:00
Joshua Dwire
20f6f32a06 Update UI for configuring auto bill 2016-05-09 16:29:02 -04:00
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
6b4d07346b Update alt tags 2016-05-08 19:09:18 +03:00
Hillel Coren
eb814eec71 Added Czech #844 2016-05-08 18:57:32 +03:00
Hillel Coren
594b0e1bef Implemented server-side analytics tracking for revenue 2016-05-08 16:54:16 +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
Joshua Dwire
cf98c37f40 Better Braintree support 2016-05-06 17:05:42 -04:00
Joshua Dwire
9ed44bdfe4 Merge pull request #4 from joshuadwire/laravel-acl
Laravel acl
2016-05-06 14:17:16 -04:00
Joshua Dwire
9a64db3234 Allow client to choose auto bill settings 2016-05-06 13:26:37 -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
Hillel Coren
902827b7ac Put back custom fonts from client emails (it works in iOS) 2016-05-06 15:35:24 +03:00
Hillel Coren
a67fe34ba0 Removed custom fonts from client emails 2016-05-06 15:28:43 +03:00
Hillel Coren
3ddad385a3 Fix for setting default HTML email template 2016-05-06 15:05:28 +03:00
Hillel Coren
5bedba1474 Show if client is deleted on invoice page 2016-05-05 22:59:33 +03:00
Hillel Coren
5249ae0291 Added Pakistani Rupee 2016-05-05 22:49:09 +03:00
Hillel Coren
54be2f0b84 Improvements to the user table seeder 2016-05-05 20:18:02 +03:00
Hillel Coren
47cd8a0a33 Added preview for email templates 2016-05-05 19:43:44 +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
7744c6c41c White label changes 2016-05-05 09:58:14 +03:00
Hillel Coren
ef2bc3d811 White label changes 2016-05-05 09:52:59 +03:00
Hillel Coren
db9d75ceff Changed vendorcontacts to vendor_contacts 2016-05-04 15:16:49 +03:00
Hillel Coren
8972ceab62 Merge pull request #840 from bSzala/polishtranslations
Add polish translations
2016-05-03 19:45:20 +03:00
emiliolodigiani
5295bf30fc Revert typo fix 2016-05-03 15:11:34 +02:00
emiliolodigiani
fb473eeb3b Update italian translation 2016-05-03 15:09:13 +02:00
Bartlomiej Szala
39141d469f Add polish translations 2016-05-03 12:47:26 +00:00
Hillel Coren
65c8ef4078 Moving permissions to form requests 2016-05-01 15:35:51 +03:00
Hillel Coren
2efd419791 Moving permissions to form requests 2016-05-01 15:04:55 +03:00
Hillel Coren
2e2470e11c Send contact's email when creating Stripe token 2016-05-01 09:43:41 +03: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
2af509058b Fix errors 2016-04-30 17:55:29 -04:00
Joshua Dwire
ed1f2b6044 Handle failed payments 2016-04-30 17:54:56 -04:00
Joshua Dwire
c536bd8569 Add basic ACH support 2016-04-29 17:50:21 -04:00
Christian González
ac57dcdcc3 Changed "Klient" to "Kunde" to be consistent. 2016-04-29 21:57:18 +02:00
Christian González
c9ac804e5f Some more German translations
I left out some strings when I was not completely sure about.
2016-04-29 21:54:38 +02:00
Joshua Dwire
e5fb354643 Support configuring Stripe for ACH and Plaid 2016-04-28 16:38:01 -04:00
Joshua Dwire
1cb2b9dc25 Use existing PaymentType instead of CardType 2016-04-27 22:13:51 -04:00
Joshua Dwire
1a12cd30d3 Hide autobill when both Stripe and Braintree are not configured 2016-04-26 20:02:52 -04:00
Joshua Dwire
fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04:00
Hillel Coren
782cda4004 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-26 23:31:31 +03:00
Hillel Coren
2712f92422 Merge pull request #826 from joshuadwire/laravel-acl
Laravel ACL
2016-04-26 23:29:53 +03:00
Hillel Coren
996b6d4ce6 Fixed typo in text files 2016-04-26 21:11:41 +03:00
Hillel Coren
f28e0cd76b Fix for JS rounding problem 2016-04-26 12:41:34 +03:00
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
Hillel Coren
cfb4dc4351 Hide zapier button for resellers 2016-04-24 20:41:30 +03:00
Hillel Coren
604c132a3a Temporary workaround to support not setting the CVC/CVV 2016-04-24 16:14:35 +03:00
Joshua Dwire
6e3b53f3cb Make expiration table wrap with expiration date 2016-04-23 22:31:39 -04:00
Joshua Dwire
42c1f537bc Store/display credit card type, expiration and last 4 digits 2016-04-23 22:10:51 -04:00
Joshua Dwire
b8170f0324 Support refunds from the admin UI 2016-04-23 16:40:19 -04: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
Joshua Dwire
eb91a3cd42 Fix typos 2016-04-19 16:31:50 -04:00
Hillel Coren
d6608f863c Syntax fix 2016-04-19 23:01:44 +03: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
cd52faa3bf Automatically disable live preview when using a large font 2016-04-19 14:12:02 +03:00
Hillel Coren
a805e2b8bb Merge pull request #814 from joshuadwire/enterprise-plan
Enterprise plan
2016-04-19 12:01:56 +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
Hillel Coren
11019e5dc1 Improved HTML email margins 2016-04-18 10:28:30 +03:00
rafael.sisweb
93ab0e4308 Improve pt_BR translate new texts 2016-04-17 21:36:22 -04:00
Hillel Coren
7d08a7cddd Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-17 12:22:51 +03: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
b2de7c84eb Changed /forgot to /recover_password 2016-04-15 13:25:58 +03:00
Hillel Coren
a705c61d47 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-14 16:09:25 +03:00
Raymond
20b982216f Updated many dutch lang records 2016-04-14 12:33:03 +02:00
Hillel Coren
f75b67b704 Trim whitespace in JS from emails on invoice page 2016-04-14 10:39:12 +03:00
Hillel Coren
b51cea769f Track JS errors as analytics events 2016-04-14 10:32:48 +03: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
8550543089 Made textareas the same width 2016-04-13 17:35:36 +03:00
Hillel Coren
def0e1a24a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-13 10:48:20 +03:00
emiliolodigiani
c49de3cfd5 Update italian texts 2016-04-12 17:16:13 +02:00
Hillel Coren
74b524aada Add scrollbar to product list 2016-04-11 13:30:23 +03:00
Hillel Coren
27f72a4730 Fix for tax rates test 2016-04-11 11:48:46 +03:00
Hillel Coren
d4915074b6 Fix for quotes 2016-04-11 11:44:53 +03:00
Hillel Coren
1e44929883 Fixed issue initially showing expenses for vendor 2016-04-10 22:49:48 +03:00
Hillel Coren
ec7fd5ff0c Limited account search 2016-04-10 15:44:45 +03:00
Hillel Coren
769465542d Show info icon as orange if invitation opened but not viewed 2016-04-09 23:36:32 +03:00
Hillel Coren
fdde60577c Fixed problem creating a new payment gateway 2016-04-08 10:38:11 +03:00
Hillel Coren
f8256127ec Working on multiple tax rates 2016-03-31 13:28:22 +03:00
Hillel Coren
be9e7beaed Support for multiple tax rates 2016-03-31 12:29:01 +03:00
Hillel Coren
f91f32323f Reworking taxes 2016-03-29 17:30:28 +03:00
Hillel Coren
d2d22fbb50 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
Conflicts:
	resources/views/invoices/knockout.blade.php
2016-03-27 18:20:48 +03:00
Hillel Coren
d70bc4e922 Support multiple tax rates 2016-03-27 18:06:02 +03:00
Joshua Dwire
b5a948583e Remove debug code and fix minor bugs 2016-03-24 19:55:56 -04:00
Joshua Dwire
bb6e0b5186 Make dropzone translatable 2016-03-24 18:45:00 -04:00
Joshua Dwire
5e62d7d296 Allow documents to be attached to expenses 2016-03-24 18:15:52 -04:00
Joshua Dwire
bff6782026 Add support for uploading documents on older browsers 2016-03-24 15:13:54 -04:00
Joshua Dwire
d328db2f54 Document support for quotes, recurring invoices, and cloning 2016-03-24 12:54:38 -04:00
Joshua Dwire
cd8290946e Add client portal documents tab 2016-03-24 11:58:30 -04:00
Joshua Dwire
1c5c45a1e1 Improved handling of various document types; better documents zip 2016-03-24 11:33:28 -04:00
Joshua Dwire
e6056104bd Display documents and zip download on client invoice page 2016-03-23 22:41:19 -04: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
d810ba7f6b Improved document support 2016-03-23 15:41:05 -04:00
Joshua Dwire
c57dfb7f0d Restrict documents to pro users 2016-03-22 22:59:20 -04:00
Joshua Dwire
88808d44bf Add support for invoice attachments 2016-03-22 22:23:45 -04:00
Joshua Dwire
5640c74f35 Migrate logos to use Laravel Filesystem 2016-03-22 16:19:55 -04:00
Hillel Coren
9336605788 Updated language files 2016-03-22 19:50:55 +02:00
Hillel Coren
6a55cf56a0 Updated placeholder for iframe url 2016-03-22 19:35:57 +02:00
Hillel Coren
5c1e9900d3 Fix for #779 2016-03-22 16:37:14 +02:00
Hillel Coren
beede39e85 Updated to the latest version of Laravel 2016-03-22 16:09:48 +02:00
Hillel Coren
ddbc254d4b Add link to payments from invoice page 2016-03-22 15:17:46 +02:00
Hillel Coren
958cf4e8b7 Added support for Google Maps API key 2016-03-22 14:38:22 +02:00
Hillel Coren
dab023d898 Minor styling changes 2016-03-22 12:08:48 +02:00
Hillel Coren
c66e933de5 Minor improvements to client portal styling 2016-03-21 22:34:30 +02:00
Hillel Coren
c9e0119bc2 Added permissions settings help 2016-03-21 22:00:59 +02:00
David Bomba
4e758a4f0b Merge pull request #777 from joshuadwire/user-permissions
Fix invoice links on dashboard
2016-03-20 16:59:37 +11:00
Joshua Dwire
5152500277 Fix invoice links on dashboard 2016-03-19 21:57:20 -04:00
Hillel Coren
09414ca3f5 Fix for #776 Deleting expense vendor results in error 2016-03-19 23:30:23 +02:00
Hillel Coren
c41b7de514 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-18 14:34:53 +02:00
Hillel Coren
c3c7f25b32 Clarified partial labels 2016-03-18 14:34:46 +02:00
Hillel Coren
f445c912f7 Merge pull request #773 from joshuadwire/user-permissions
User Permissions Bug Fixes
2016-03-17 22:57:24 +02:00
Joshua Dwire
ec1bc6f2cf Bug fixes 2016-03-17 10:11:14 -04: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
Hillel Coren
8cd56fa969 Minor fixes 2016-03-17 09:54:32 +02:00
Joshua Dwire
6ea4f168a2 Remove link to settings page for non-admins 2016-03-15 22:43:30 -04:00
Joshua Dwire
9ef448c2b8 Only show invoice button for expenses and tasks if an invoice can be created 2016-03-15 22:38:35 -04:00
Joshua Dwire
36284431c9 Remove testing code 2016-03-15 22:29:39 -04:00
Joshua Dwire
9337d4b9a4 Only show relevant data on Dashboard 2016-03-15 22:29:30 -04:00
Joshua Dwire
90e1f6695c Improve user permission support
* Hide links based on permissions
* Restrict editing/creating within other UI
2016-03-15 22:07:11 -04: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
4e9cc45a55 Hide custom invoice line item fields if not pro 2016-03-15 22:08:12 +02:00
Hillel Coren
4e27b52618 Update import error message 2016-03-15 17:35:36 +02:00
Hillel Coren
f32a497d0d Fix for tax rates test 2016-03-15 16:55:23 +02:00
Hillel Coren
ad12557c78 Fix for tax rates test 2016-03-15 15:25:00 +02:00
Hillel Coren
a31d8b8176 Capitalize payment gateway fields 2016-03-15 13:57:50 +02:00
Hillel Coren
25b0957a7f Fix navigation when not signed up and browser is narrower 2016-03-14 23:37:13 +02:00
Hillel Coren
0621817660 Added client side card check with StripeJS 2016-03-14 12:12:09 +02:00
Hillel Coren
d6697171f6 Show ‘Expired’ for overdue quotes in list view 2016-03-14 10:40:14 +02:00
Hillel Coren
9c0eaac6b8 Enable entering search text before results are loaded 2016-03-14 10:25:08 +02:00
Hillel Coren
ed7cbf1d2b Support searching by custom client fields 2016-03-14 10:09:18 +02:00
Hillel Coren
20c06df586 Don't show sent status for recurring invoices 2016-03-13 19:55:19 +02:00
Hillel Coren
bddc4dd915 Merge branch 'lang_ja' of git://github.com/mzdakr/invoiceninja into mzdakr-lang_ja
Conflicts:
	app/Providers/AppServiceProvider.php
	database/seeds/CurrenciesSeeder.php
2016-03-13 13:35:32 +02:00
Hillel Coren
43cd7910f8 Merge #763 2016-03-09 20:34:45 +02:00
Hillel Coren
6bf948c8ed Fix for checkouit.com integration 2016-03-09 20:31:54 +02:00
Akira Matsuda
6c0c68eead Added some jp texts. 2016-03-10 00:54:21 +09:00
Hillel Coren
4a85715ee7 Fix for checkouit.com integration 2016-03-09 17:07:01 +02:00
Hillel Coren
ed48fb1a3f Fix for checkouit.com integration 2016-03-09 16:58:21 +02:00
Akira Matsuda
e2db55924a add Japanese language. 50% translated. 2016-03-09 21:30:16 +09:00
Hillel Coren
3c1084ffe0 Minor fixes 2016-03-08 20:38:28 +02:00
Hillel Coren
a2cbc1b225 Corrected setting password checkboxes 2016-03-08 19:42:22 +02:00
Hillel Coren
86a851a05a Merge pull request #757 from joshuadwire/client-portal-password
Client portal password support
2016-03-08 19:32:04 +02:00
Joshua Dwire
82fadab632 Finalize support for emailing passwords 2016-03-07 20:25:26 -05:00
Hillel Coren
3e26f97e8b Fix for PDF on iOS Safari 2016-03-06 23:25:00 +02: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
793ba76415 Finalize basic client portal password support 2016-03-04 22:22:54 -05:00
Hillel Coren
e1f9ec1571 Small style fix 2016-03-04 16:03:55 +02:00
Joshua Dwire
903904d423 Merge Laravel 5.2 upgrade 2016-03-03 21:57:15 -05:00
Hillel Coren
b719f243c2 Fix for #751 2016-03-03 22:24:27 +02:00
Hillel Coren
eb6cd45913 Minor fixes 2016-03-03 21:39:15 +02:00
Hillel Coren
9c5944e2c4 Fix for #747 2016-03-03 11:44:03 +02: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
c8aad4d039 Fix for tests 2016-02-29 12:54:43 +02:00
Hillel Coren
eef80d94d2 Use typeahead for product key on invoice page 2016-02-29 11:40:52 +02:00
Hillel Coren
6a9b2130c5 Added fuzzy search using fuse.js 2016-02-28 22:43:43 +02:00
Hillel Coren
553c548f31 Enabled setting recurring invoice number prefix 2016-02-28 20:36:11 +02:00
Hillel Coren
faa3a5e620 Updated PHP version check to 5.5.9 2016-02-28 14:09:42 +02:00
Hillel Coren
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
Hillel Coren
f2d7a01f94 Fix for report defaults 2016-02-27 23:00:27 +02:00
Hillel Coren
e3519c9c39 Made dataviz bars wider 2016-02-27 22:53:02 +02:00
Hillel Coren
41ed55c9b5 Made dataviz bars wider 2016-02-27 22:51:22 +02:00
Hillel Coren
96e7fab55c Matched vendor when importing expenses 2016-02-27 22:41:23 +02:00
Hillel Coren
df203c2e5e Check nothing is focused for search hotkey 2016-02-26 00:07:48 +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
0e3b78097c Improvements to data export 2016-02-25 11:25:19 +02:00
Hillel Coren
01f9634237 Improvements to data export 2016-02-25 11:25:07 +02:00
Hillel Coren
fb959c1487 Refinements to reports 2016-02-25 10:32:31 +02:00
Hillel Coren
88fcc05902 Implemented basic expense report 2016-02-24 23:54:43 +02:00
Hillel Coren
a1d13cc84c Improvements to the tax report 2016-02-24 22:58:42 +02:00
Hillel Coren
1c864f4304 Added tax report 2016-02-23 23:32:39 +02:00
Hillel Coren
3ca89b2792 Added navigation to search 2016-02-22 23:23:28 +02:00
Hillel Coren
9f2e82323d Fixed invalid payment if auto-billing with invalid token 2016-02-22 12:26:26 +02:00
Hillel Coren
dd9805e5b4 Refined search hot key 2016-02-19 11:41:03 +02:00
Hillel Coren
6b64910c9d Prevent reloading page when showing/hiding archived 2016-02-18 20:14:48 +02:00