Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-29 12:09:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'the-djmaze:master' into master

Browse source
This commit is contained in:
cm-schl 2023-03-21 09:20:15 +01:00 • committed by GitHub
commit c2b7ddc76b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 135 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/nextcloud/index.php
View file

@ -4,8 +4,8 @@ class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
{
const
NAME = 'Nextcloud',
VERSION = '2.20',
RELEASE = '2023-02-22',
VERSION = '2.21',
RELEASE = '2023-03-18',
CATEGORY = 'Integrations',
DESCRIPTION = 'Integrate with Nextcloud v20+',
REQUIRED = '2.25.1';

3
plugins/nextcloud/langs/en.ini
View file

@ -6,3 +6,6 @@ SELECT_FOLDER = "Select folder"
SELECT_FILES = "Select file(s)"
ATTACH_FILES = "Attach Nextcloud files"
SELECT_CALENDAR = "Select calendar"
FILE_ATTACH = "attach"
FILE_INTERNAL = "internal"
FILE_PUBLIC = "public"

3
plugins/nextcloud/langs/zh-CN.ini
View file

@ -6,3 +6,6 @@ SELECT_FOLDER = "选择文件夹"
SELECT_FILES = "选择文件"
ATTACH_FILES = "添加 Nextcloud 文件"
SELECT_CALENDAR = "选择日历"
FILE_ATTACH = "attach"
FILE_INTERNAL = "internal"
FILE_PUBLIC = "public"

6
plugins/nextcloud/templates/PopupsNextcloudFiles.html
View file

@ -12,7 +12,7 @@
<ul id="sm-nc-files-tree"></ul>
</div>
<footer data-bind="visible:files">
<button data-bind="click:attach" name="select" data-icon="📎" class="button-vue">attach</button>
<button data-bind="click:shareInternal" name="share-internal" data-icon="🔗" class="button-vue">internal</button>
<button data-bind="click:sharePublic" name="share-public" data-icon="🔗" class="button-vue">public</button>
<button data-bind="click:attach" name="select" data-icon="📎" class="button-vue" data-i18n="NEXTCLOUD/FILE_ATTACH">attach</button>
<button data-bind="click:shareInternal" name="share-internal" data-icon="🔗" class="button-vue" data-i18n="NEXTCLOUD/FILE_INTERNAL">internal</button>
<button data-bind="click:sharePublic" name="share-public" data-icon="🔗" class="button-vue" data-i18n="NEXTCLOUD/FILE_PUBLIC">public</button>
</footer>

2
plugins/two-factor-auth/templates/TwoFactorAuthSettings.html
View file

@ -47,7 +47,7 @@
<blockquote>
<p class="muted width100-on-mobile" style="width: 550px" data-i18n="PLUGIN_2FA/TWO_FACTOR_SECRET_DESC"></p>
</blockquote>
<pre data-bind="text: viewQRCode" style="line-height:1;letter-spacing:-1px;font-family:monospace"></pre>
<pre data-bind="text: viewQRCode" style="line-height:1.1;letter-spacing:-1px;font-family:monospace"></pre>
</div>
</div>
<div class="control-group" data-bind="visible: '' !== viewBackupCodes()">