infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' into teamBox

Browse Source
pull/1/head
ansuz 5 years ago
parent b663c20233 c7dec16e52
commit 6a9942715d
16 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File

1
www/common/drive-ui.js
Unescape Escape View File

@ -944,6 +944,7 @@ define([
// Ctrl+A select all
if (e.which === 65 && (e.ctrlKey || (e.metaKey && APP.isMac))) {
e.preventDefault();
$content.find('.cp-app-drive-element:not(.cp-app-drive-element-selected)')
.each(function (idx, element) {
selectElement($(element));

1
www/common/translations/messages.ca.json
Unescape Escape View File

@ -148,7 +148,6 @@
"or": "o",
"tags_title": "Etiquetes (només vostres)",
"tags_add": "Actualitza les etiquetes d'aquesta pàgina",
"tags_searchHint": "Inicieu una cerca amb # al vostre CryptDrive per trobar els vostres documents etiquetats.",
"tags_notShared": "Les vostres etiquetes no es comparteixen amb altres persones usuàries",
"tags_duplicate": "Etiquetes duplicades: {0}",
"tags_noentry": "No podeu etiquetar un document esborrat!",

1
www/common/translations/messages.de.json
Unescape Escape View File

@ -146,7 +146,6 @@
"or": "oder",
"tags_title": "Tags (nur für dich)",
"tags_add": "Tags der ausgewählten Pads bearbeiten",
"tags_searchHint": "Beginne die Suche in deinem CryptDrive mit #, um getaggte Dokumente zu finden.",
"tags_notShared": "Deine Tags werden nicht mit anderen Benutzern geteilt",
"tags_duplicate": "Doppeltes Tag: {0}",
"tags_noentry": "Du kannst keine Tags zu einem gelöschten Pad hinzufügen!",

1
www/common/translations/messages.el.json
Unescape Escape View File

@ -119,7 +119,6 @@
"or": "ή",
"tags_title": "Ετικέτες (για εσάς μόνο)",
"tags_add": "Ενημερώστε τις ετικέτες αυτής της σελίδας",
"tags_searchHint": "Ξεκινήστε μια αναζήτηση με το σύμβολο # στο CryptDrive σας για να βρείτε pads με ετικέτες.",
"tags_notShared": "Οι ετικέτες σας δεν μοιράζονται με άλλους χρήστες",
"tags_duplicate": "Διπλή ετικέτα: {0}",
"tags_noentry": "Δεν μπορείτε να βάλετε ετικέτα σε διεγραμένο pad!",

1
www/common/translations/messages.es.json
Unescape Escape View File

@ -472,7 +472,6 @@
"printBackgroundRemove": "Eliminar este fondo de pantalla",
"tags_title": "Etiquetas (sólo para tí)",
"tags_add": "Actualizar las etiquetas de esta página",
"tags_searchHint": "Comenzar una búsqueda con # en tú CryptDrive para encontrar las notas etiquetadas.",
"tags_notShared": "Tus etiquetas no están compartidas con otros usuarios",
"tags_duplicate": "Duplicar etiquetas:{0}",
"tags_noentry": "No puedes etiquetar una nota eliminada!",

1
www/common/translations/messages.fi.json
Unescape Escape View File

@ -151,7 +151,6 @@
"or": "tai",
"tags_title": "Tunnisteet (vain sinulle)",
"tags_add": "Päivitä sivun tunnisteet",
"tags_searchHint": "Aloita hakusi CryptDrivessa #-merkillä löytääksesi tunnisteita sisältävät padit.",
"tags_notShared": "Tunnisteitasi ei jaeta muiden käyttäjien kanssa",
"tags_duplicate": "Kaksinkertainen tunniste: {0}",
"tags_noentry": "Et voi lisätä tunnistetta poistettuun padiin!",

1
www/common/translations/messages.fr.json
Unescape Escape View File

@ -148,7 +148,6 @@
"or": "ou",
"tags_title": "Mots-clés du pad (pour vous uniquement)",
"tags_add": "Modifier les mots-clés de la sélection",
"tags_searchHint": "Commencez une recherche par # dans votre CryptDrive pour retrouver vos pads par mot-clé.",
"tags_notShared": "Vos mots-clés ne sont pas partagés avec les autres utilisateurs",
"tags_duplicate": "Mot-clé déjà présent : {0}",
"tags_noentry": "Vous ne pouvez pas ajouter de mots-clés à un pad supprimé !",

1
www/common/translations/messages.it.json
Unescape Escape View File

@ -148,7 +148,6 @@
"or": "o",
"tags_title": "Tag (mostrati solo a te)",
"tags_add": "Aggiorna i tag di questa pagina",
"tags_searchHint": "Inizia una ricerca con # nel tuo CryptDrive per trovare i pad taggati.",
"tags_notShared": "I tuoi tag non sono condivisi con altri utenti",
"tags_duplicate": "Duplica tag: {0}",
"tags_noentry": "Non puoi taggare un pad eliminato!",

1
www/common/translations/messages.json
Unescape Escape View File

@ -151,7 +151,6 @@
"or": "or",
"tags_title": "Tags (for you only)",
"tags_add": "Update the tags for selected pads",
"tags_searchHint": "Start a search with # in your CryptDrive to find your tagged pads.",
"tags_notShared": "Your tags are not shared with other users",
"tags_duplicate": "Duplicate tag: {0}",
"tags_noentry": "You can't tag a deleted pad!",

1
www/common/translations/messages.nb.json
Unescape Escape View File

@ -140,7 +140,6 @@
"or": "eller",
"tags_title": "Tags (kun for ditt bruk)",
"tags_add": "Oppdater tags for denne sida",
"tags_searchHint": "Søk med # i CryptDriven din for å finne pads med slike tags.",
"tags_notShared": "Dine tags deles ikke med andre brukerer",
"tags_duplicate": "Dupliser tag:{0}",
"tags_noentry": "Du kan ikke tagge en sletta pad!",

1
www/common/translations/messages.nl.json
Unescape Escape View File

@ -74,7 +74,6 @@
"tags_noentry": "U kunt een verwijderde werkomgeving niet markeren!",
"tags_duplicate": "Gedupliceerde markering: {0}",
"tags_notShared": "Uw markeringen worden niet gedeeld met andere gebruikers",
"tags_searchHint": "Begin een zoekopdracht met # in uw CryptDrive om gemarkeerde werkomgevingen te vinden.",
"tags_add": "Werk de markeringen van deze pagina bij",
"tags_title": "Markeringen (alleen voor u)",
"or": "of",

1
www/common/translations/messages.pt-br.json
Unescape Escape View File

@ -392,7 +392,6 @@
"or": "",
"tags_title": "",
"tags_add": "",
"tags_searchHint": "",
"tags_notShared": "",
"tags_duplicate": "",
"tags_noentry": "",

1
www/common/translations/messages.ro.json
Unescape Escape View File

@ -382,7 +382,6 @@
"or": "sau",
"tags_title": "Etichete (doar pentru tine)",
"tags_add": "Updatează etichetele acestei pagini",
"tags_searchHint": "Începe o căutare cu # în CryptDrive-ul tău pentru a găsi pad-uri etichetate",
"tags_notShared": "Etichetele tale nu sunt împărțite cu alți utilizatori",
"tags_duplicate": "Duplică eticheta: {0}",
"tags_noentry": "Nu poți eticheta un pad șters",

1
www/common/translations/messages.ru.json
Unescape Escape View File

@ -140,7 +140,6 @@
"or": "или",
"tags_title": "Теги (только для вас)",
"tags_add": "Обновить теги страницы",
"tags_searchHint": "Начните поиск в вашем CryptDrive при помощи # чтобы найти пэды с тегами.",
"tags_notShared": "Ваши теги не разделяются с другими пользователями",
"button_newsheet": "Новый Лист",
"newButtonTitle": "создать новую запись",

1
www/common/translations/messages.sv.json
Unescape Escape View File

@ -38,7 +38,6 @@
"tags_noentry": "Du kan inte tagga ett raderat dokument!",
"tags_duplicate": "Duplicera tagg: {0}",
"tags_notShared": "Dina taggar är inte delade med andra användare",
"tags_searchHint": "Påbörja en sökning med # i din CryptDrive för att hitta dina taggade dokument.",
"tags_add": "Uppdatera taggar för denna sida",
"tags_title": "Taggar (endast för dig)",
"or": "eller",

6
www/support/ui.js
Unescape Escape View File

@ -91,6 +91,7 @@ define([
name: $el.attr('data-name')
});
});
$attachments.html('');
send(ctx, id, 'TICKET', {
category: category,
@ -207,7 +208,8 @@ Messages.support_addAttachment = "Add attachment"; // XXX
$(attachments).append(span);
};
ctx.FM.handleFile(file, ev);
// The empty object allows us to bypass the file upload modal
ctx.FM.handleFile(file, ev, {});
});
});
$input.click();
@ -242,7 +244,7 @@ Messages.support_addAttachment = "Add attachment"; // XXX
var url;
if (ctx.isAdmin) {
ticketCategory = Messages['support_cat_'+(content.category || 'other')] + ' - ';
ticketCategory = Messages['support_cat_'+(content.category || 'all')] + ' - ';
url = h('button.btn.btn-primary.fa.fa-clipboard');
$(url).click(function () {
var link = privateData.origin + privateData.pathname + '#' + 'support-' + content.id;

Write Preview
Loading…
Cancel
Save