1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Commit Graph

255 Commits

Author SHA1 Message Date
Hillel Coren
80ccd4f924 Working on #1234 2017-02-05 14:48:26 +02:00
Hillel Coren
41096a7bce Fix dashboard totals when 'First month' is set 2017-02-02 14:54:43 +02:00
Hillel Coren
30515c69f3 php-cs-fixer 2017-01-30 21:49:42 +02:00
Hillel Coren
c0fbaf1e89 php-cs-fixer cleanup 2017-01-30 21:40:43 +02:00
Hillel Coren
1eb83a2642 php-cs-fixer clean up 2017-01-30 18:05:31 +02:00
Hillel Coren
cc2a64acac Fix for #1228 2017-01-30 14:35:04 +02:00
Hillel Coren
602c8e81e5 Fix invoice link if user has multiple companies #578 2017-01-29 22:07:44 +02:00
Hillel Coren
a63f694d09 Improvements to reports 2017-01-22 12:09:29 +02:00
Hillel Coren
7263e87db2 Enable setting default payment terms 2017-01-16 13:59:46 +02:00
Hillel Coren
7a20dc5c12 Enable sending emails from alternate domain 2017-01-12 21:19:13 +02:00
Hillel Coren
0095cdf7dd Add secondary domain choice 2017-01-12 15:12:02 +02:00
Hillel Coren
b6527cddc3 Refactor client portal and email settings requests 2017-01-12 13:52:37 +02:00
Hillel Coren
9fc53c8b13 Support canceling pro trial 2017-01-04 13:20:56 +02:00
Hillel Coren
7a58108cd0 Refactored number genrating code 2017-01-04 10:11:32 +02:00
Hillel Coren
69369619af Support automatic client ids 2017-01-03 21:48:40 +02:00
Hillel Coren
9b13321a7f Store that invoice was authorized in the session #1230 2017-01-02 14:47:39 +02:00
Hillel Coren
4c98f1d1be Fix for quote terms/signature 2017-01-01 13:22:05 +02:00
Hillel Coren
f65300d108 Fix timezone for date invoice number pattern 2016-12-26 13:04:16 +02:00
Hillel Coren
655da01338 Improvement to invoice import 2016-12-22 13:53:14 +02:00
Hillel Coren
bbb0e07eca Working on discounts 2016-12-15 12:52:10 +02:00
Hillel Coren
bbbf1237c5 Added task projects 2016-11-29 19:47:26 +02:00
Hillel Coren
d53d7739b4 Fix for expense documents 2016-11-13 09:14:25 +02:00
Hillel Coren
8c2e5ebdbf Simplify logo URL code 2016-11-11 12:57:12 +02:00
Hillel Coren
3ccb33ec21 Support signing for invoice 2016-11-04 15:34:15 +02:00
Hillel Coren
eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +02:00
Hillel Coren
5b80e32fa7 Add ability to enable\disable modules 2016-10-27 11:57:51 +03:00
Hillel Coren
12d9bac3fd Added fields for future features 2016-10-23 14:41:26 +03:00
Hillel Coren
d92f7fadc0 Fix for currency symbol 2016-10-20 18:14:54 +03:00
Hillel Coren
5560d65c4a Fix for currency symbol 2016-10-20 17:49:26 +03:00
Hillel Coren
a0f8475a35 Enable selecting currency symbol or code 2016-10-20 17:17:47 +03:00
Hillel Coren
2b2cfbc2e5 Fix for #1084 2016-09-27 20:34:43 +03:00
Hillel Coren
e743af4d24 Merged #1062 2016-09-15 13:41:09 +03:00
Hillel Coren
ce3a510037 Working on the dashboard 2016-09-11 17:30:23 +03:00
Hillel Coren
188486641a Working on design 2016-09-02 17:53:16 +03:00
Hillel Coren
c01e42ac87 Added option to include line item taxes in line total 2016-08-15 18:08:06 +03:00
Hillel Coren
cb9a67063d Fix for grandfathered check 2016-08-01 11:07:44 +03:00
Hillel Coren
7249b29bf6 Change settings navigation order 2016-07-18 23:28:30 +03:00
Hillel Coren
e41d47eb0d Prevent charging downgraded accounts 2016-07-16 23:19:43 +03:00
Hillel Coren
36e50e7bcb Fixes for the API 2016-07-15 16:47:18 +03:00
Hillel Coren
fa9b0bf78b Working on buy now buttons 2016-07-13 12:03:39 +03:00
Hillel Coren
986487b4c9 Working on new hosted pricing 2016-07-11 20:08:43 +03:00
Hillel Coren
fd2155d10a Merge pull request #950 from codedge/#868-Configurable-start-of-week
Adding configuration for first day of the week
2016-07-10 12:42:12 +03:00
Hillel Coren
251438dc41 Fix for expenseCategories 2016-07-04 20:19:22 +03:00
Holger Lösken
fcc8cac7b5 Adding configuration for first day of the week
- Fix #868 and resolves #868
- The first day of the week can be configured in localization settings,
which affects the Bootstrap date picker
2016-07-04 16:20:22 +02:00
Holger Lösken
0fbda85a59 Code Refactoring
- Removed unused uses
- Type hinting for method parameters
- Removed commented code
- Introduced comments for classes and methods
- Short array syntax
2016-07-03 16:19:22 +00:00
Hillel Coren
9603439a33 Added additional designs 2016-06-29 22:48:56 +03:00
Hillel Coren
93c3521952 Improve check for duplicate gateways 2016-06-22 21:42:09 +03:00
Hillel Coren
c9a19cbd76 Fixes for WePay 2016-06-21 19:10:22 +03:00
Hillel Coren
12b754dc32 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-20 17:14:57 +03:00
Hillel Coren
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
David Bomba
6e57976075 typo 2016-06-13 20:26:47 +10:00
David Bomba
369b696297 typo 2016-06-13 20:23:14 +10:00
David Bomba
fedbd74319 Integrating Expense categories into API 2016-06-13 20:18:30 +10:00
Hillel Coren
ffa67cef3b Refactoring payments code... 2016-06-09 10:56:22 +03:00
Hillel Coren
a7f92d0726 Merge pull request #901 from joshuadwire/wepay-integration
Wepay integration
2016-06-03 11:20:31 +03:00
Hillel Coren
0acf4ff1fc Support importing JSON file 2016-06-02 22:03:59 +03:00
Joshua Dwire
49d47bb9e3 Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-06-01 16:46:03 -04:00
Hillel Coren
51d9b2b427 Prevent converting a qoute from incrementing the counter 2016-06-01 10:56:44 +03:00
Hillel Coren
d175fc872a Don't render pdf if not attached and fix typo 2016-05-29 19:32:45 +03:00
Hillel Coren
607fb58c29 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop
Conflicts:
	app/Models/Account.php
2016-05-29 12:27:14 +03:00
Hillel Coren
0e75ddb5e6 Added setting to hide second tax rate 2016-05-29 12:26:02 +03:00
ben
dadac05532 add support to multiple invoice types 2016-05-29 12:02:44 +03:00
Joshua Dwire
c9f00274b1 Support storing WePay bank tokens 2016-05-25 15:04:58 -04:00
Joshua Dwire
e905b29510 Partial WePay ACH support 2016-05-17 14:09:39 -04:00
Joshua Dwire
947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Joshua Dwire
ce04c994dd Support payments and storing cards via WePay. 2016-05-13 09:30:22 -04:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
Hillel Coren
7c67e66fb0 Sync ninja client when updating plan 2016-05-08 15:37:32 +03:00
Hillel Coren
89b5d73615 Fix for loading tokens 2016-05-08 10:05:16 +03:00
Joshua Dwire
0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
Hillel Coren
7296c15730 Fix for footer font size in iOS mail 2016-05-06 15:54:58 +03:00
Hillel Coren
c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
Hillel Coren
2a5de605dc Added relationLoaded checks to optimize queries 2016-05-05 10:15:51 +03:00
Hillel Coren
c144a1c604 Fix to make it easier to test features 2016-05-01 11:43:30 +03:00
Joshua Dwire
c536bd8569 Add basic ACH support 2016-04-29 17:50:21 -04:00
Joshua Dwire
1cb2b9dc25 Use existing PaymentType instead of CardType 2016-04-27 22:13:51 -04:00
Joshua Dwire
fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04: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
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
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
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
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
Joshua Dwire
d810ba7f6b Improved document support 2016-03-23 15:41:05 -04:00
Joshua Dwire
5640c74f35 Migrate logos to use Laravel Filesystem 2016-03-22 16:19:55 -04:00
Hillel Coren
c3c7f25b32 Clarified partial labels 2016-03-18 14:34:46 +02: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
Hillel Coren
4a749d5868 Improvements to custom designer 2016-02-25 20:34:23 +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