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

7028 Commits

Author SHA1 Message Date
David Bomba
1cda49e6bb Fixes for conflicts 2021-06-17 18:20:03 +10:00
David Bomba
2acd39c73e
Merge pull request #6060 from turbo124/v5-develop
Fixes for conflicts
2021-06-17 17:59:16 +10:00
David Bomba
79c598b13d Fixes for conflicts 2021-06-17 17:59:02 +10:00
David Bomba
27036dc71d
Merge pull request #6059 from turbo124/v5-develop
Fixes for mail drivers
2021-06-17 17:48:53 +10:00
David Bomba
8c06eaa5ae Fixes for mail drivers 2021-06-17 17:48:23 +10:00
David Bomba
c33a9d0ae5 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-06-17 17:28:12 +10:00
David Bomba
d088bb29b7
Merge pull request #6058 from turbo124/v5-develop
Fixes for postmark bindings
2021-06-17 14:34:15 +10:00
David Bomba
cdd074f000 Fixes for postmark bindings 2021-06-17 14:34:01 +10:00
David Bomba
ec9a49a04c
Merge pull request #6057 from turbo124/v5-develop
Fixes for postmark bindings
2021-06-17 14:29:55 +10:00
David Bomba
6ac714960a Fixes for postmark bindings 2021-06-17 14:29:39 +10:00
David Bomba
27582b32bd
Merge pull request #6056 from turbo124/v5-develop
Fixes for postmark bindings
2021-06-17 14:23:11 +10:00
David Bomba
c83a92e2d9 Fixes for postmark bindings 2021-06-17 14:22:56 +10:00
David Bomba
5aa5be0f5a
Merge pull request #6055 from turbo124/v5-develop
Fixes for postmark bindings
2021-06-17 14:03:22 +10:00
David Bomba
83bc6619b1 Fixes for postmark bindings 2021-06-17 14:03:02 +10:00
David Bomba
d861e2101e
Merge pull request #6054 from turbo124/v5-develop
Fixes for postmark bindings
2021-06-17 13:36:38 +10:00
David Bomba
4be5d8783e Fixes for postmark bindings 2021-06-17 13:36:23 +10:00
David Bomba
969a2946e5
Merge pull request #6053 from turbo124/v5-develop
Fixes for mail providers
2021-06-17 12:58:01 +10:00
David Bomba
eb3d3ca858 Fixes for mail providers 2021-06-17 12:57:47 +10:00
David Bomba
480f1abd9a
Merge pull request #6052 from turbo124/v5-develop
Minor fixes for paths in hosted
2021-06-17 11:22:45 +10:00
David Bomba
183e8ac36f Minor fixes for paths in hosted 2021-06-17 11:22:11 +10:00
David Bomba
119b07fe03
Merge pull request #6051 from turbo124/v5-develop
minor change for subdomain regex
2021-06-17 08:39:28 +10:00
David Bomba
28b5d01804 minor change for subdomain regex 2021-06-17 07:29:03 +10:00
Benjamin Beganović
2c798cecb4
Merge pull request #6050 from beganovich/v5-1605-remove-deprecated-method-from-ss
(v5) Remove deprecated method from SubscriptionService
2021-06-16 16:32:24 +02:00
Benjamin Beganović
85ebc15065 Remove deprecated method from SubscriptionService 2021-06-16 16:31:56 +02:00
Benjamin Beganović
3e9bd258ca
Merge pull request #6049 from beganovich/v5-1605-make-registration-form-wider
(v5) Client portal: Make registration form wider
2021-06-16 16:27:10 +02:00
Benjamin Beganović
def91a8614 Production build of assets 2021-06-16 16:26:12 +02:00
Benjamin Beganović
bf79603c42 Make registration form wider 2021-06-16 16:26:08 +02:00
Benjamin Beganović
bb37e31b2e
Merge pull request #6048 from beganovich/v5-1605-hide-custom-surcharge-fields
(v5) Hide custom surcharge fields if they're zero
2021-06-16 16:14:51 +02:00
Benjamin Beganović
fc51a89dcb Hide custom surcharges if they're 0 2021-06-16 16:09:30 +02:00
Benjamin Beganović
03cbabca3b
Merge pull request #6047 from beganovich/v5-fixes-for-translations
Add translation for recurring_invoice_due_date
2021-06-16 15:55:30 +02:00
Benjamin Beganović
a8ea2f9639 Add translation for recurring_invoice_due_date 2021-06-16 15:54:37 +02:00
David Bomba
805d7f24d2 Minor fixes for InvoiceController PDF 2021-06-16 21:15:32 +10:00
David Bomba
5c0c7f70b7
Merge pull request #6045 from turbo124/v5-develop
License
2021-06-16 20:59:12 +10:00
David Bomba
2adb1728ea Fixes for license 2021-06-16 20:34:30 +10:00
David Bomba
9b4e6472cb Minor changes for completed.blade.php 2021-06-16 20:30:18 +10:00
David Bomba
6ca41f7e78 Merge branch 'turbo124-v5-develop' into v5-develop 2021-06-16 20:21:18 +10:00
David Bomba
ce0cd5ddb1 Fixes for conflicts 2021-06-16 20:21:08 +10:00
David Bomba
368725cb31 Merge branch 'turbo124-v5-develop' into v5-develop 2021-06-16 20:16:30 +10:00
David Bomba
f4d686c70c Fixes for conflicts 2021-06-16 20:16:22 +10:00
David Bomba
36f6cbbcc9 Update license in codebase 2021-06-16 16:58:16 +10:00
David Bomba
8c36ba78b1
Merge pull request #6034 from beganovich/v5-update-email-templates
(v5) New e-mail templates
2021-06-16 13:11:04 +10:00
David Bomba
af328ac929
Merge pull request #6040 from turbo124/v5-develop
Fixes for release
2021-06-16 07:32:32 +10:00
David Bomba
978b713107 Fixes for release 2021-06-16 07:31:43 +10:00
David Bomba
ced0cd2dfc
Merge pull request #6037 from turbo124/v5-develop
Fixes for releases
2021-06-16 07:09:47 +10:00
David Bomba
c7d5390b49 Fixes for releases 2021-06-16 07:09:04 +10:00
David Bomba
9f4fab9617 Fixes for releases 2021-06-16 07:04:12 +10:00
hillelcoren
9805da6733 New admin portal [selfhosted] 2021-06-15 20:05:39 +00:00
hillelcoren
31d66492d3 New admin portal [hosted] 2021-06-15 20:02:51 +00:00
Benjamin Beganović
e377953f0a
Merge pull request #6036 from beganovich/v5-1506-generic-error-page
Throw PaymentFailed (generic) exception
2021-06-15 18:53:37 +02:00
Benjamin Beganović
3f729bedde Throw PaymentFailed (generic) exception 2021-06-15 18:52:15 +02:00