Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-11 21:52:35 +01:00
Code Issues Releases Activity
3,876 Commits 7 Branches 919 Tags 2 GiB
53c59b79e3
Commit Graph

805 Commits

Author SHA1 Message Date
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
David Bomba
0ec1fcbd23 Dashboard API 2016-03-22 21:13:24 +11:00
David Bomba
6e7c19b38e Dashboard API 2016-03-22 21:08:58 +11:00
David Bomba
85633d3464 Dashboard API 2016-03-22 21:06:57 +11:00
David Bomba
b8560187f5 Dashboard API 2016-03-22 21:04:23 +11:00
David Bomba
431c9a899f Dashboard API 2016-03-22 20:54:36 +11:00
David Bomba
7bc703e5dd Dashboard API 2016-03-22 20:50:11 +11:00
David Bomba
06d796a318 Dashboard API 2016-03-22 20:43:08 +11:00
David Bomba
56b863a89a Working on Dashboard API 2016-03-22 19:50:09 +11:00
Hillel Coren
c9e0119bc2 Added permissions settings help 2016-03-21 22:00:59 +02:00
Hillel Coren
56ad438dd3 Add payment details to invoice report 2016-03-21 16:06:50 +02:00
David Bomba
c25cd7f232 working on dashboard for API 2016-03-20 09:38:05 +11: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
Joshua Dwire
4d4f4140b6 Set sorting columns 2016-03-17 18:04:03 -04:00
Joshua Dwire
ec1bc6f2cf Bug fixes 2016-03-17 10:11:14 -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
5a6445f808 Added silent flag to test invoices 2016-03-14 20:23:20 +02:00
Hillel Coren
ed7cbf1d2b Support searching by custom client fields 2016-03-14 10:09:18 +02:00
Hillel Coren
e7df1f5e7c Bug fix to show/track errors on install/update 2016-03-14 09:25:58 +02:00
Hillel Coren
d47251a475 Fix for adding new user 2016-03-13 20:33:11 +02:00
Hillel Coren
39fc63886b Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-13 17:39:03 +02:00
Hillel Coren
243b1c1d37 Fix for JSON account export 2016-03-13 13:56:56 +02:00
David Bomba
94a73f92ad re-working validation 2016-03-13 22:39:20 +11:00
David Bomba
7d2cf9770b fixing validation 2016-03-13 21:54:31 +11:00
David Bomba
f6b2595936 changing the way validation works 2016-03-13 20:28:14 +11:00
David Bomba
83de2a279e changing the way validation works 2016-03-13 20:27:00 +11:00
David Bomba
3a657e511a changing the way validation works 2016-03-13 20:18:19 +11:00
David Bomba
aa8b160661 changing the way validation works 2016-03-13 20:11:45 +11:00
David Bomba
5462e4276a changing the way validation works 2016-03-13 20:10:25 +11:00
Hillel Coren
ed48fb1a3f Fix for checkouit.com integration 2016-03-09 16:58:21 +02:00
Hillel Coren
4912c40650 Fix to show all clients when cloning 2016-03-09 13:35:46 +02:00
Hillel Coren
6aafb9154d Enabled registering through the API 2016-03-08 23:22:59 +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
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
ee677554c9 Datatable fixes for L5.2 2016-03-04 15:55:15 +02:00
Hillel Coren
1d880f45a0 Fix for invoice XLS export 2016-03-04 15:46:28 +02:00
Joshua Dwire
903904d423 Merge Laravel 5.2 upgrade 2016-03-03 21:57:15 -05:00
Hillel Coren
747f199ce8 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-03 21:39:27 +02:00
Hillel Coren
eb6cd45913 Minor fixes 2016-03-03 21:39:15 +02:00
David Bomba
fd4ec8cb6d bug fixes 2016-03-03 20:52:47 +11:00
David Bomba
5950d0e0be Bug Fixes 2016-03-03 19:48:33 +11:00
David Bomba
9744ad69b7 Localization API & PUSH 2016-03-03 13:28:16 +11:00
David Bomba
28cd3e01a7 Bug fixes push notifications 2016-03-03 11:24:13 +11:00
Hillel Coren
8572e9252c Working on Laravel 5.2 2016-03-02 16:36:46 +02:00
Hillel Coren
9efaada9f5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-03-02 15:36:48 +02:00
Hillel Coren
aef4c6be98 Upgrade to Laravel 5.2 2016-03-02 15:36:42 +02:00
David Bomba
6ff569a5a3 Bug Fixes 2016-03-02 22:16:06 +11:00
David Bomba
1d0c35ec76 Bug Fixes 2016-03-02 22:14:42 +11:00
David Bomba
50c5d52e08 Bug Fixes 2016-03-02 21:52:59 +11:00
David Bomba
aa4aae4797 Working on API 2016-03-01 21:31:23 +11:00
Hillel Coren
10dc9a3da1 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 
Conflicts:
	composer.lock
 2016-03-01 10:52:14 +02:00
Hillel Coren
3b5311e960 Added setting to show/hide client portal dashboard 2016-03-01 09:36:37 +02:00
David Bomba
6e3b1ecb4b Push Notifications 2016-03-01 15:06:54 +11:00
David Bomba
1aef96f027 Push Notifications 2016-03-01 14:44:14 +11:00
David Bomba
f1bc597034 Push Notifications 2016-03-01 13:57:59 +11: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
f2d7a01f94 Fix for report defaults 2016-02-27 23:00:27 +02:00
Hillel Coren
92e5bf60d8 Broke up seeders 2016-02-27 22:12:22 +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
edda64bd0e Enabled all tests 2016-02-25 12:29:26 +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
6cdbc15961 Implemented basic expense report 2016-02-24 23:54:56 +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
105321bdbb Upgraded to Laravel 5.1 2016-02-22 19:47:19 +02:00
Hillel Coren
6b64910c9d Prevent reloading page when showing/hiding archived 2016-02-18 20:14:48 +02:00
Hillel Coren
7e6d137504 Fixing test payment in Travis 2016-02-18 19:00:21 +02:00
Hillel Coren
5b743355fe Fixing test payment in Travis 2016-02-18 17:35:21 +02:00
Hillel Coren
f797497a8a Fix for invitations in the API 2016-02-18 15:46:44 +02:00
Hillel Coren
869febc1d3 Fix for Date in Expenses #731 2016-02-18 12:02:30 +02:00
Hillel Coren
b63f26f10b Working on TravisCI 2016-02-17 22:49:34 +02:00
Hillel Coren
ed941fef89 Enabled downloading PDF through route 2016-02-17 21:13:55 +02:00
Hillel Coren
25d2af4891 Working on download PDF route 2016-02-17 17:50:01 +02:00
David Bomba
992802c164 Working on API functionality 2016-02-17 21:50:52 +11:00
David Bomba
6d09bda646 Working on API functionality 2016-02-17 21:16:13 +11:00
David Bomba
a6e9c5198d Bug fixes 2016-02-17 14:46:28 +11:00
David Bomba
9428557e70 Bug Fixes 2016-02-17 14:43:25 +11:00
David Bomba
f959164f2a Expense and Vendor Transformers for API 2016-02-17 14:32:20 +11:00
David Bomba
a1be1f3529 Improving error reporting API 2016-02-17 09:45:28 +11:00
David Bomba
1fde9261e6 Improving error reporting API 2016-02-17 09:38:23 +11:00
David Bomba
170ee5a40b Improving error reporting API 2016-02-17 09:28:00 +11:00
David Bomba
31720b59fd Improving error reporting API 2016-02-17 09:12:34 +11:00
David Bomba
746b6ef362 Improving error reporting API 2016-02-17 09:09:32 +11:00
Hillel Coren
2295102b98 Adding back change from conflict 2016-02-17 00:07:05 +02:00
Hillel Coren
8735409753 Merge branch 'release-2.5.0.2' 
Conflicts:
	app/Http/Controllers/ClientApiController.php
 2016-02-17 00:03:23 +02:00
David Bomba
4a033ce925 Improving error reporting API 2016-02-17 08:57:06 +11:00
David Bomba
1ab4bb636f Improving error reporting API 2016-02-17 08:48:10 +11:00
Hillel Coren
81f08cdd17 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-02-16 17:30:30 +02:00
Hillel Coren
049c20f062 Zapier improvements 2016-02-16 17:30:09 +02:00
David Bomba
3c2b0ba45d Error handling 2016-02-16 10:30:28 +11:00
David Bomba
a295120015 Client API Error handling 2016-02-15 21:57:58 +11:00
David Bomba
f8fee3e8cd Error handling for API 2016-02-15 21:24:06 +11:00
Hillel Coren
0a2a97d89a Fixed an API issue when only setting product_key in an invoice 2016-02-11 19:24:41 +02:00
Hillel Coren
a30153cabe Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-11 17:12:34 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
David Bomba
ce58c581ef Delete Client from API 2016-02-08 15:27:42 +11:00
David Bomba
d401a6fb93 Bug in Client API not paginating all results 2016-02-08 10:37:38 +11:00
David Bomba
391d721180 Bug fixes 2016-02-07 22:30:36 +11:00
David Bomba
ccaabe2926 working on payments API 2016-02-07 22:01:39 +11:00
David Bomba
42f3cffca8 Delete a payment from the API 2016-02-07 21:24:21 +11:00
David Bomba
b3346011bc api bug fixes 2016-02-07 20:20:38 +11:00
David Bomba
7d2f635272 testing payment api 2016-02-07 19:39:51 +11:00
David Bomba
0c251392eb testing payment api 2016-02-07 19:32:43 +11:00
David Bomba
95e1baed29 testing payment api 2016-02-07 19:30:47 +11:00
David Bomba
138749ce6f update payment from API 2016-02-06 14:42:21 +11:00
Hillel Coren
88b9046ac7 Added users to the API 2016-02-04 22:35:28 +02:00
Hillel Coren
db4ec4fb62 Added statust to client view page 2016-02-04 20:36:39 +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
0ce9e426d9 Hid 'test email' button until issue updating connection info is resolved 2016-02-03 22:45:39 +02:00
Hillel Coren
a584973eea Adding https suggestion 2016-02-03 20:59:07 +02:00
Hillel Coren
e9cacf2fdf Added tax rates and localization to the API 2016-02-03 16:03:56 +02:00
Hillel Coren
021f195c45 Implemented UpdateAccountRequest 2016-02-03 14:41:40 +02:00
David Bomba
80d800fd36 Merge pull request #686 from turbo124/master 
Added Payments to API
 2016-02-03 21:08:34 +11:00
David Bomba
2c8d3e2013 Added Payments to API 2016-02-03 21:06:49 +11:00
Hillel Coren
65d3667600 Increased timeout when installing/updating 2016-02-03 10:07:44 +02:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
1a2c2712d0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-01 15:58:59 +02:00
Hillel Coren
523b008d01 Added support for right aligning table columns 2016-02-01 15:58:52 +02:00
David Bomba
f90adb27e3 Merge pull request #678 from turbo124/master 
Update account from API
 2016-02-01 14:44:29 +11:00
David Bomba
c0545be0d4 update account from API 2016-02-01 14:42:05 +11:00
David Bomba
eef8ad22d0 Merge pull request #677 from turbo124/master 
Archive Product via API
 2016-02-01 13:33:27 +11:00
David Bomba
31b026d08f Added Archive Product via API 2016-02-01 13:32:12 +11:00
David Bomba
9e1a7eb632 Merge pull request #676 from turbo124/master 
Remove redundant emailInvoice method
 2016-02-01 09:46:07 +11:00
David Bomba
f48ac1b6f0 remove redundant method 2016-02-01 09:45:15 +11: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
63eda63d9f Fix for #672 2016-01-31 17:39:31 +02:00
Hillel Coren
646c239cd8 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-31 15:10:40 +02:00
Hillel Coren
25f5cdbcdd Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:10:33 +02:00
David Bomba
204748ad33 Working on products api 2016-01-30 22:29:22 +11:00
David Bomba
63894e0f24 Working on products api 2016-01-30 22:27:26 +11:00
David Bomba
b93cd84052 Working on products api 2016-01-30 22:20:09 +11:00
David Bomba
32ed23cde7 Working on products api 2016-01-30 22:18:30 +11:00
David Bomba
43c6024f0f Working on products api 2016-01-30 22:17:10 +11:00
David Bomba
1f36e175dd Working on products api 2016-01-30 22:16:25 +11:00
David Bomba
1e8a4c2b70 Working on products api 2016-01-30 21:51:52 +11:00
David Bomba
1da8f6bc26 bug fixes 2016-01-30 20:57:47 +11:00
David Bomba
cc40f51f84 working on product API 2016-01-30 20:56:27 +11:00
David Bomba
020e428677 testing email functionality: 2016-01-29 12:47:35 +11:00
Hillel Coren
e245b6f639 Updated texts file 2016-01-28 16:34:22 +02:00
Hillel Coren
89622f86e2 Fix for #661 2016-01-28 16:07:03 +02:00
Hillel Coren
9d3d58def1 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-28 14:05:01 +02:00
Hillel Coren
1ac12e1506 Added basic stats for resellers 2016-01-28 14:04:55 +02:00
David Bomba
cae3b48cd4 Restore Invoice from API 2016-01-28 13:31:19 +11:00
David Bomba
165a382637 Restore an invoice from the API 2016-01-28 12:55:15 +11:00
Hillel Coren
bdeb062657 Refining how expenses convert to products 2016-01-27 22:38:21 +02:00
Hillel Coren
a7f2d3354c Resolved issue with expenses and multi-tenancy 2016-01-27 20:31:08 +02:00
David Bomba
84895907d1 Merge pull request #662 from turbo124/master 
update invoice status via API
 2016-01-27 21:01:24 +11:00
David Bomba
fa2187ce20 update invoice status via API 2016-01-27 21:00:00 +11:00
David Bomba
6455e25c3a Merge pull request #660 from turbo124/master 
Include archived clients
 2016-01-27 14:32:09 +11:00
David Bomba
76f4530ffd include archived clients 2016-01-27 14:31:38 +11:00
David Bomba
910e9db7a0 Merge pull request #659 from turbo124/master 
Added ability to convert a quote to an invoice through the API
 2016-01-27 12:57:28 +11:00
David Bomba
4799b2e86c Added ability to convert a quote to an invoice through the API 2016-01-27 12:56:24 +11:00
David Bomba
2db27caf90 Merge pull request #658 from turbo124/master 
Bug fixes
 2016-01-27 11:40:41 +11:00
David Bomba
71b2970279 Bug fixes 2016-01-27 11:36:21 +11:00
David Bomba
4f5dd12ea0 Merge pull request #657 from turbo124/master 
Bug Fixes
 2016-01-27 07:53:22 +11:00
David Bomba
c2bb8711a0 Bug Fixed 2016-01-27 07:52:30 +11:00
Hillel Coren
9c96f09fc0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-26 22:22:40 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
David Bomba
e57f8f3c2e Swagger Typo fix 2016-01-26 22:37:16 +11:00
David Bomba
a4df265d09 Update client via API 2016-01-26 22:36:00 +11:00
Hillel Coren
e4a6effc60 Merge pull request #642 from sakalauskas/dev-api 
Fixed ping route & added a way to find client by email address or if …
 2016-01-24 19:54:01 +02:00
Laurynas Sakalauskas
2478ec59a4 Revert store() method 2016-01-24 17:06:34 +00:00
Laurynas Sakalauskas
68665d2972 Added filtering by email 2016-01-24 16:59:01 +00:00
Hillel Coren
74a3dcf9d2 Working on expenses 2016-01-23 23:36:31 +02:00
Laurynas Sakalauskas
0d2025c834 Fixed ping route & added a way to find client by email address or if not exist - create a new 2016-01-22 10:33:38 +00:00
Hillel Coren
360b59baa0 Working on expenses 2016-01-22 00:29:10 +02:00
Hillel Coren
7a26dd610c Working on expenses 2016-01-21 22:36:49 +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
steenrabol
2525f68a39 Expense / Vendor module bug fix 2016-01-19 20:35:15 +01:00
steenrabol
e7a658aaf6 Expenses bug fix 2016-01-19 14:01:19 +01:00
Hillel Coren
89ff1be14f Manually merging PR #630 2016-01-18 11:13:39 +02:00
Hillel Coren
cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00
David Bomba
eeb977bab3 Added delete invoice functionality 2016-01-16 17:07:29 +11:00
David Bomba
12d3444808 By default include trashed invoices 2016-01-16 09:22:22 +11:00
steenrabol
f550e3734f bug fix to expense module - was not able to add a contact to a new vendor 2016-01-15 11:31:12 +01:00
David Bomba
ca591f4451 return archived invoice as success 2016-01-15 14:05:16 +11:00
Hillel Coren
175c685032 Enabled creating recurring invoices through the API 2016-01-13 16:58:39 +02:00
Hillel Coren
b5cf87bc0d Bug fixes 2016-01-12 11:18:35 +02:00
David Bomba
3e0b6948b5 Send down all quotes and recurring invoices in invoices GET call 2016-01-12 13:02:08 +11:00
steenrabol
bcffedcbd3 update from master 2016-01-11 20:41:02 +01: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
steenrabol
f90c759078 Expense module 2016-01-11 20:20:42 +01:00
steenrabol
3e9e28f06f Expense module 2016-01-10 11:25:05 +01:00
steenrabol
d8cb1b436d Expense module 2016-01-09 09:08:24 +01:00
steenrabol
d0bfe82512 Expense module 2016-01-09 06:24:43 +01:00
David Bomba
e792e66aaa merge 2016-01-09 11:13:23 +11:00
steenrabol
d89dc2e827 Expenses 2016-01-08 19:01:00 +01:00
steenrabol
d8a501ed95 Posibility to modify payment terms 2016-01-07 20:39:51 +01:00
steenrabol
eed8ee55a1 Vendor 2016-01-07 16:21:13 +01:00
steenrabol
17af1e2b9c Expenses 2016-01-07 16:14:11 +01:00
steenrabol
a52364a039 expense 2016-01-07 12:04:01 +01: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
7beeb78126 Enabled updating/archiving invoice through the API 2016-01-06 22:46:11 +02:00
steenrabol
48ce3f64e6 expenses 2016-01-06 20:52:09 +01:00
Hillel Coren
9dc890d4f0 Include archived data when loading account data with the API 2016-01-06 19:33:34 +02:00
steenrabol
d1bef24ede Expenses 2016-01-06 16:49:06 +01:00
steenrabol
dba3a39559 Vendor management 2016-01-06 15:23:58 +01:00
Hillel Coren
6e98e9b60d Merge pull request #594 from joshuadwire/more-payment-terms 
Add due date settings for recurring invoices
 2016-01-06 12:07:05 +02:00
David Bomba
35027dd139 API Put Stubs 2016-01-06 15:01:52 +11:00
Hillel Coren
cd2599fe58 Fix for #597 2016-01-04 00:02:13 +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
Joshua Dwire
103bce3f48 Make recurring invoice due date settings more translatable 2016-01-01 17:37:47 -05:00
hanne@hannenijhuis.nl
e460f154a5 Bug fix typo in TaskController 2016-01-01 15:32:09 +01:00
Joshua Dwire
7e336ec118 Add due date settings for recurring invoices 
* Specific due date settings for weekly and monthly/annual cycles
* Display scheduled due dates in editor
* English-only text
 2015-12-31 23:59:02 -05:00
Hillel Coren
debc22d7d2 Bug fixes 2015-12-31 13:31:50 +02:00
Hillel Coren
565b26ba27 Bug fixes 2015-12-30 20:45:52 +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
9943c824dd Bug fixes 2015-12-27 14:45:57 +02:00
Hillel Coren
8d61925e06 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-12-27 13:38:01 +02:00
Hillel Coren
6f2c3c76a3 Bug fixes 2015-12-27 13:37:54 +02:00