1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 00:41:34 +02:00
Commit Graph

516 Commits

Author SHA1 Message Date
Hillel Coren
b3439d9ab7 Clean up diffs between branches 2016-05-10 22:41:30 +03:00
Hillel Coren
147c51f6f9 Clean up diffs between branches 2016-05-10 22:39:54 +03:00
Hillel Coren
3c21179e4e Fixed white label after image 2016-05-10 21:42:50 +03:00
Hillel Coren
ee579f91f3 Added plan help text 2016-05-10 21:17:46 +03:00
Hillel Coren
01869d852c Merge fix #794 2016-05-10 12:31:28 +03:00
Hillel Coren
2a90a548dd Fix for data viz 2016-05-10 12:20:53 +03:00
Hillel Coren
2345ff11ed Don't focus client select if client is already selected 2016-05-10 10:44:26 +03:00
Hillel Coren
9b0f086cbd Only show user’s own tokens 2016-05-08 21:50:35 +03:00
Hillel Coren
6b4d07346b Update alt tags 2016-05-08 19:09:18 +03:00
Hillel Coren
594b0e1bef Implemented server-side analytics tracking for revenue 2016-05-08 16:54:16 +03:00
Hillel Coren
f2e651d53f Added message if adding users insn't supported 2016-05-08 12:59:32 +03:00
Hillel Coren
902827b7ac Put back custom fonts from client emails (it works in iOS) 2016-05-06 15:35:24 +03:00
Hillel Coren
a67fe34ba0 Removed custom fonts from client emails 2016-05-06 15:28:43 +03:00
Hillel Coren
3ddad385a3 Fix for setting default HTML email template 2016-05-06 15:05:28 +03:00
Hillel Coren
5bedba1474 Show if client is deleted on invoice page 2016-05-05 22:59:33 +03:00
Hillel Coren
5249ae0291 Added Pakistani Rupee 2016-05-05 22:49:09 +03:00
Hillel Coren
54be2f0b84 Improvements to the user table seeder 2016-05-05 20:18:02 +03:00
Hillel Coren
6971060049 Added preview for email templates 2016-05-05 19:25:26 +03:00
Hillel Coren
c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
Hillel Coren
ef2bc3d811 White label changes 2016-05-05 09:52:59 +03:00
Hillel Coren
db9d75ceff Changed vendorcontacts to vendor_contacts 2016-05-04 15:16:49 +03:00
Hillel Coren
65c8ef4078 Moving permissions to form requests 2016-05-01 15:35:51 +03:00
Hillel Coren
2efd419791 Moving permissions to form requests 2016-05-01 15:04:55 +03:00
Hillel Coren
2e2470e11c Send contact's email when creating Stripe token 2016-05-01 09:43:41 +03:00
Hillel Coren
782cda4004 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-04-26 23:31:31 +03:00
Hillel Coren
2712f92422 Merge pull request #826 from joshuadwire/laravel-acl
Laravel ACL
2016-04-26 23:29:53 +03:00
Hillel Coren
f28e0cd76b Fix for JS rounding problem 2016-04-26 12:41:34 +03:00
Joshua Dwire
fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
Hillel Coren
cfb4dc4351 Hide zapier button for resellers 2016-04-24 20:41:30 +03:00
Hillel Coren
604c132a3a Temporary workaround to support not setting the CVC/CVV 2016-04-24 16:14:35 +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
Joshua Dwire
eb91a3cd42 Fix typos 2016-04-19 16:31:50 -04:00
Hillel Coren
d6608f863c Syntax fix 2016-04-19 23:01:44 +03: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
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
Hillel Coren
11019e5dc1 Improved HTML email margins 2016-04-18 10:28:30 +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
63b2c2c6b1 More intuitive account management page 2016-04-16 22:28:11 -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
f75b67b704 Trim whitespace in JS from emails on invoice page 2016-04-14 10:39:12 +03:00
Hillel Coren
b51cea769f Track JS errors as analytics events 2016-04-14 10:32:48 +03:00
Hillel Coren
9b8b150766 Implemented enable_client_portal_dashboard 2016-04-13 22:08:41 +03:00