Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 07:47:30 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,870 Commits 7 Branches 902 Tags
Commit Graph

287 Commits

Author SHA1 Message Date
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
Joshua Dwire
fdf1b25b16 Begin adding authorization policies 2016-04-23 11:52:36 -04:00
DraperStudio
d87552c90e Use object_get to retrieve a config field 2016-04-20 13:37:57 +02: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
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
fb975db1f2 Merge pull request #815 from joshuadwire/enterprise-plan 
Enterprise plan bug fixes
 2016-04-19 17:40:17 +03: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
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
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