Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-13 22:54:25 +01:00
Code Issues Releases Activity
3,100 Commits 9 Branches 921 Tags 2 GiB
e905b29510
Commit Graph

326 Commits

Author SHA1 Message Date
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
f31ab2eef1 Enable setting contact's public_id as id 2016-04-17 12:39:52 +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
c3e9380c75 Fix for PhantomJS PDF when using iframe_url 2016-04-13 13:15:57 +03:00
Stefan Welsch
56657f8f15 Remove blank in email footer html tag 
In the email footer is an presentation error after the account name because of the blank in the ending p-tag.
I have removed the blank.
 2016-04-05 11:43:07 +02: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
13cec052b9 Merge pull request #788 from joshuadwire/attached-documents 
Fix invoicing of expenses
 2016-03-27 21:09:56 +03:00
Joshua Dwire
abe38ddba9 Fix invoicing of expenses 2016-03-27 13:09:59 -04: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
Joshua Dwire
b7f0d2a33f More intuitive document permissions 2016-03-24 18:33:28 -04:00
Joshua Dwire
5e62d7d296 Allow documents to be attached to expenses 2016-03-24 18:15:52 -04:00
Joshua Dwire
d328db2f54 Document support for quotes, recurring invoices, and cloning 2016-03-24 12:54:38 -04:00
Joshua Dwire
1c5c45a1e1 Improved handling of various document types; better documents zip 2016-03-24 11:33:28 -04:00
Hillel Coren
e3c59101ba Fixed invitation iframe URL 2016-03-24 09:14:27 +02: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
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
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
09414ca3f5 Fix for #776 Deleting expense vendor results in error 2016-03-19 23:30:23 +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
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
4e9cc45a55 Hide custom invoice line item fields if not pro 2016-03-15 22:08:12 +02:00
Hillel Coren
243b1c1d37 Fix for JSON account export 2016-03-13 13:56:56 +02:00
Hillel Coren
44344e7676 Added Japaense as a 'large font' 2016-03-13 13:47:46 +02: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
Joshua Dwire
6376302ed9 Add option for client portal password 2016-02-29 16:46:27 -05:00
Hillel Coren
2153a8e227 Added custom invoice item fields 2016-02-28 13:59:52 +02:00
Hillel Coren
4a749d5868 Improvements to custom designer 2016-02-25 20:34:23 +02:00
Hillel Coren
01f9634237 Improvements to data export 2016-02-25 11:25:07 +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
869febc1d3 Fix for Date in Expenses #731 2016-02-18 12:02:30 +02:00
Hillel Coren
ed941fef89 Enabled downloading PDF through route 2016-02-17 21:13:55 +02:00
Hillel Coren
331b117189 Fix for #713 2016-02-17 20:59:24 +02:00
Hillel Coren
25d2af4891 Working on download PDF route 2016-02-17 17:50:01 +02:00
Hillel Coren
fdab849705 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-02-17 15:55:47 +02:00
Hillel Coren
eac4c823d3 Made expense currency conversion hidden by default 2016-02-17 13:06:03 +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
aef4658873 Api work/Bug fixes 2016-02-17 19:10:33 +11:00
David Bomba
f959164f2a Expense and Vendor Transformers for API 2016-02-17 14:32:20 +11:00
David Bomba
e3ee79f369 Improving error reporting API 2016-02-17 10:44:01 +11:00
David Bomba
7da522599c Improving error reporting API 2016-02-17 10:36:45 +11:00
David Bomba
7cd3bac29c Improving error reporting API 2016-02-17 10:35:54 +11:00
David Bomba
1a953c5bcb Improving error reporting API 2016-02-17 10:34:23 +11:00
David Bomba
3e4df4ff4f Improving error reporting API 2016-02-17 10:29:18 +11:00
David Bomba
09650123d7 Improving error reporting API 2016-02-17 10:05:08 +11:00
Hillel Coren
049c20f062 Zapier improvements 2016-02-16 17:30:09 +02:00
Hillel Coren
7c3406d9e5 Fix for #703 2016-02-15 19:58:18 +02:00
Hillel Coren
2b5167c266 Fixed issue when updating from previous version 2016-02-11 21:37:39 +02:00
Hillel Coren
b5f817cf14 Changed future white-label licenses to one year 2016-02-11 21:27:58 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02: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
Hillel Coren
88b9046ac7 Added users to the API 2016-02-04 22:35:28 +02:00
Hillel Coren
8a9eb97134 Working on enabling showing currency code 2016-02-04 16:19:49 +02:00
Hillel Coren
25b8c54355 Bug: fix 'Invoice issued to' in business design for quote 2016-02-03 22:19:15 +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
ead2b335d5 Added Credit Transformer 2016-02-03 14:21:13 +11:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
387f89440c Add Header/Footer options to invoice design settings 2016-01-31 23:42:20 +02:00
Hillel Coren
25f5cdbcdd Added check to ensure expense currency matches client\invoice currency 2016-01-31 15:10:33 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
Hillel Coren
91187eb06d Bug fixes 2016-01-23 20:36:11 +02: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
86f1e13c87 Fix for #632 2016-01-18 16:09:06 +02:00
Hillel Coren
89ff1be14f Manually merging PR #630 2016-01-18 11:13:39 +02: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
Hillel Coren
9fdea0fe95 Fixes #627 2016-01-14 23:28:17 +02:00
Hillel Coren
74c636aef2 Fix for #626 2016-01-13 23:38:15 +02:00
Hillel Coren
ac58df4441 Bug fixes 2016-01-13 11:09:00 +02:00
Hillel Coren
8cefa9a707 Fixed problem with PDF preview after upgrading 2016-01-13 08:18:26 +02:00
Hillel Coren
b5cf87bc0d Bug fixes 2016-01-12 11:18:35 +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
904627e5b4 Use buttons by default in styled emails 2016-01-11 14:40:48 +02:00
Hillel Coren
d72ff27e62 Improved invoice design form layout 2016-01-10 20:40:04 +02:00
Hillel Coren
08fd14a4c1 Added a 'Live Preview' option when using a large font 2016-01-10 16:22:40 +02:00
steenrabol
3e9e28f06f Expense module 2016-01-10 11:25:05 +01:00