Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5590 from turbo124/master

Browse Source 
Code of conduct
This commit is contained in:
David Bomba 2021-05-03 21:25:56 +10:00 committed by GitHub
commit d619522e2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CODE_OF_CONDUCT.md Normal file
View File

@ -0,0 +1,4 @@
# Invoice Ninja Code of Conduct
The development team has invested a tremendous amount of time and energy into this project. While we appreciate that bugs can be frustrating we ask that our community refrain from insults and snide remarks. We're happy to provide support to both our hosted and selfhosted communities but ask that feedback is always polite.

3
app/Traits/GenerateMigrationResources.php
View File

@ -880,7 +880,7 @@ info("get company");
'key' => $invitation->invitation_key,
'transaction_reference' => $invitation->transaction_reference,
'message_id' => $invitation->message_id,
'email_error' => $invitation->email_error,
'email_error' => $invitation->email_error ?: '',
'signature_base64' => $invitation->signature_base64,
'signature_date' => $invitation->signature_date,
'sent_date' => $invitation->sent_date,
@ -889,6 +889,7 @@ info("get company");
'created_at' => $invitation->created_at ? Carbon::parse($invitation->created_at)->toDateString() : null,
'updated_at' => $invitation->updated_at ? Carbon::parse($invitation->updated_at)->toDateString() : null,
'deleted_at' => $invitation->deleted_at ? Carbon::parse($invitation->deleted_at)->toDateString() : null,
'email_status' => '',
];
}

4
resources/lang/en/texts.php
View File

@ -4282,6 +4282,10 @@ $LANG = array(
'notification_credit_created_subject' => 'Credit :invoice was created to :client',
'notification_credit_created_subject' => 'Credit :invoice was created for :client',
'migration_create_account_notice' => 'Please ensure you have created an account on the new platform first <a href="https://invoicing.co">here</a> , please ensure that the credentials are <b>identical</b> to your v4 credentials. Once the account has been created, you can start the migration process here.',
'auth' => 'Authentication',
'companies' => 'Select companies for migration',
);
return $LANG;