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

2551 Commits

Author SHA1 Message Date
David Bomba
296cb0511b Fixes for hosted onboarding 2021-09-01 14:02:57 +10:00
David Bomba
700fd6bf99 Fixes for password protection route - always check if a password is presented! 2021-08-31 14:09:12 +10:00
David Bomba
ded9e25c02 Minor fixes for recurring invoices auto bill 2021-08-31 13:12:17 +10:00
David Bomba
b22831f42e Do no send emails to trashed contacts 2021-08-31 08:20:45 +10:00
David Bomba
04f8a89d75 Fixes for auto bill 2021-08-31 07:44:05 +10:00
=
9f6fdb74c4 Fixes for Payment URL 2021-08-30 22:04:51 +10:00
David Bomba
ae88b61e8d Fixes for uploading and downloading company imports 2021-08-30 15:35:37 +10:00
David Bomba
a17227f2ca Recurring Invoices query 2021-08-29 20:34:53 +10:00
David Bomba
97c58bcf70 fixes for refundS 2021-08-27 09:56:42 +10:00
Elliana May
5dfa240255
Declare request body for POST /api/v1/invoices
Related to https://github.com/invoiceninja/invoiceninja/issues/5473
2021-08-26 14:15:27 +08:00
David Bomba
bf690e5cb8 Minor fix for postmark 2021-08-26 13:02:54 +10:00
David Bomba
74b4ef5b13 Fixes for translations in emails 2021-08-25 20:53:13 +10:00
David Bomba
41faffb09f Add field on company table 2021-08-25 19:41:03 +10:00
David Bomba
8bcfeffb11 Remove redundant doc blocks 2021-08-25 12:15:47 +10:00
David Bomba
aa0f1b3bdf Client Statements 2021-08-25 12:03:58 +10:00
David Bomba
f29318d665 Client Statements 2021-08-25 11:41:07 +10:00
Benjamin Beganović
d86f54137e Pass dynamic design to ClientStatementController.php 2021-08-24 16:49:58 +02:00
Benjamin Beganović
bcd29b93e1 CreateStatementRequest.php 2021-08-24 15:31:40 +02:00
Benjamin Beganović
35bcb1d779 API endpoint for creating statements 2021-08-24 15:31:07 +02:00
Benjamin Beganović
c6bc102c6d Update client.statement route 2021-08-24 13:18:32 +02:00
Benjamin Beganović
792eb003e3 Clean up ClientStatementController 2021-08-24 12:43:44 +02:00
Benjamin Beganović
6d1916ea5c Remove statement method from ClientController 2021-08-24 12:43:06 +02:00
David Bomba
7fe6dea1d3 Recurring quotes 2021-08-24 15:56:12 +10:00
David Bomba
bab9f222ff Recurring Quotes Tests 2021-08-24 15:05:35 +10:00
David Bomba
ee855824db Recurring Quotes 2021-08-24 12:57:46 +10:00
David Bomba
a0f6afec0f Stubs for Recurring Expenses 2021-08-23 09:38:55 +10:00
=
36d5d505ba Fixes for wasm 2021-08-20 19:25:07 +10:00
=
1f360ed6d3 minor fixes 2021-08-20 19:14:27 +10:00
=
6027b98ba7 Fixes for custom flutter binary 2021-08-20 19:04:16 +10:00
Benjamin Beganović
22ce56b7c5 Add shouldUseToken(): bool to PaymentResponseRequest 2021-08-19 13:34:18 +02:00
David Bomba
9fcaaf6302 Autobill tweaks 2021-08-19 07:41:34 +10:00
David Bomba
5e9e28c146 Revert service worker changes 2021-08-18 08:04:31 +10:00
David Bomba
0c39ec65e0 Adjust updated_at for /refresh routes for is_large accounts 2021-08-17 20:49:31 +10:00
David Bomba
1d4b331123 Disconnect Stripe Connect 2021-08-17 14:01:11 +10:00
David Bomba
2144451c52 Handle multi db on return for Stripe Connect 2021-08-17 12:18:10 +10:00
David Bomba
2382281b00 Fixes for Stripe Verify 2021-08-15 15:49:36 +10:00
David Bomba
5f0efcffc5 Fixes for Stripe exceptions 2021-08-15 15:30:46 +10:00
=
383caa6439 Stripe Verify 2021-08-15 15:13:20 +10:00
David Bomba
7f37c10178 FIxes for client validation 2021-08-14 07:44:20 +10:00
David Bomba
8484b3e024 FIxes for client validation 2021-08-13 18:45:19 +10:00
David Bomba
0e951831a0 Add scheduler check to /update route 2021-08-13 08:02:51 +10:00
David Bomba
8dbbfce0a5
Merge pull request #6388 from beganovich/v5-611
(v5) Refactor webhooks
2021-08-12 21:18:41 +10:00
David Bomba
0aecc6da20 Check that contacts are an array 2021-08-12 14:35:25 +10:00
David Bomba
bc81043973 Fixes for Molli 2021-08-11 16:43:20 +10:00
David Bomba
ba8759af6f minor fixes 2021-08-11 09:16:35 +10:00
Benjamin Beganović
2ed6e7643d Redirect to url if next is available for key_login 2021-08-10 10:18:05 +02:00
Benjamin Beganović
fbe0d3e8bd Update references to process_markdown flag 2021-08-09 14:31:31 +02:00
David Bomba
bea7072f22 Clean up ifs 2021-08-09 08:59:28 +10:00
David Bomba
acfb3ac3af Minor fixes 2021-08-09 08:44:51 +10:00
David Bomba
f57c064d26 Fixes for spam complaints 2021-08-08 17:58:40 +10:00
David Bomba
7057ca30d6 Minor fixes for deleting payment methods 2021-08-07 15:08:29 +10:00
David Bomba
c224255621 Fixes for removing payment methods 2021-08-07 14:58:04 +10:00
David Bomba
e35709145a Fixes for preview 2021-08-06 18:02:32 +10:00
David Bomba
9d3867f818 Fixes for preview 2021-08-06 17:57:24 +10:00
David Bomba
cdc7c76c43 Fixes for preview 2021-08-06 17:53:52 +10:00
David Bomba
e9633c1be9 Fixes for preview 2021-08-06 17:52:10 +10:00
David Bomba
1195838ded Fixes for preview 2021-08-06 17:48:35 +10:00
David Bomba
acbb692150 Reorder DB transaction initialization 2021-08-06 17:35:52 +10:00
David Bomba
0e1f17c6ea
Merge pull request #6411 from turbo124/v5-develop
Fixes for missing documents
2021-08-06 17:31:34 +10:00
David Bomba
019427602c Fixes for preview 2021-08-06 17:30:54 +10:00
Benjamin Beganović
c25c7b3370 Add option to copy billing details on the client check page 2021-08-05 17:36:24 +02:00
David Bomba
6b5c4b5d48 Fixes for preview 2021-08-05 23:00:13 +10:00
David Bomba
4bc422f1aa Fixes for preview 2021-08-05 22:58:57 +10:00
David Bomba
9a55743e3b Fixes for preview 2021-08-05 22:55:40 +10:00
David Bomba
55c7c23475 Fixes for preview 2021-08-05 22:51:51 +10:00
David Bomba
26e22d5365 Fixes for preview 2021-08-05 22:48:10 +10:00
David Bomba
a32e1d11b6 Fixes for preview 2021-08-05 22:41:28 +10:00
David Bomba
a6aff62286 Fixes for preview 2021-08-05 22:39:09 +10:00
David Bomba
f4d7b1a631 Logging for Preview 2021-08-05 21:58:07 +10:00
David Bomba
8c5100dbdc Logging for Preview 2021-08-05 21:50:53 +10:00
David Bomba
435a0ffc23 Fixes for preview 2021-08-05 21:45:54 +10:00
David Bomba
ee78101d5a Minor fixes for live preview 2021-08-05 20:03:20 +10:00
David Bomba
56446fdd69 Set DB for live previews 2021-08-05 19:57:44 +10:00
David Bomba
d176370e10 Set DB for live previews 2021-08-05 19:55:33 +10:00
David Bomba
edf2e04422 Set DB for live previews 2021-08-05 19:52:38 +10:00
David Bomba
7c7e4f4437 Set DB for live previews 2021-08-05 19:50:25 +10:00
David Bomba
3411d7ae8b Set DB for live previews 2021-08-05 19:48:57 +10:00
David Bomba
be85175134 Set Recurring to draft if not being sent at time of creation 2021-08-05 09:06:13 +10:00
Benjamin Beganović
7ab6dbd1b7 Cleanup of PaymentWebhookRequest 2021-08-04 16:24:49 +02:00
Benjamin Beganović
6740e348a1 Refactor PaymentWebhookController 2021-08-04 15:44:43 +02:00
David Bomba
98e82f3ea6 slow down web hook requests if the are too fast for usgit status 2021-08-03 07:40:42 +10:00
Benjamin Beganović
99d686a845 Cleanup PaymentWebhookController 2021-08-02 14:47:20 +02:00
David Bomba
413719b72c Fixes for correct include for Design 2021-08-02 11:08:03 +10:00
Benjamin Beganović
8af3cfe737 Pay with credit card and save for future use 2021-07-30 14:36:14 +02:00
David Bomba
c298ab40fa Fixes for bulk invoice downloads 2021-07-30 10:37:32 +10:00
Benjamin Beganović
1e2e55c9e4 Credit card 3ds processing 2021-07-29 15:13:38 +02:00
David Bomba
e5260df7d4 minor fixes for handle reversal 2021-07-29 20:31:20 +10:00
David Bomba
22036654a5 minor fixes for handle reversal 2021-07-29 20:30:45 +10:00
David Bomba
8e41c801c8 minor fixes for handle reversal 2021-07-29 20:30:02 +10:00
David Bomba
6d8ac6aa35 Minor fixes 2021-07-29 13:37:23 +10:00
David Bomba
f7a31f9ed2 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-07-29 12:20:05 +10:00
David Bomba
b91af0dc69 Client Contact password reset links 2021-07-29 12:19:56 +10:00
David Bomba
e490b26dbc Fixes for locking 2021-07-28 16:14:10 +10:00
David Bomba
b57c35d5e1 Fixes for locking 2021-07-28 16:12:07 +10:00
David Bomba
b87421f769 Fixes for locking 2021-07-28 16:01:30 +10:00
David Bomba
1fa93ebb60 Metrics for live previews 2021-07-28 11:49:13 +10:00
David Bomba
b506c293ed Fixes for live preview 2021-07-28 08:54:40 +10:00
David Bomba
8b588a55a5 Fixes for live preview 2021-07-28 08:09:30 +10:00
David Bomba
cf7dfd5618 Fixes for connected accounts 2021-07-28 08:01:26 +10:00
David Bomba
f644a2b460 Fixes for live preview 2021-07-27 22:20:32 +10:00
David Bomba
284203401b Fixes for live preview 2021-07-27 19:38:40 +10:00
David Bomba
efad096dfb Fixes for live preview 2021-07-27 18:32:29 +10:00
David Bomba
f21a60c159 Fixes for live preview 2021-07-27 18:04:46 +10:00
David Bomba
9401c25cca Set preview number to null 2021-07-27 08:57:20 +10:00
David Bomba
f90115aa8e Fixes for incorrect confirmation codes 2021-07-27 08:45:46 +10:00
David Bomba
bc5b9ca2e6 Prevent connected accounts being linked to existing users 2021-07-27 08:33:44 +10:00
Benjamin Beganović
7dd7a6e4b1 Scaffold Mollie3dsController 2021-07-26 17:03:15 +02:00
David Bomba
0df3e4e5e7 Clean up 2021-07-26 09:57:55 +10:00
David Bomba
a28aa9f7ec Fixes for client portal enabled and content type 2021-07-26 08:22:29 +10:00
David Bomba
438180daca Reponse type 2021-07-25 22:44:29 +10:00
David Bomba
8cf9576496 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-07-25 22:42:15 +10:00
David Bomba
60452278b5 Minor fixes 2021-07-25 22:42:03 +10:00
=
8ea34e4f7f Protected subdomains 2021-07-25 21:51:41 +10:00
David Bomba
4f940e41b0 fixes for defaults when converting quotes to invoices 2021-07-25 18:05:53 +10:00
David Bomba
8a4230c81c Working on live preview 2021-07-25 16:23:10 +10:00
David Bomba
465fb71962 Remove time delays 2021-07-24 17:43:40 +10:00
David Bomba
0365fb35af Minor fixes 2021-07-24 17:37:19 +10:00
David Bomba
176fb66391 Tweak email delays 2021-07-24 11:34:09 +10:00
David Bomba
b5a8c60db5 Improve Company Gateway validation 2021-07-24 10:25:48 +10:00
David Bomba
8ac7ec8ef4 Fixes for validation rule 2021-07-23 10:16:59 +10:00
David Bomba
62359e4097 minor fixes for wepay 2021-07-23 09:51:55 +10:00
David Bomba
dc3cf85e2c Fixes for Notifications 2021-07-22 20:15:41 +10:00
David Bomba
11ae85732b Fixes for queries 2021-07-20 19:45:54 +10:00
David Bomba
29006a2da0 Fixes for client - country codes 2021-07-20 15:09:02 +10:00
David Bomba
aff6eb2701 Fixes for bad country codes in client request 2021-07-20 14:53:43 +10:00
David Bomba
74551c2caf Add delete company email 2021-07-19 15:38:07 +10:00
David Bomba
d82491d163 Email user when another user is added into the system 2021-07-19 14:17:58 +10:00
David Bomba
bcc286e537 Handle base64 encoded passwords 2021-07-19 10:57:13 +10:00
David Bomba
edff2881eb Import Stripe Customers 2021-07-18 17:30:29 +10:00
David Bomba
a1e9de5807 Minor Clean up 2021-07-17 22:01:00 +10:00
David Bomba
8554c6cceb Working on improving hosted migration experience 2021-07-17 17:38:59 +10:00
=
a38dcbdd87 Streamline Hosted Migrations 2021-07-17 15:58:37 +10:00
David Bomba
da177661ec Fixes for subscriptions 2021-07-15 21:00:24 +10:00
David Bomba
97885557bd
Merge pull request #6272 from turbo124/v5-develop
Tests for settings
2021-07-15 13:04:05 +10:00
David Bomba
46bc8fa495 Fixes for subscription webhooks 2021-07-15 11:06:14 +10:00
Benjamin Beganović
033e74da7d Show 'No quotes avialable for download' instead of blank page 2021-07-14 14:33:17 +02:00
Benjamin Beganović
a9ac73264e Quotes page: Show message when trying to approve non-approvable quotes 2021-07-14 14:13:37 +02:00
Benjamin Beganović
f852640083
Merge pull request #6192 from beganovich/v5-client-portal-tests-dusk
Reworking client portal tests
2021-07-14 13:08:57 +02:00
David Bomba
d448ae1119 fixes for trial_started 2021-07-14 17:15:59 +10:00
David Bomba
332d376486 Fixes for Stripe ConnecT 2021-07-14 15:34:29 +10:00
David Bomba
4086203a81 Minor fixes for product and client bulk actions 2021-07-13 19:26:59 +10:00
Benjamin Beganović
2be806bb8e Merge remote-tracking branch 'upstream/v5-develop' into v5-client-portal-tests-dusk 2021-07-12 15:58:53 +02:00
David Bomba
a2d0965ed5 Fixes for plan_expires type casting 2021-07-11 14:54:57 +10:00
David Bomba
ad0b2b8ec3 Prevent ninja company from being deleted 2021-07-11 10:16:27 +10:00
David Bomba
6edfa0a966 Fixes for User model 2021-07-10 18:59:55 +10:00
David Bomba
a842cd31fe Fixes for Stripe 2021-07-09 10:44:34 +10:00
David Bomba
d1aae93c08 Fixes for Download Recurring Invoice 2021-07-09 09:49:01 +10:00
David Bomba
57bd1f9c9d Log excessively large queries 2021-07-09 09:08:20 +10:00
David Bomba
a6b2165eec Fixes for Stripe Connect - initial account 2021-07-09 09:05:24 +10:00
David Bomba
95767f8bdd Set Mime type of imported JSON file 2021-07-09 08:43:01 +10:00
David Bomba
87d0020152 Fixes for download invoices from client portal 2021-07-09 08:01:37 +10:00
David Bomba
108512068e Form validation for contact password reset 2021-07-09 07:57:31 +10:00
David Bomba
19bd957256 Dont forget to SET the user after OAuth SignUp 2021-07-08 12:51:17 +10:00
David Bomba
32036a8569 Fixes for PDF paths 2021-07-07 21:39:49 +10:00
David Bomba
52c0bcbc18 Inject small delay when sending emails 2021-07-07 18:43:34 +10:00
David Bomba
b15041f60b Fixes for portal domain 2021-07-07 13:19:19 +10:00
David Bomba
a1b7a795e0 Fixes for contact login logo for custom domains 2021-07-07 12:54:59 +10:00
Will G
a0520f38d0 Added ability to set arguments sent to Snappdf 2021-07-06 20:47:50 -04:00
Benjamin Beganović
3ee859a258 Profile settings: Updating contact details 2021-07-06 15:20:36 +02:00
Benjamin Beganović
13aec602e6 Add company_id, status_id in the query for approving 2021-07-05 14:00:27 +02:00
Benjamin Beganović
1a5c40d02e QuotesController: Allow approving only quotes with STATUS_SENT 2021-07-05 13:57:11 +02:00
David Bomba
e52f93be74 Fixes for base driver 2021-07-05 10:26:00 +10:00
David Bomba
620ad57d50 merging v5-dev 2021-07-05 09:00:46 +10:00
David Bomba
95bbc4108c Payfast custom notify URL 2021-07-05 08:59:52 +10:00
David Bomba
58547faf3e Fixes for client portal page 2021-07-04 20:53:32 +10:00
David Bomba
f6aebc5a8b Fixes for credits 2021-07-04 07:46:25 +10:00
David Bomba
3874bff357 Minor bug fixes 2021-07-03 09:26:49 +10:00
David Bomba
e8a1df16cd Fixes for credit query 2021-07-02 16:36:14 +10:00
David Bomba
e75d817bd4
Merge pull request #6182 from turbo124/v5-develop
Fixes for setup flow
2021-07-02 10:45:10 +10:00
David Bomba
ee729d8da0 fixes for setup flow 2021-07-02 10:43:32 +10:00
Benjamin Beganović
d763382d87
Merge pull request #6177 from beganovich/v5-3006-company-logo-login
Show logo on the login screen if account whitelabel or official subdomain
2021-07-02 02:23:51 +02:00
Benjamin Beganović
c972d8696d
Merge pull request #6179 from beganovich/v5-0106-credits-show-where-due-date
(Client portal) Show only credits with `due_date` <= now()
2021-07-02 02:23:31 +02:00
David Bomba
5bcbda2f47 Minor fixes for document downloads 2021-07-02 07:57:55 +10:00
David Bomba
32698b33d7 Document middleware 2021-07-02 07:23:25 +10:00
Benjamin Beganović
d0e59e1d27 Show only credits with due_date <= now() 2021-07-01 19:20:46 +02:00
Benjamin Beganović
e9d2d7d7f2 Show logo on the login screen if account whitelabel or official subdomain 2021-07-01 18:29:32 +02:00
David Bomba
69461104fe Fixes for client gateways 2021-07-01 15:56:44 +10:00
David Bomba
25459797db Add late fees back into reminders 2021-07-01 09:14:30 +10:00
Benjamin Beganović
1c05d51c7e
Merge pull request #6161 from beganovich/v5-2906-tasks-controlled-by-setting
(v5) Show tasks based on setting in the client portal
2021-06-30 02:01:06 +02:00
Benjamin Beganović
31e138c41e CreatePaymentMethodRequest.php allow only enabled methods to pass 2021-06-29 12:42:44 +02:00
Benjamin Beganović
1c96b358bf Show tasks based on setting in the client portal 2021-06-29 11:47:38 +02:00
David Bomba
a48328b90c Fixes for email translations 2021-06-29 19:46:40 +10:00
David Bomba
8e43eaa99d minor fixes 2021-06-29 17:26:21 +10:00
David Bomba
ac842d0d83 Fixes for subscriptions 2021-06-29 16:05:03 +10:00
David Bomba
0ef1a83300 Additional catches for company importing 2021-06-29 08:42:59 +10:00
David Bomba
11f13cba0d Minor fixes 2021-06-28 21:30:04 +10:00
Benjamin Beganović
77513de2a5 Make terms/privacy policy checkbox required if fields are present 2021-06-28 12:31:23 +02:00
David Bomba
4c00403d8c Fixes for contact registration 2021-06-28 19:56:04 +10:00
David Bomba
b654639ad3 Refactor for company import 2021-06-28 16:02:49 +10:00
David Bomba
24e8745b5b Fixes for company import 2021-06-28 14:09:02 +10:00
David Bomba
7d6676ca14 Fixes for missing include 2021-06-28 09:47:04 +10:00
David Bomba
d7e551fc95 Fixes for subscriptions 2021-06-27 21:55:15 +10:00
Benjamin Beganović
eb34cd81b1 Ability to toggle auto_bill_enabled on client side 2021-06-25 10:09:57 +02:00
Benjamin Beganović
cca78a9d38 Ability to select primary payment method 2021-06-25 09:15:57 +02:00
David Bomba
0c9de66a80 Set Transactions on the correct database 2021-06-24 21:52:02 +10:00
David Bomba
428a1a221c Minor fixes 2021-06-24 20:12:05 +10:00
David Bomba
c961d32c81 Minor fixes 2021-06-24 19:59:14 +10:00
David Bomba
28e3defc83 Fixes for dissociated default_company 2021-06-24 18:42:45 +10:00
David Bomba
1195c98660 Fixes for Two Factor 2021-06-23 15:01:13 +10:00
David Bomba
b56b5c1ec9 Fixes for Two Factor 2021-06-23 14:55:12 +10:00
David Bomba
24a5548619 Verify ACH amounts as integers 2021-06-23 08:14:23 +10:00
David Bomba
293b12e348 Fixes for login where the user is not attached to an account 2021-06-22 21:14:08 +10:00
David Bomba
8f78f93537 Log exact IP if reported by cloudflare 2021-06-22 10:51:43 +10:00
David Bomba
f258ccec16 force token_billing=always for system created gateways 2021-06-22 08:01:50 +10:00
David Bomba
1fb8e003b2 Fixes for sending message 2021-06-22 07:21:59 +10:00
David Bomba
1b303f9559 Fixes for subscription service 2021-06-21 20:53:34 +10:00
David Bomba
c9778463f6 Fixes for AAL license 2021-06-21 15:10:20 +10:00
David Bomba
f93aab5697 Fixes for Client Portal Download a single invoice 2021-06-21 12:58:52 +10:00
David Bomba
d43984385a Fixes for migration email 2021-06-21 07:09:42 +10:00
David Bomba
172604a1a0 WePay 2021-06-20 22:10:22 +10:00
David Bomba
1c052a7431 change user login event 2021-06-20 20:35:26 +10:00
David Bomba
5535ce8faf Allow archived invoices to be paid. 2021-06-20 08:14:56 +10:00
David Bomba
3982fcc2b0 Bug fix for saving report/user notifications for non-admin users 2021-06-20 07:34:30 +10:00
David Bomba
7ec71d886d
Merge pull request #6080 from turbo124/v5-develop
Working on gmail BCC
2021-06-18 22:04:42 +10:00
David Bomba
5cc3539388 Fix for no EmailBounce class 2021-06-18 12:57:13 +10:00
Benjamin Beganović
a502cee73e Enabled modules for InvoiceController.php 2021-06-17 14:43:14 +02:00
Benjamin Beganović
2d9bd6471b Update copyright in ShowTasksRequest.php 2021-06-17 14:38:16 +02:00
Benjamin Beganović
430d39b2f1 Enabled modules QuoteController.php 2021-06-17 14:37:06 +02:00
Benjamin Beganović
0d313f12b0 Enabled modules CreditController.php 2021-06-17 14:28:46 +02:00
Benjamin Beganović
a999534769 Enabled modules RecurringInvoiceController.php 2021-06-17 14:24:33 +02:00
Benjamin Beganović
77c03d4e8f Sync sidebar enabled modules with admin portal 2021-06-17 14:06:44 +02:00
David Bomba
b37d9d267e Fixes for broken invoice pdf links 2021-06-17 18:59:15 +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
28b5d01804 minor change for subdomain regex 2021-06-17 07:29:03 +10: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
c076998366 Wepay Payments 2021-06-16 20:12:04 +10:00
David Bomba
36f6cbbcc9 Update license in codebase 2021-06-16 16:58:16 +10:00
Benjamin Beganović
dfdb4b1cd9 Merge remote-tracking branch 'upstream/v5-develop' into v5-update-email-templates 2021-06-15 15:45:14 +02:00
David Bomba
177a4ce58f Working on authorization for WePay 2021-06-15 15:56:23 +10:00
David Bomba
95c9eb03a9 merge v5-dev 2021-06-14 20:47:03 +10:00
David Bomba
1397c9ab1c Fixes logic for hosted login 2021-06-14 17:04:15 +10:00
=
0bc3ec111d Authorize WePAy 2021-06-13 22:49:43 +10:00
=
46ae91f920 Fixes for regex for subdomain name 2021-06-13 20:47:49 +10:00
David Bomba
59fcbfe52c Don't delete the PDF prior to sending 2021-06-13 14:19:40 +10:00
David Bomba
0fb7f58851 code cleanup 2021-06-13 09:58:23 +10:00
=
afdfddd7e9 Refactor for entity paths 2021-06-12 21:50:01 +10:00
David Bomba
f268b7adcb Clean up 2021-06-11 17:45:41 +10:00
David Bomba
b111483ef1 We Pay Account Signup 2021-06-11 17:39:51 +10:00
David Bomba
c367ea60ae Timezone Offset implementation 2021-06-11 08:20:46 +10:00
David Bomba
1bc32c2aca Working on Timezone Offsets 2021-06-11 07:34:03 +10:00
=
99d6d1c516 Email timing offset 2021-06-10 21:25:47 +10:00
=
769ab49458 Force client country if none set 2021-06-10 20:18:01 +10:00
David Bomba
4675cc92b5 Inject delays in emails to allow enough time for attachment resources to upload when using S3 type storage 2021-06-10 19:01:30 +10:00
David Bomba
af68794823 Resolve access token from refresh token - gmail 2021-06-10 18:35:58 +10:00
David Bomba
4ef26723c1 Gmail offline_access 2021-06-10 17:38:07 +10:00
David Bomba
8a89973d7c Gmail offline_access 2021-06-10 17:17:02 +10:00
David Bomba
d1e92060bd Fixes for scopes 2021-06-10 16:57:18 +10:00
David Bomba
185986e819 Fix for missing method property 2021-06-10 15:06:28 +10:00
David Bomba
9c8618ac34 Oauth 2021-06-10 14:05:49 +10:00
Benjamin Beganović
15acba27dd app/Mail/ContactPasswordlessLogin.php 2021-06-09 17:07:41 +02:00
David Bomba
e4975e85bb Fixes for StoreUserRequest 2021-06-09 22:25:25 +10:00
David Bomba
f4bfa6c0fd Add rules for adding users to hosted platform 2021-06-09 19:57:03 +10:00
David Bomba
3d880f2dd3 Updates for Password Protection with OAuth 2021-06-09 16:22:25 +10:00
David Bomba
26a1e34268 Logging for Password Protection 2021-06-09 16:01:09 +10:00
David Bomba
0f58039532 Fixes for if plan is null 2021-06-08 22:29:39 +10:00
David Bomba
d68e40433c Fixes for client portal links 2021-06-08 21:45:23 +10:00
David Bomba
c2e2ab60cb Implement slight delay on Company Import 2021-06-08 18:58:27 +10:00
David Bomba
5d04ab724b Fixes for login 2021-06-08 18:42:37 +10:00
David Bomba
968f512aec Fixes for orphan users with no tokens 2021-06-08 18:30:54 +10:00
David Bomba
5854b9825f Fixes for Import 2021-06-08 08:33:51 +10:00
David Bomba
8a985c6954 Make all livewire components MultiDB aware 2021-06-07 11:06:31 +10:00
David Bomba
ec6bf52b43 Add specific route for disabling 2FA 2021-06-06 19:21:05 +10:00
=
8703bcc5f6 Fixes for .register bug 2021-06-05 20:59:53 +10:00
=
e37613a5a1 Company Registration 2021-06-05 20:31:11 +10:00
=
e6eb899f79 Fixes for contact registration 2021-06-05 20:12:10 +10:00
=
a2e994be82 Company Import 2021-06-04 20:07:45 +10:00
David Bomba
b75c01d6d4 Minor fixes 2021-06-04 17:41:12 +10:00
David Bomba
97205032a2 Fixes for subscriptions 2021-06-04 07:57:24 +10:00
David Bomba
fd3993d84e Fixes for subscriptions 2021-06-04 07:43:22 +10:00
David Bomba
14994c0e5b Fixes for subscrpitions 2021-06-03 15:55:37 +10:00
David Bomba
43c52ab753 Bug fixes 2021-06-03 15:47:09 +10:00
David Bomba
520e354a93 Bux fixes 2021-06-03 11:43:14 +10:00
David Bomba
3b14074c0b Fixes for magic links 2021-06-03 09:50:31 +10:00
David Bomba
214396fa43 Fixes for deleting and reusing design names 2021-06-03 08:02:30 +10:00
David Bomba
8d2cebb6e5 Fixes for magic links 2021-06-02 21:47:28 +10:00
David Bomba
fc444b7c39 Fixes for billing portal 2021-06-02 18:55:33 +10:00
David Bomba
aac53155fc Fixes for CORS 2021-06-02 13:31:53 +10:00
David Bomba
4c0c770c56 Fixes for CORS 2021-06-02 13:14:40 +10:00
David Bomba
30e0d4a6ab Fixes for CORS 2021-06-02 12:39:44 +10:00
David Bomba
82fcf55ab2 Fixes for CORS 2021-06-02 10:58:39 +10:00
David Bomba
37de17cf38 Fixes for CORS 2021-06-02 10:48:48 +10:00
David Bomba
24b7cb7509 Fixes for CORS 2021-06-02 10:18:42 +10:00
David Bomba
d9e923e978
Merge pull request #5886 from turbo124/v5-develop
Fixes for CORS
2021-06-02 10:02:55 +10:00
David Bomba
980a687322 Fixes for CORS 2021-06-02 10:02:05 +10:00
David Bomba
8baaaa10c7
Merge pull request #5885 from turbo124/v5-develop
Fixes for CORS
2021-06-02 09:08:07 +10:00
David Bomba
f2c11f8180 Fixes for CORS 2021-06-02 09:07:53 +10:00
Benjamin Beganović
c61a94f2d1
Merge pull request #5853 from beganovich/v5-2805-tracking-campaign-source
(v5) Passing campaign data into payment flow
2021-06-01 16:32:34 +02:00
David Bomba
5252f83ec6 Fixes for CORS 2021-06-01 23:08:32 +10:00
David Bomba
5fe49c9e30
Merge pull request #5883 from turbo124/v5-develop
Fixes for CORS
2021-06-01 22:12:55 +10:00
David Bomba
315dbb5503 Fixes for CORS 2021-06-01 22:12:41 +10:00
Benjamin Beganović
44d1daa749
Merge pull request #5882 from beganovich/v5-0106-add-register-button
(v5) Show register link on the login page
2021-06-01 14:08:59 +02:00
Benjamin Beganović
23e23918b4 Show register link on the login page 2021-06-01 14:06:47 +02:00
David Bomba
b1e882903c
Merge pull request #5881 from turbo124/v5-develop
Fixes for CORS
2021-06-01 21:43:55 +10:00
David Bomba
92ad3621de Fixes for CORS 2021-06-01 21:43:36 +10:00
Benjamin Beganović
bd97b916e4
Merge branch 'v5-develop' into v5-2805-tracking-campaign-source 2021-06-01 13:38:36 +02:00
Benjamin Beganović
468b576ce5
Merge pull request #5864 from beganovich/v5-3105-checkout-3ds-route
(v5) Move Checkout.com 3DS confirmation logic into separate route
2021-06-01 13:37:34 +02:00
David Bomba
306d63ba22 Fixes for CORS 2021-06-01 21:07:11 +10:00
David Bomba
e69cd0699e Fixes for CORS 2021-06-01 20:51:38 +10:00
David Bomba
20eca600e3 Fixes for CORS 2021-06-01 20:06:46 +10:00
David Bomba
1ddf220448 Fixes for gmail oauth 2021-06-01 19:57:05 +10:00
Benjamin Beganović
9119f57a35 Return JSON response if some of required records wasn't found 2021-06-01 11:54:15 +02:00
David Bomba
0e210e6635 Minor fixes 2021-06-01 17:24:51 +10:00
David Bomba
b581a749f2 Minor fixes 2021-06-01 16:06:00 +10:00
David Bomba
1d4f982245 Gmail Oauth 2021-06-01 15:24:47 +10:00
David Bomba
ee6c0468b2 Minor fixes 2021-06-01 10:24:20 +10:00
David Bomba
cd594914b7 fixes for password reset screen 2021-06-01 09:02:30 +10:00
David Bomba
c3946f44b0 Fixes for custom payment method name 2021-06-01 08:09:38 +10:00
David Bomba
13bfd6e7fd Fixes for setup screeen 2021-06-01 07:40:15 +10:00
Benjamin Beganović
588aeefb35 Moving logic for confirming the 3ds process into own method 2021-05-31 16:37:46 +02:00
Benjamin Beganović
8ca1b904d7 Refactor the redirect to specific route 2021-05-31 16:23:18 +02:00
David Bomba
829b069063 Fixes for custom translations 2021-05-31 20:40:34 +10:00
David Bomba
b9191bf67a Company Ledger Adjustment 2021-05-31 15:27:26 +10:00
David Bomba
5e820bbba7 Working on company importer 2021-05-31 08:55:27 +10:00
David Bomba
6dc3668ff6 Fixes for tests 2021-05-31 08:17:42 +10:00
David Bomba
b72217d74c Fixes for import company tests 2021-05-30 21:26:43 +10:00
David Bomba
f22745d131 Remove delivery not from try/catch block 2021-05-30 06:50:55 +10:00
Benjamin Beganović
f64b0b3d19 Passing data about campaign into billing components 2021-05-29 13:16:45 +02:00
David Bomba
817f7c685f Import company 2021-05-28 18:37:08 +10:00
David Bomba
d3c8060dfb Fixes for tests 2021-05-27 11:19:07 +10:00
David Bomba
9805474c3d Fixes for archived/deleted task reording 2021-05-27 09:25:29 +10:00
David Bomba
c125dca154 Fixes for client portal login/auth/register pages 2021-05-27 09:14:21 +10:00
David Bomba
b82cdb6b77 Fixes for DB::rollBack 2021-05-26 17:04:29 +10:00
David Bomba
e76567f337 Fixes for creating an account using OAuth 2021-05-26 16:14:47 +10:00
David Bomba
ba672f6fdd Fixes for test 2021-05-26 11:32:01 +10:00
David Bomba
0079e52b85 Refactor for account signups 2021-05-26 10:37:59 +10:00
David Bomba
5e33eb9130 Generate temp email address for direct client portal viewing. 2021-05-25 08:32:08 +10:00
David Bomba
0e61a6f491 Fixes for random subdomain generator 2021-05-24 19:39:21 +10:00
David Bomba
3c99c65033 FIxes for multidb 2021-05-24 14:24:16 +10:00
David Bomba
6b0d75a666 Fixes for multidb UserController 2021-05-24 11:30:30 +10:00
David Bomba
0b71bc03b0 Fixes for User Route 2021-05-24 10:53:04 +10:00
David Bomba
af04fb9a37 Fixes for MultiDB UserController 2021-05-24 10:41:23 +10:00
David Bomba
c62b2bec7d Constrain by company_id 2021-05-24 08:25:14 +10:00
David Bomba
10a0812ead Refactor for login flow 2021-05-24 07:23:30 +10:00
David Bomba
3b7bf352a7 Fixes for trait inclusion 2021-05-23 18:59:09 +10:00
David Bomba
9d21b4fd57 Refactor LoginController 2021-05-23 18:43:50 +10:00
David Bomba
c5a24fd9d9 Fixes for OAuth using logging in over user/pass combinations 2021-05-23 07:57:53 +10:00
David Bomba
0f3495a245 Set boolean type for signup fields 2021-05-23 07:50:34 +10:00
David Bomba
601d795ace Fixes for reset password 2021-05-22 14:45:09 +10:00
David Bomba
264477a2de Fixes for reset password 2021-05-22 14:31:48 +10:00
=
735771eef2 v5.1.63 2021-05-21 17:39:59 +10:00
David Bomba
b58d3f390e Fixes for Stripe Connect 2021-05-21 15:47:05 +10:00
David Bomba
99dd97443a Fixes for vendor requests 2021-05-21 10:23:37 +10:00
David Bomba
ee0518d34f Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-21 07:58:51 +10:00
David Bomba
0b7891e24f Fixes for restore invoice numbering 2021-05-21 07:58:46 +10:00
David Bomba
238143d88e Fixes for paths for email attachments 2021-05-20 19:50:11 +10:00
David Bomba
019d6eb009 Fixes for company requests 2021-05-20 17:09:29 +10:00
David Bomba
c43d122e91 Fixes for importing Ninja clients/contacts 2021-05-20 14:13:54 +10:00
David Bomba
f7a4588371 Fixes for refresh route - firstload/mini_loader 2021-05-19 18:38:51 +10:00
David Bomba
2e6896dd58 Fixes for importing customers into Stripe. 2021-05-19 14:27:47 +10:00
David Bomba
4db46e2bb6 Fixes for Stripe import 2021-05-19 13:32:20 +10:00
David Bomba
49b3cab7d7 Refactor system logger to enable multidb 2021-05-19 11:12:55 +10:00
David Bomba
52c3d63349 Refactor system logger to enable multidb 2021-05-19 11:12:23 +10:00
David Bomba
c1c17eb2ed Change VersionCheck URL away from GitHub 2021-05-19 09:42:48 +10:00
David Bomba
a482e3c37e Fixes for Stripe Connect 2021-05-19 09:03:30 +10:00
David Bomba
470fb67877 Fixes for subdomain checks 2021-05-18 23:12:03 +10:00
David Bomba
a45341786d Debugging for Stripe Connect 2021-05-18 22:03:19 +10:00
David Bomba
754bed50d3
Merge pull request #5735 from turbo124/v5-develop
Fixes for setup + new js package
2021-05-18 20:26:22 +10:00
David Bomba
4492346e48 Fixes for setup + new js package 2021-05-18 20:26:06 +10:00
Benjamin Beganović
1eaecdd8c6
Merge pull request #5700 from beganovich/v5-1405-client-portal-settings
(v5) Update client settings to match the one's at the admin panel
2021-05-18 12:05:59 +02:00
Benjamin Beganović
21d12bef77
Merge pull request #5734 from beganovich/v5-1805-credits-updates
(v5) Client portal: "Credits" updates
2021-05-18 12:05:05 +02:00
Benjamin Beganović
cd2a104fbc Fullscreen view for credits 2021-05-18 12:03:06 +02:00
David Bomba
2291d908d0
Merge pull request #5733 from turbo124/v5-develop
Fixes for Stripe Connect
2021-05-18 19:55:22 +10:00
David Bomba
5c11901625 Fixes for Stripe Connect 2021-05-18 19:54:57 +10:00
Benjamin Beganović
9dc418ec5b
Merge pull request #5691 from beganovich/v5-1204-tasks
(v5) Client portal: Tasks
2021-05-18 11:08:46 +02:00
Benjamin Beganović
fad1743e30 Update Carbon locale before rendering the tasks page 2021-05-18 11:08:26 +02:00
Benjamin Beganović
708073a83e
Merge branch 'v5-develop' into v5-1405-client-portal-settings 2021-05-18 10:57:26 +02:00
David Bomba
d049c56573 fixes for migration 2021-05-18 17:28:13 +10:00
David Bomba
3f373d873f Fixes for Stripe Connect 2021-05-18 15:53:00 +10:00
David Bomba
d515a1ee97 Fixes for stripe connect 2021-05-18 14:02:57 +10:00
David Bomba
f39bdaef73 Fixes for Stripe Connect 2021-05-18 13:28:59 +10:00
David Bomba
9599c8de4f Refactor for Stripe Connect 2021-05-18 12:13:00 +10:00
David Bomba
12d8da942e Import stripe customers and update their payment methods 2021-05-17 18:56:14 +10:00
David Bomba
0347ca00f5 Update payment methods for Stripe 2021-05-17 14:02:43 +10:00
David Bomba
0506b08ee0 Email invoice paid receipts 2021-05-17 08:09:20 +10:00
David Bomba
f9347fc652 fixes for factories 2021-05-16 19:44:44 +10:00
David Bomba
499d9f6b86 Fixes for client portal constraint 2021-05-15 17:00:17 +10:00
David Bomba
f9fae690a0 Tests for import 2021-05-15 16:54:27 +10:00
David Bomba
e59f00d390 Fixes for domains 2021-05-15 14:38:32 +10:00
David Bomba
364f7addb6 Fixes for subdomain resolution for MultiDB 2021-05-15 14:00:29 +10:00
David Bomba
d7d76ae6ea MultiDB domain resolution for client portals 2021-05-15 13:31:41 +10:00
David Bomba
c7dfa8547f
Merge pull request #5706 from turbo124/v5-develop
Don't store PDFs
2021-05-15 12:19:59 +10:00
David Bomba
c52311bcde Fixes for PDF file paths 2021-05-15 12:19:36 +10:00
David Bomba
7756ca7436 Don't store PDFs 2021-05-14 21:15:11 +10:00
Benjamin Beganović
a48556a557 Improve CheckClientExistence.php middleware 2021-05-14 12:33:12 +02:00
David Bomba
de8fb374ab Fixes for S3 storage and delivery notes 2021-05-14 19:43:06 +10:00
Benjamin Beganović
567fcd8e30 Update client settings to match the one's at the admin panel 2021-05-14 10:18:26 +02:00
David Bomba
0dac08eaa6 Fixes for large account loading 2021-05-14 17:38:16 +10:00
David Bomba
97b49f8df6 Fixes for download export button 2021-05-14 13:32:37 +10:00
David Bomba
c05cb2868a Fixes for middleware priority 2021-05-14 08:29:52 +10:00
David Bomba
f5435e0f8e Fixes for middleware priority 2021-05-14 08:03:57 +10:00
David Bomba
6e967035d8 Reorder middleware to allow route model binding to be delayed 2021-05-13 23:01:23 +10:00
David Bomba
777c2dd24a Reorder middleware to allow route model binding to be delayed 2021-05-13 22:41:32 +10:00
David Bomba
8a582f7800 Fixes for reset password 2021-05-13 20:18:30 +10:00
=
daff65de01 Working on password reset throttling 2021-05-13 19:13:51 +10:00
David Bomba
ef359501ba Export Controller 2021-05-13 16:16:39 +10:00
David Bomba
e4fabfbf2d Export data 2021-05-13 16:01:12 +10:00
Benjamin Beganović
5a84fb6990 Tasks module in the client portal 2021-05-12 16:39:29 +02:00
David Bomba
ac77100981 New login notification 2021-05-12 16:31:02 +10:00
David Bomba
f60b9c30eb Add new login notification 2021-05-12 16:18:32 +10:00
David Bomba
42d5f03130 Fixes for Stripe Connect 2021-05-12 13:15:51 +10:00
David Bomba
e8adae6568 Fixes for Stripe Connect 2021-05-12 13:00:46 +10:00
David Bomba
06a242625b Fixes for stripe authorize card 2021-05-12 10:13:42 +10:00
David Bomba
899784cf45 Do not show deleted invoices 2021-05-11 22:03:44 +10:00
David Bomba
6bfaa11f59
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-11 21:14:54 +10:00
David Bomba
e46bf71334 Fixes for deleting users / company_users and companies 2021-05-11 17:25:34 +10:00
David Bomba
f19af6290a fixes for event listeners 2021-05-11 15:17:45 +10:00
David Bomba
3b01190bc2 Return error when the user isn't attached to a company 2021-05-11 14:57:36 +10:00
David Bomba
3fca12f970
Merge pull request #5661 from turbo124/v5-develop
Disable client portal
2021-05-11 14:37:22 +10:00
David Bomba
ad2742a0d6 Disable client portal 2021-05-11 11:55:47 +10:00
Benjamin Beganović
f07c911f8b
Merge branch 'v5-develop' into v5-2804-braintree 2021-05-10 16:55:04 +02:00
Benjamin Beganović
3fb202be2c
Merge pull request #5656 from beganovich/v5-1005-stripe-hiding-cvv
(v5) Prefill the postal code with Stripe Elements
2021-05-10 14:54:21 +02:00
Benjamin Beganović
d28bc96b99 Block viewing deleted credit in the client portal 2021-05-10 14:46:22 +02:00
Benjamin Beganović
50ad75b516 Fix the wrong variable reference 2021-05-10 13:35:38 +02:00
Benjamin Beganović
580628b7f9 Show quotes 2021-05-10 13:28:31 +02:00
Benjamin Beganović
604f074dfa Show invoices full screen 2021-05-10 13:26:13 +02:00
David Bomba
4979ed94de Minor fixes 2021-05-10 21:05:44 +10:00
Benjamin Beganović
3764389e04 Pass 'client_postal_code' when emitting 'passed-required-field-check' 2021-05-10 13:01:40 +02:00
David Bomba
16c5665cc6 Recurring Invoice history / activities 2021-05-10 20:20:52 +10:00
Benjamin Beganović
85822c45ac Merge upstream/v5-develop 2021-05-10 11:50:05 +02:00
=
3b5a6d5392 Events and listeners for Recurring Invoices 2021-05-10 18:45:07 +10:00
=
438cf2d3ee Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-10 18:17:32 +10:00
David Bomba
82d274c1f2 Recurring Invoice Activities 2021-05-10 15:59:23 +10:00
David Bomba
39f3c55e8e Stripe ConnecT 2021-05-10 12:49:16 +10:00
David Bomba
907da5f27d Fixes for Stripe Connect 2021-05-10 11:57:23 +10:00
David Bomba
685b5be11c Fixes for Stripe Connect 2021-05-10 11:37:53 +10:00
David Bomba
815878be5c Fixes for Stripe Connect 2021-05-10 10:22:07 +10:00
David Bomba
dacd31bb83 Merge branch 'v5-develop' of https://github.com/turbo124/invoiceninja into v5-develop 2021-05-10 09:53:05 +10:00
David Bomba
7808b4c30d Fixes for created_at dates in migration 2021-05-10 09:52:58 +10:00
David Bomba
87ddad6670 Working on PDF generator flags 2021-05-09 21:30:31 +10:00
=
2510fe9df8 Allow all users to see the task statuses 2021-05-09 19:03:47 +10:00
David Bomba
1740f11715 We Pay 2021-05-08 16:46:14 +10:00
David Bomba
51effc3dfe Fixes for query logging 2021-05-08 07:43:53 +10:00
=
31db5b44c1 WePay 2021-05-07 18:03:37 +10:00
David Bomba
bdda63a214 We Pay 2021-05-07 17:07:49 +10:00
David Bomba
3c9b096f01 WePay 2021-05-07 15:39:45 +10:00
David Bomba
ae1af32b59 Improve quality for url 2021-05-07 08:31:00 +10:00
David Bomba
f3a56c8174 Add activities to entities 2021-05-07 07:41:37 +10:00
David Bomba
85c05f7c30 Fixes for VarEvents 2021-05-07 07:12:07 +10:00
David Bomba
1a947d720d we pay 2021-05-06 19:39:24 +10:00
David Bomba
2b8d7c26da Fixes for checkout gateway 2021-05-06 15:38:39 +10:00
David Bomba
eff664a586 WePayg 2021-05-06 14:39:18 +10:00
David Bomba
24f935e277 Merge branch 'wepay' of https://github.com/turbo124/invoiceninja into wepay 2021-05-06 13:44:25 +10:00
David Bomba
3c670592b9 Add default include for mini_load 2021-05-06 13:29:59 +10:00
David Bomba
2805e1cc96 email_receipt flag 2021-05-06 13:22:55 +10:00
David Bomba
eaeb47090a Load designs for mini load 2021-05-06 08:42:18 +10:00
=
d3f14887e1 WePay 2021-05-05 20:50:36 +10:00
David Bomba
991fa7079e Fixes for password protection 2021-05-05 16:44:31 +10:00
David Bomba
a7abc2cd1b Fixes for password protection 2021-05-05 16:30:12 +10:00
David Bomba
d61e7f57a2 Fixes for wepay 2021-05-05 16:21:37 +10:00