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

672 Commits

Author SHA1 Message Date
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
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
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
Joshua Dwire
91efade7f7 Don't require new ucwords signature 2016-04-26 20:06:19 -04:00
Hillel Coren
2712f92422 Merge pull request #826 from joshuadwire/laravel-acl
Laravel ACL
2016-04-26 23:29:53 +03:00
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
Hillel Coren
ad68d64dca Changes for white label license 2016-04-21 22:01:17 +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
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
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
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
b296c55911 Add back legacy routes 2016-04-11 11:34:02 +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
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
6f097c34c2 Updated version number 2016-03-31 17:28:35 +03:00
Hillel Coren
be9e7beaed Support for multiple tax rates 2016-03-31 12:29:01 +03:00