Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Code Issues Releases Activity
3,457 Commits 9 Branches 923 Tags 2 GiB
965ff2e252
Commit Graph

733 Commits

Author SHA1 Message Date
Joshua Dwire
43fade2339 Support app fees and Canadian users 2016-05-17 11:32:17 -04:00
Hillel Coren
faec0a2f04 Fix for deleting account 2016-05-17 15:03:17 +03: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
Hillel Coren
5e7cdddc3e Merge pull request #863 from joshuadwire/wepay-integration 
Wepay integration - Part 1
 2016-05-16 11:29:37 +03:00
David Bomba
1d05525ee3 typo 2016-05-16 12:30:24 +10: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
Hillel Coren
3df6ad2529 Changes to support transifex.com 2016-05-15 23:16:08 +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
ce04c994dd Support payments and storing cards via WePay. 2016-05-13 09:30:22 -04:00
Hillel Coren
b111adaf17 Added and removed extra lables from activity messages 2016-05-13 15:35:59 +03:00
Hillel Coren
fba37171ae Support query counter in webapp as well as API 2016-05-13 12:08:41 +03:00
Hillel Coren
3202d2480f Fix for saving client portal setting in self host 2016-05-12 20:26:36 +03:00
Joshua Dwire
ba000546c4 Better WePay switching 2016-05-12 11:09:07 -04:00
Hillel Coren
110af6f28b Fix for #859 2016-05-12 12:44:22 +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
Joshua Dwire
0d41d8aeb6 Payments bug fixes - Part 2 2016-05-11 12:53:43 -04:00
Joshua Dwire
258401715c Update billing address when adding payment method 2016-05-10 22:15:32 -04:00
Joshua Dwire
6138e1132f Make sure payments reference newly added payment methods 2016-05-10 19:18:12 -04:00
Joshua Dwire
88ec714cd5 Store Stripe card summary locally 2016-05-10 18:46:32 -04:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
David Bomba
e795ac28cd Merge remote-tracking branch 'upstream/develop' into develop 2016-05-10 09:26:15 +10:00
Joshua Dwire
20f6f32a06 Update UI for configuring auto bill 2016-05-09 16:29:02 -04:00
Hillel Coren
7317bfc8c9 Fixed issue with invoice history 2016-05-09 20:35:50 +03:00
Hillel Coren
8bd2e84bc8 Track plan start date when manually applying a license 2016-05-09 15:07:01 +03:00
David Bomba
5197db449e Merge remote-tracking branch 'upstream/develop' into develop 2016-05-09 09:03:39 +10:00
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
fec948f1e8 Fixed searching for non-admins 2016-05-08 21:29:49 +03:00
Hillel Coren
594b0e1bef Implemented server-side analytics tracking for revenue 2016-05-08 16:54:16 +03:00
Joshua Dwire
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
David Bomba
1bef3b0791 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-07 08:44:39 +10: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
6971060049 Added preview for email templates 2016-05-05 19:25:26 +03:00
Hillel Coren
bce4395f82 Added preview for email templates 2016-05-05 17:51:52 +03:00
Hillel Coren
c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
Hillel Coren
501958cc1e Added language seeder 2016-05-05 11:55:09 +03:00
David Bomba
dd4ea2ac17 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-05 07:44:54 +10:00
Hillel Coren
5d00d18601 Added support for filtering API lists by updated_at 2016-05-05 00:26:39 +03:00
Hillel Coren
32bf47aacf Added support for filtering API lists by updated_at 2016-05-04 23:49:20 +03:00
Hillel Coren
db9d75ceff Changed vendorcontacts to vendor_contacts 2016-05-04 15:16:49 +03:00
Hillel Coren
9ebb539cce API optimizations 2016-05-04 14:53:27 +03:00
Hillel Coren
2d878b6480 API optimizations 2016-05-03 23:02:29 +03:00
Hillel Coren
c0a5084282 Added details to cybersource error 2016-05-03 19:06:38 +03:00
David Bomba
b36be7646c Merge remote-tracking branch 'upstream/develop' into develop 2016-05-03 20:47:37 +10:00
Hillel Coren
bf4c4d0ce5 Add user permissions to API delete 2016-05-03 11:53:00 +03:00
Hillel Coren
be420ad1fc API optimizations 2016-05-03 11:39:10 +03:00
Hillel Coren
6cd4ff025e API optimizations 2016-05-03 09:46:24 +03:00
Hillel Coren
65d70c620e Enabled setting per_page for API results 2016-05-02 23:06:36 +03:00
Hillel Coren
e6bcdb36b3 Removed extra entity load in the repos save function 2016-05-02 20:42:13 +03:00
Hillel Coren
6acddfc3c7 Working on permissions in the API 2016-05-02 16:45:12 +03:00
Hillel Coren
e7f4368cbb Working on permissions in the API 2016-05-02 16:12:37 +03:00
David Bomba
7cac31e7a6 Fix for cloning invoices from API 2016-05-02 19:40:54 +10:00
Hillel Coren
1d6011caad Working on permissions in the API 2016-05-02 11:38:01 +03:00
Hillel Coren
1b92f66482 Adding permissions to the API 2016-05-02 09:33:48 +03:00
Hillel Coren
4db5a19885 Refactored API index methods 2016-05-01 23:55:13 +03:00
Hillel Coren
e7296cf513 Working on form requests 2016-05-01 22:36:12 +03:00
Hillel Coren
7f168f87b9 Working on form requests 2016-05-01 22:33:01 +03:00
Hillel Coren
933f2968d6 Working on form requests 2016-05-01 22:30:39 +03:00
Hillel Coren
2efd419791 Moving permissions to form requests 2016-05-01 15:04:55 +03:00
Hillel Coren
05bd8d9318 Moving permissions to form requests 2016-05-01 14:31:10 +03:00
Joshua Dwire
059a23b612 Fix syntax error 2016-05-01 00:38:48 -04:00
Joshua Dwire
3e9dd7d8d1 Remove debug code 2016-05-01 00:37:14 -04:00
Joshua Dwire
d78b874838 Add Plaid support 2016-04-30 22:45:51 -04:00
Joshua Dwire
ed1f2b6044 Handle failed payments 2016-04-30 17:54:56 -04:00
Hillel Coren
50de2d757e Working on permissions 2016-04-30 21:55:15 +03:00
Joshua Dwire
c536bd8569 Add basic ACH support 2016-04-29 17:50:21 -04:00
Joshua Dwire
e5fb354643 Support configuring Stripe for ACH and Plaid 2016-04-28 16:38:01 -04:00
Hillel Coren
1a47598aea Working on custom route model binding 2016-04-28 15:20:34 +03:00
Hillel Coren
9979eba5d9 Working on custom route model binding 2016-04-28 15:16:33 +03:00
Joshua Dwire
1cb2b9dc25 Use existing PaymentType instead of CardType 2016-04-27 22:13:51 -04:00
Hillel Coren
ce2392563d Removed checkSubPermissions flag 2016-04-27 23:56:14 +03:00
Hillel Coren
df93ffaaf9 Fix for permissions in payment controller 2016-04-27 18:09:04 +03:00
Hillel Coren
4c48599175 Fix for permissions in payment controller 2016-04-27 17:22:50 +03:00
Hillel Coren
6f5a68e1f5 Fixed bug in vendor controller 2016-04-27 16:36:44 +03:00
Joshua Dwire
91efade7f7 Don't require new ucwords signature 2016-04-26 20:06:19 -04:00
Joshua Dwire
fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04:00
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
Joshua Dwire
b57ebbf8aa Fix card expiration formatting; store card details from all payment triggers 2016-04-25 10:06:27 -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
Joshua Dwire
fdf1b25b16 Begin adding authorization policies 2016-04-23 11:52:36 -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
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
d07fec5d62 Fix for #816 preg_match() error on settings update 2016-04-19 21:46:18 +03:00
Hillel Coren
fb975db1f2 Merge pull request #815 from joshuadwire/enterprise-plan 
Enterprise plan bug fixes
 2016-04-19 17:40:17 +03:00
Joshua Dwire
0fd39e5be0 Only allow pro trials 2016-04-19 10:28:27 -04: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
Joshua Dwire
454e9bc861 Refactor getPlanDetails 2016-04-17 12:55:03 -04:00
Hillel Coren
af5b5f4458 Improve report name 2016-04-17 13:08:58 +03:00
Joshua Dwire
030d4ed4da Fix renewals; fix plan edge cases 2016-04-16 22:09:01 -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
82c599683a Hid converted quotes from the dashboard 2016-04-14 16:08:28 +03:00
Hillel Coren
9b8b150766 Implemented enable_client_portal_dashboard 2016-04-13 22:08:41 +03:00
Hillel Coren
3cb3126f98 Hide sample document from invoice design page 2016-04-13 21:50:54 +03:00
Hillel Coren
d7508d2de4 Use invoice transformer with quote 2016-04-13 21:45:08 +03:00
Hillel Coren
b6fa4620b9 Fix for links when public/ is in URL 2016-04-13 12:57:03 +03:00
Hillel Coren
3303c00067 Fix for Cybersource 2016-04-11 22:09:05 +03:00
Hillel Coren
d4915074b6 Fix for quotes 2016-04-11 11:44:53 +03:00
Hillel Coren
43ed09206e Fixed payment list in client portal 2016-04-10 22:54:02 +03:00
Hillel Coren
c08d0bb98a Added support for currency_code in invoice API 2016-04-10 21:48:32 +03:00
Hillel Coren
2bb56c9661 Fix for permissions on dashboard 2016-04-10 15:49: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
8b0ef8e8ea Fixes #798 Setup error 2016-04-09 23:00:24 +03:00
Hillel Coren
fdde60577c Fixed problem creating a new payment gateway 2016-04-08 10:38:11 +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
8bb0d3154f Hide deleted records from the charts 2016-03-29 17:29:16 +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
Hillel Coren
c076f2887c Merge pull request #785 from joshuadwire/attached-documents 
Add support for attached documents
 2016-03-27 18:04:09 +03:00
Hillel Coren
7a929a51bb Added back .env variables #787 2016-03-27 17:39:26 +03:00
vincentdh
690ebf853f Update AppController.php 
Modify the doSetup() to use a similar way to create the .env file and add quotes when needed.
 2016-03-26 12:52:21 -04:00
vincentdh
965ef011e5 Update AppController.php 2016-03-26 12:49:22 -04:00
vincentdh
2c6e9aced3 Update AppController.php 
Add quotes to MAIL_FROM_NAME when needed
 2016-03-26 12:34:39 -04:00
Joshua Dwire
b5a948583e Remove debug code and fix minor bugs 2016-03-24 19:55:56 -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
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
10fa256809 Use stream when downloading documents 2016-03-23 20:46:09 -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
Hillel Coren
b0a4a9b31c Cleaning up log files 2016-03-22 17:14:40 +02:00
Hillel Coren
ddbc254d4b Add link to payments from invoice page 2016-03-22 15:17:46 +02:00
David Bomba
493c31b430 Merge pull request #778 from turbo124/develop 
Dashboard API implementation
 2016-03-22 21:23:18 +11:00
David Bomba
8e5d15dfbe Dashboard API 2016-03-22 21:21:05 +11:00
David Bomba
d83a02f80f Dashboard API 2016-03-22 21:17:52 +11:00