Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-18 00:10:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/Emile840/wekan into Emile840-master

Browse source
This commit is contained in:
Lauri Ojansivu 2021-11-11 19:19:12 +02:00
commit 712ae37400
4 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/components/main/layouts.js
View file

@ -180,6 +180,10 @@ Template.userFormsLayout.events({
templateInstance.isLoading.set(false); templateInstance.isLoading.set(false);
}); });
} }
isCheckDone= false;
},
'click #at-signUp'(event, templateInstance){
isCheckDone= false;
}, },
'DOMSubtreeModified #at-oidc'(event){ 'DOMSubtreeModified #at-oidc'(event){
if(alreadyCheck <= 2){ if(alreadyCheck <= 2){

3
client/components/sidebar/sidebar.jade
View file

@ -109,6 +109,9 @@ template(name="boardTeamGeneral")
b b
| {{_ 'add-teams'}} | {{_ 'add-teams'}}
br br
i.addTeamsLabelcss
| {{_ 'to-create-teams-contact-admin'}}
br
i.addTeamsLabelcss i.addTeamsLabelcss
| {{_ 'add-teams-label'}} | {{_ 'add-teams-label'}}
th th

1
i18n/en.i18n.json
View file

@ -1099,6 +1099,7 @@
"invite-people-success": "Invitation to register sent with success", "invite-people-success": "Invitation to register sent with success",
"invite-people-error": "Error while sending invitation to register", "invite-people-error": "Error while sending invitation to register",
"can-invite-if-same-mailDomainName": "Email domain name", "can-invite-if-same-mailDomainName": "Email domain name",
"to-create-teams-contact-admin": "To create teams, please contact the administrator.",
"Node_heap_total_heap_size": "Node heap: total heap size", "Node_heap_total_heap_size": "Node heap: total heap size",
"Node_heap_total_heap_size_executable": "Node heap: total heap size executable", "Node_heap_total_heap_size_executable": "Node heap: total heap size executable",
"Node_heap_total_physical_size": "Node heap: total physical size", "Node_heap_total_physical_size": "Node heap: total physical size",

6
i18n/fr.i18n.json
View file

@ -1095,6 +1095,10 @@
"confirm-btn": "Confirmer", "confirm-btn": "Confirmer",
"remove-btn": "Supprimer", "remove-btn": "Supprimer",
"filter-card-title-label": "Filtrer par titre de carte", "filter-card-title-label": "Filtrer par titre de carte",
"invite-people-success": "Invitation to register sent with success",
"invite-people-error": "Error while sending invitation to register",
"can-invite-if-same-mailDomainName": "Email domain name",
"to-create-teams-contact-admin": "Pour créer des équipes, veuillez contacter l'administrateur.",
"invite-people-success": "Invitation à s'enregistrer envoyée avec succès", "invite-people-success": "Invitation à s'enregistrer envoyée avec succès",
"invite-people-error": "Une erreur s'est produite lors de l'envoi de l'invitation à s'enregistrer", "invite-people-error": "Une erreur s'est produite lors de l'envoi de l'invitation à s'enregistrer",
"can-invite-if-same-mailDomainName": "Nom de domaine du message", "can-invite-if-same-mailDomainName": "Nom de domaine du message",
@ -1113,4 +1117,4 @@
"Node_memory_usage_heap_total": "Utilisation mémoire de Node : taille totale du tas alloué", "Node_memory_usage_heap_total": "Utilisation mémoire de Node : taille totale du tas alloué",
"Node_memory_usage_heap_used": "Utilisation mémoire de Node : mémoire réellement utilisée", "Node_memory_usage_heap_used": "Utilisation mémoire de Node : mémoire réellement utilisée",
"Node_memory_usage_external": "Utilisation mémoire de Node: externe" "Node_memory_usage_external": "Utilisation mémoire de Node: externe"
} }