1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-18 00:53:10 +01:00
Commit Graph

123 Commits

Author SHA1 Message Date
Hillel Coren
ad68d64dca Changes for white label license 2016-04-21 22:01:17 +03:00
Hillel Coren
b27505f63c Fix for saving invoice client with id/public_id 2016-04-21 13:01:36 +03:00
Hillel Coren
6711678fbe Merge pull request #822 from joshuadwire/enterprise-plan
Improve enterprise plan migration
2016-04-20 19:42:46 +03:00
Joshua Dwire
71b6b6eb87 More robust migration; avoids timeout failures 2016-04-20 11:47:38 -04:00
Joshua Dwire
b5b3fa56ac Don't try to migrate nonexistent accounts 2016-04-20 09:50:13 -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
Joshua Dwire
b8ad27963e Fix table name in migration 2016-04-19 10:30:25 -04: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
089349b591 Complete companies migration 2016-04-16 20:15:17 -04:00
Joshua Dwire
b4b8396c0f Fix documents migration 2016-04-16 20:15:02 -04:00
Joshua Dwire
9b1bfef698 Add support for multiple plans/terms 2016-04-16 18:34:39 -04:00
Hillel Coren
ba3aaf47fd Added flag to disable client portal dashboard 2016-03-31 12:32:31 +03:00
Hillel Coren
be9e7beaed Support for multiple tax rates 2016-03-31 12:29:01 +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
Joshua Dwire
e6056104bd Display documents and zip download on client invoice page 2016-03-23 22:41:19 -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
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
9a29efbc6f Merge pull request #771 from joshuadwire/user-permissions
User permissions
2016-03-17 09:54:36 +02:00
Joshua Dwire
0148d06205 Add user permission support 2016-03-15 19:08:00 -04:00
vincentdh
a74ede6cf7 Create 2016_03_14_214710_add_support_three_decimal_taxes.php
Changes made to the DB to support 3 decimals tax rates.
2016-03-14 21:49:52 -04:00
Joshua Dwire
d0d30e1e26 Add support for including password in email; include portal customizations 2016-03-05 18:09:50 -05:00
Joshua Dwire
903904d423 Merge Laravel 5.2 upgrade 2016-03-03 21:57:15 -05:00
Hillel Coren
e5fac72e01 Bug fix for migration down 2016-03-01 11:27:10 +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
ce1717cf53 Fix for issue updating 2016-02-05 10:48:10 +02:00
Hillel Coren
024e1eb046 Fix for issues when updating 2016-02-04 22:58:34 +02:00
Hillel Coren
b33c896beb Fix migration down 2016-02-03 14:12:55 +02:00
David Bomba
6683062d9e fixed bug in migration 2016-02-03 09:10:54 +11:00
Hillel Coren
1284c29534 Enabled setting expense currency 2016-02-02 00:07:09 +02:00
Hillel Coren
40786c3668 Bug fix and new fields 2016-01-27 19:42:40 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
Hillel Coren
c96c91ec88 Fix for #647 2016-01-24 09:21:20 +02:00
Hanne Nijhuis
ccbdb68bb1 Fixed the vendors migration error dealing with unique values 2016-01-23 22:05:43 +01:00
Hillel Coren
91187eb06d Bug fixes 2016-01-23 20:36:11 +02:00
Hanne Nijhuis
c7b8f39e9f Fixed typo in migration vendors table 2016-01-23 12:20:50 +01: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
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
e7a658aaf6 Expenses bug fix 2016-01-19 14:01:19 +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
3e9e28f06f Expense module 2016-01-10 11:25:05 +01:00
steenrabol
d0bfe82512 Expense module 2016-01-09 06:24:43 +01:00