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

4101 Commits

Author SHA1 Message Date
David Bomba
63242a62c1 Fixes for conflicts 2021-06-17 18:39:09 +10:00
David Bomba
1cda49e6bb Fixes for conflicts 2021-06-17 18:20:03 +10:00
David Bomba
79c598b13d Fixes for conflicts 2021-06-17 17:59:02 +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
cdd074f000 Fixes for postmark bindings 2021-06-17 14:34:01 +10:00
David Bomba
6ac714960a Fixes for postmark bindings 2021-06-17 14:29:39 +10:00
David Bomba
4be5d8783e Fixes for postmark bindings 2021-06-17 13:36:23 +10:00
David Bomba
eb3d3ca858 Fixes for mail providers 2021-06-17 12:57:47 +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ć
85ebc15065 Remove deprecated method from SubscriptionService 2021-06-16 16:31:56 +02:00
Benjamin Beganović
fc51a89dcb Hide custom surcharges if they're 0 2021-06-16 16:09:30 +02:00
David Bomba
805d7f24d2 Minor fixes for InvoiceController PDF 2021-06-16 21:15:32 +10:00
David Bomba
2adb1728ea Fixes for license 2021-06-16 20:34:30 +10:00
David Bomba
ce0cd5ddb1 Fixes for conflicts 2021-06-16 20:21:08 +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
Benjamin Beganović
3f729bedde Throw PaymentFailed (generic) exception 2021-06-15 18:52:15 +02:00
Benjamin Beganović
dfdb4b1cd9 Merge remote-tracking branch 'upstream/v5-develop' into v5-update-email-templates 2021-06-15 15:45:14 +02:00
Benjamin Beganović
01e7e3271e Adapt templates for dynamic emails 2021-06-15 15:42:37 +02:00
David Bomba
3a5cd34f83 Fixes for company exporter 2021-06-15 23:11:45 +10:00
David Bomba
31c8eb1a19 Fixes for stripe import customers 2021-06-15 11:09:12 +10:00
David Bomba
d582e67962 Fixes for Stripe import customers 2021-06-15 08:19:23 +10:00
David Bomba
887bc3d4a6 Fixes for reminders 2021-06-15 08:06:01 +10:00
Benjamin Beganović
2bc83aff27 CSS inliner plugin 2021-06-14 14:50:28 +02:00
David Bomba
2e1a6ef6c4 HostedUsers console command 2021-06-14 18:10:46 +10:00
David Bomba
7469ca30eb HostedUsers console command 2021-06-14 18:06:34 +10:00
David Bomba
d2d6a9fe5a Changes to CompanyImport logic - allow multiple users to be imported - however we prevent them from logging in if their plan isn't Enterprise 2021-06-14 17:09:05 +10:00
David Bomba
1397c9ab1c Fixes logic for hosted login 2021-06-14 17:04:15 +10:00
=
c67998219e invoice_total_raw 2021-06-13 22:56:33 +10:00
=
46ae91f920 Fixes for regex for subdomain name 2021-06-13 20:47:49 +10:00
=
2b6f0870b3 Tests for clean up S3 orphans 2021-06-13 20:09:52 +10:00
David Bomba
a42223a0be Clean up filesystem: 2021-06-13 19:44:33 +10:00
David Bomba
59fcbfe52c Don't delete the PDF prior to sending 2021-06-13 14:19:40 +10:00
David Bomba
0a0ea46851 Declare disk for storage 2021-06-13 14:09:33 +10:00
David Bomba
55918d772c Specify disk for storage operations 2021-06-13 13:57:08 +10:00
David Bomba
7709bd32d1 Ensure directories are created prior to PDF generation 2021-06-13 10:18:07 +10:00
David Bomba
0fb7f58851 code cleanup 2021-06-13 09:58:23 +10:00
Benjamin Beganović
a2fe0cbb6a SupportMessageSent 2021-06-12 23:19:56 +02:00
Benjamin Beganović
8493b2e4d6 ImportCompleted email 2021-06-12 23:14:28 +02:00
Benjamin Beganović
5af9cc828f Passwordless login 2021-06-12 23:12:06 +02:00
=
afdfddd7e9 Refactor for entity paths 2021-06-12 21:50:01 +10:00
David Bomba
edf2dfcc80 Minor fixes 2021-06-12 19:40:28 +10:00
David Bomba
3954ac3f3a Fixes for timezone offsets 2021-06-12 07:41:02 +10:00
Benjamin Beganović
4cba96d973 ACHVerificationNotification:
- Pass $company into view
- Update view to use client layout
- Fixes for client layout / whitelabel handling
2021-06-11 15:52:28 +02:00
David Bomba
86be7c6690 add ninja_portal_url to company_user transformer 2021-06-11 14:16:21 +10:00
David Bomba
c367ea60ae Timezone Offset implementation 2021-06-11 08:20:46 +10:00