Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 06:32:40 +01:00
Code Issues Releases Activity
3,331 Commits 8 Branches 921 Tags 2 GiB
a2c7a0c12f
Commit Graph

2076 Commits

Author SHA1 Message Date
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
573c17431f More bug fixes 2016-05-11 14:12:52 -04:00
Joshua Dwire
0d41d8aeb6 Payments bug fixes - Part 2 2016-05-11 12:53:43 -04:00
Joshua Dwire
581ae1baa6 Handle currency not set 2016-05-11 11:30:45 -04:00
Joshua Dwire
981045b28b Better Stripe support 2016-05-11 09:57:44 -04: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
dcf231c6a5 Fix gateway ids 2016-05-10 21:30:52 -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
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
147c51f6f9 Clean up diffs between branches 2016-05-10 22:39:54 +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
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
David Bomba
050b79cc75 user transformer - add fields 2016-05-10 09:26:44 +10: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
dbdd1ac155 working with permissions 2016-05-09 10:28:47 +10:00
David Bomba
5233047ab1 working with permissions 2016-05-09 10:09:51 +10:00
David Bomba
985c4eda34 working with permissions 2016-05-09 10:02:15 +10:00
David Bomba
f6abdedfac User Transformer permissions 2016-05-09 09:54:40 +10: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
06437327fc Fixed change password for non-admins 2016-05-08 21:31:23 +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
Hillel Coren
7c67e66fb0 Sync ninja client when updating plan 2016-05-08 15:37:32 +03:00
David Bomba
b16ab9058f Merge remote-tracking branch 'upstream/develop' into develop 2016-05-08 18:48:31 +10:00
Hillel Coren
eff9ba5ac0 Merge pull request #846 from Rayvw/feature/improve-dynamic-dates 
Improved dynamic dates of recurring invoices
 2016-05-08 11:20:18 +03:00
Hillel Coren
89b5d73615 Fix for loading tokens 2016-05-08 10:05:16 +03:00
Hillel Coren
cf9dbae1d1 Remove duplicate Auth include 2016-05-08 09:33:19 +03:00
Hillel Coren
bacf5bf856 Merge branch 'laravel-acl' of git://github.com/joshuadwire/invoiceninja into joshuadwire-laravel-acl 
Conflicts:
	app/Providers/AuthServiceProvider.php
 2016-05-08 09:27:18 +03:00
Raymond
986156117e Copy custom values of invoice items 2016-05-07 15:29:27 +02:00
Raymond
e4ce4e0fc8 Added dynamic dates to custom invoice fields + fixed bug in processing of notes, terms and footer. 2016-05-07 15:06:56 +02:00
Raymond
320e11fedb Fixed bug processing date variables upon saving a recurring invoice 2016-05-07 11:39:34 +02: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
cf98c37f40 Better Braintree support 2016-05-06 17:05:42 -04:00
Joshua Dwire
d27822e17b Merge pull request #5 from joshuadwire/laravel-acl 
Laravel acl
 2016-05-06 15:08:48 -04:00
Joshua Dwire
c4b17fedd8 Fix permissions bugs 2016-05-06 15:05:28 -04:00
Joshua Dwire
815ab471a1 Fix auth bug 2016-05-06 14:55:26 -04:00
Joshua Dwire
475f5430f3 Update BaseService.php 2016-05-06 14:54:58 -04:00
Joshua Dwire
bfb4267f43 Fix permissions bug for recurring invoices 2016-05-06 14:29:44 -04:00
Joshua Dwire
e3823775f1 Fix permissions bug 2016-05-06 14:26:37 -04:00
Joshua Dwire
7469ea998c Use new ACL for refunds 2016-05-06 14:19:58 -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
7296c15730 Fix for footer font size in iOS mail 2016-05-06 15:54:58 +03:00
Hillel Coren
5322e16a4c Ensure contacts remain in the same order when saved 2016-05-05 23:09:11 +03:00
Hillel Coren
5249ae0291 Added Pakistani Rupee 2016-05-05 22:49:09 +03:00
Hillel Coren
32c912f7b1 Added vat number to ninja clients 2016-05-05 22:34:45 +03:00
Hillel Coren
379e9ff2f8 Added pages to navigations search 2016-05-05 22:31:11 +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
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
Hillel Coren
9f8865d0f2 Added pages to navigation search 2016-05-05 10:28:23 +03:00
Hillel Coren
2a5de605dc Added relationLoaded checks to optimize queries 2016-05-05 10:15:51 +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
2a6876a902 Fix for travis tests 2016-05-04 11:14:20 +03:00
Hillel Coren
2fcb1d66a5 Fix for travis tests 2016-05-04 09:53:43 +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
Hillel Coren
75ee124626 Fix for TD Bank w/OFX 2016-05-03 14:05:35 +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
Joshua Dwire
913c6eeff0 Fix error; don't let users try to refund failed or already refunded payments 2016-05-02 18:04:57 -04: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
325cac1603 Added DocumentTransformer 2016-05-02 20:02:15 +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
David Bomba
afae9e8289 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-02 19:31:15 +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
Hillel Coren
c144a1c604 Fix to make it easier to test features 2016-05-01 11:43:30 +03:00
Hillel Coren
1647effb20 Fix for client portal invoice table 2016-05-01 11:43:10 +03:00
Hillel Coren
2e2470e11c Send contact's email when creating Stripe token 2016-05-01 09:43:41 +03:00
Hillel Coren
1000ff4088 Fix for currency formatting on invoice 2016-05-01 08:55:59 +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
Philipp Hug
3ab4c0964d whitelabeling: allow more settings from environment. 2016-04-28 16:08:24 +02:00
Hillel Coren
4b764ea72e Working on custom route model binding 2016-04-28 15:23:09 +03: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
Hillel Coren
38b6c94fe7 Fix for quote api controller in routes files 2016-04-28 15:10:53 +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
ee4591c3c6 Fix for recurring invoice list 2016-04-27 19:25:24 +03:00
Hillel Coren
4f926ec8b8 Fix for permissions in base service 2016-04-27 19:13:29 +03:00
Hillel Coren
df93ffaaf9 Fix for permissions in payment controller 2016-04-27 18:09:04 +03:00
Hillel Coren
b930593d5f Fix for product policy 2016-04-27 17:24:09 +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
Hillel Coren
6ba27c2475 Fixed problem sorting data tables by client 2016-04-27 11:49:54 +03:00
Hillel Coren
bc2880f05e Merge pull request #828 from joshuadwire/laravel-acl 
Don't require new ucwords signature for ACL
 2016-04-27 08:51:39 +03:00
David Bomba
38a1757b10 Merge remote-tracking branch 'upstream/develop' into develop 2016-04-27 13:27:05 +10: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
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
David Bomba
960802827a Document Transformer 2016-04-26 15:16:25 +10:00
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
Joshua Dwire
af415afd2f Show payments without card details 2016-04-25 11:06:52 -04:00
Joshua Dwire
b57ebbf8aa Fix card expiration formatting; store card details from all payment triggers 2016-04-25 10:06:27 -04:00
Hillel Coren
71b1a9c209 Improved filtering the payment list 2016-04-24 16:34:48 +03:00
Hillel Coren
604c132a3a Temporary workaround to support not setting the CVC/CVV 2016-04-24 16:14:35 +03: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
ad68d64dca Changes for white label license 2016-04-21 22:01:17 +03:00
Hillel Coren
f9c36fd761 Fix for saving invoice client with id/public_id 2016-04-21 13:02:19 +03:00
Hillel Coren
b27505f63c Fix for saving invoice client with id/public_id 2016-04-21 13:01:36 +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
DraperStudio
d87552c90e Use object_get to retrieve a config field 2016-04-20 13:37:57 +02:00
Hillel Coren
9281cd5ba2 Fix for default quote terms 2016-04-20 11:04:54 +03:00
Hillel Coren
eaa4ffab0e Merge pull request #818 from DraperStudio/develop 
Use initialize method to set configuration
 2016-04-20 10:14:21 +03:00
Hillel Coren
c9ef281206 Merge pull request #819 from joshuadwire/enterprise-plan 
Fix typos in enterprise plan changes
 2016-04-19 23:44:14 +03:00
Joshua Dwire
eb91a3cd42 Fix typos 2016-04-19 16:31:50 -04:00
DraperStudio
c67564823b Use initialize method to set configuration 2016-04-19 22:02:46 +02: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
Joshua Dwire
639a3c321a Restrict documents to non-trial; allow resellers to override features 2016-04-19 10:26:29 -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
Hillel Coren
0c27e22b51 Brought back error page in production 2016-04-18 20:17:02 +03:00
Joshua Dwire
454e9bc861 Refactor getPlanDetails 2016-04-17 12:55:03 -04:00
Hillel Coren
4248963d92 Check if is_primary is set when sorting contacts 2016-04-17 14:03:37 +03:00
David Bomba
76f5ef92f7 Merge pull request #811 from turbo124/develop 
Sort Contacts
 2016-04-17 20:54:55 +10:00
David Bomba
d19c43edce contacts array sorter 2016-04-17 20:53:53 +10:00
David Bomba
7f6f34b302 contacts array sorter 2016-04-17 20:50:06 +10:00
David Bomba
57c0a91de8 contacts array sorter 2016-04-17 20:45:24 +10:00
David Bomba
edf7b6eb37 contacts array sorter 2016-04-17 20:42:51 +10:00
David Bomba
b022ae0c77 contacts array sorter 2016-04-17 20:42:30 +10:00
David Bomba
b49938e36d contacts array sorter 2016-04-17 20:40:23 +10:00
Hillel Coren
af5b5f4458 Improve report name 2016-04-17 13:08:58 +03:00
Hillel Coren
f31ab2eef1 Enable setting contact's public_id as id 2016-04-17 12:39:52 +03: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
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
b2de7c84eb Changed /forgot to /recover_password 2016-04-15 13:25:58 +03:00
Hillel Coren
2f2081b4b0 Fix for #808 Set date to today when cloning 2016-04-14 16:35:03 +03: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
c3e9380c75 Fix for PhantomJS PDF when using iframe_url 2016-04-13 13:15:57 +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
b296c55911 Add back legacy routes 2016-04-11 11:34:02 +03:00
Hillel Coren
245efeee2f Update error handler for L5.2 2016-04-11 11:33:25 +03:00
Hillel Coren
43ed09206e Fixed payment list in client portal 2016-04-10 22:54:02 +03:00
Hillel Coren
6733c0ca2f Removed validation pre-processing code 2016-04-10 21:48:51 +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
2a328627ac Bumped version to 2.5.1.3 2016-04-09 23:03:32 +03:00