mirror of
https://github.com/friendica/friendica
synced 2025-02-19 18:46:48 +00:00
Merge branch 'develop' into new-addonproxy
This commit is contained in:
Art4
commit
9f7774faab
8 changed files with 62 additions and 52 deletions
|
|
@ -1,6 +1,6 @@
|
|||
-- ------------------------------------------
|
||||
-- Friendica 2025.02-dev (Interrupted Fern)
|
||||
-- DB_UPDATE_VERSION 1576
|
||||
-- DB_UPDATE_VERSION 1577
|
||||
-- ------------------------------------------
|
||||
|
||||
|
||||
|
|
@ -1609,7 +1609,7 @@ CREATE TABLE IF NOT EXISTS `post-user` (
|
|||
`psid` int unsigned COMMENT 'ID of the permission set of this post',
|
||||
PRIMARY KEY(`id`),
|
||||
UNIQUE INDEX `uid_uri-id` (`uid`,`uri-id`),
|
||||
INDEX `uri-id` (`uri-id`),
|
||||
INDEX `uri-id_origin_deleted` (`uri-id`,`origin`,`deleted`),
|
||||
INDEX `parent-uri-id` (`parent-uri-id`),
|
||||
INDEX `thr-parent-id` (`thr-parent-id`),
|
||||
INDEX `external-id` (`external-id`),
|
||||
|
|
|
|||
|
|
@ -44,31 +44,31 @@ Fields
|
|||
Indexes
|
||||
------------
|
||||
|
||||
| Name | Fields |
|
||||
| -------------------- | ----------------------- |
|
||||
| PRIMARY | id |
|
||||
| uid_uri-id | UNIQUE, uid, uri-id |
|
||||
| uri-id | uri-id |
|
||||
| parent-uri-id | parent-uri-id |
|
||||
| thr-parent-id | thr-parent-id |
|
||||
| external-id | external-id |
|
||||
| replies-id | replies-id |
|
||||
| owner-id | owner-id |
|
||||
| author-id | author-id |
|
||||
| causer-id | causer-id |
|
||||
| vid | vid |
|
||||
| contact-id | contact-id |
|
||||
| event-id | event-id |
|
||||
| psid | psid |
|
||||
| author-id_uid | author-id, uid |
|
||||
| author-id_created | author-id, created |
|
||||
| owner-id_created | owner-id, created |
|
||||
| parent-uri-id_uid | parent-uri-id, uid |
|
||||
| uid_wall_received | uid, wall, received |
|
||||
| uid_contactid | uid, contact-id |
|
||||
| uid_unseen_contactid | uid, unseen, contact-id |
|
||||
| uid_unseen | uid, unseen |
|
||||
| uid_hidden_uri-id | uid, hidden, uri-id |
|
||||
| Name | Fields |
|
||||
|-----------------------| ----------------------- |
|
||||
| PRIMARY | id |
|
||||
| uid_uri-id | UNIQUE, uid, uri-id |
|
||||
| uri-id_origin_deleted | uri-id, origin, deleted |
|
||||
| parent-uri-id | parent-uri-id |
|
||||
| thr-parent-id | thr-parent-id |
|
||||
| external-id | external-id |
|
||||
| replies-id | replies-id |
|
||||
| owner-id | owner-id |
|
||||
| author-id | author-id |
|
||||
| causer-id | causer-id |
|
||||
| vid | vid |
|
||||
| contact-id | contact-id |
|
||||
| event-id | event-id |
|
||||
| psid | psid |
|
||||
| author-id_uid | author-id, uid |
|
||||
| author-id_created | author-id, created |
|
||||
| owner-id_created | owner-id, created |
|
||||
| parent-uri-id_uid | parent-uri-id, uid |
|
||||
| uid_wall_received | uid, wall, received |
|
||||
| uid_contactid | uid, contact-id |
|
||||
| uid_unseen_contactid | uid, unseen, contact-id |
|
||||
| uid_unseen | uid, unseen |
|
||||
| uid_hidden_uri-id | uid, hidden, uri-id |
|
||||
|
||||
Foreign Keys
|
||||
------------
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ class Conversation
|
|||
'$ispublic' => $this->l10n->t('Visible to <strong>everybody</strong>'),
|
||||
'$linkurl' => $this->l10n->t('Please enter a image/video/audio/webpage URL:'),
|
||||
'$term' => $this->l10n->t('Tag term:'),
|
||||
'$fileas' => $this->l10n->t('Save to Folder:'),
|
||||
'$fileas' => $this->l10n->t('Save to Folder'),
|
||||
'$whereareu' => $this->l10n->t('Where are you right now?'),
|
||||
'$delitems' => $this->l10n->t("Delete item\x28s\x29?"),
|
||||
'$is_mobile' => $this->mode->isMobile(),
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ class SaveTag extends BaseModule
|
|||
|
||||
$tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
|
||||
echo Renderer::replaceMacros($tpl, [
|
||||
'$field' => ['term', $this->t("Save to Folder:"), '', '', $filetags, $this->t('- select -')],
|
||||
'$field' => ['term', $this->t("Folder:"), '', '', $filetags, $this->t('- select -')],
|
||||
'$submit' => $this->t('Save'),
|
||||
]);
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ use Friendica\Database\DBA;
|
|||
|
||||
// This file is required several times during the test in DbaDefinition which justifies this condition
|
||||
if (!defined('DB_UPDATE_VERSION')) {
|
||||
define('DB_UPDATE_VERSION', 1576);
|
||||
define('DB_UPDATE_VERSION', 1577);
|
||||
}
|
||||
|
||||
return [
|
||||
|
|
@ -1604,7 +1604,7 @@ return [
|
|||
"indexes" => [
|
||||
"PRIMARY" => ["id"],
|
||||
"uid_uri-id" => ["UNIQUE", "uid", "uri-id"],
|
||||
"uri-id" => ["uri-id"],
|
||||
"uri-id_origin_deleted" => ["uri-id", "origin", "deleted"],
|
||||
"parent-uri-id" => ["parent-uri-id"],
|
||||
"thr-parent-id" => ["thr-parent-id"],
|
||||
"external-id" => ["external-id"],
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: 2025.02-dev\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-02-04 04:54+0000\n"
|
||||
"POT-Creation-Date: 2025-02-04 13:20-0500\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -1243,8 +1243,8 @@ msgstr ""
|
|||
msgid "Tag term:"
|
||||
msgstr ""
|
||||
|
||||
#: src/Content/Conversation.php:329 src/Module/Filer/SaveTag.php:59
|
||||
msgid "Save to Folder:"
|
||||
#: src/Content/Conversation.php:329
|
||||
msgid "Save to Folder"
|
||||
msgstr ""
|
||||
|
||||
#: src/Content/Conversation.php:330
|
||||
|
|
@ -7024,6 +7024,10 @@ msgstr ""
|
|||
msgid "Item was not removed"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Filer/SaveTag.php:59
|
||||
msgid "Folder:"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Filer/SaveTag.php:59
|
||||
msgid "- select -"
|
||||
msgstr ""
|
||||
|
|
@ -8179,8 +8183,8 @@ msgstr ""
|
|||
msgid "User \"%s\" deleted"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Users/Active.php:156
|
||||
#: src/Module/Moderation/Users/Index.php:167
|
||||
#: src/Module/Moderation/Users/Active.php:157
|
||||
#: src/Module/Moderation/Users/Index.php:168
|
||||
#, php-format
|
||||
msgid "User \"%s\" blocked"
|
||||
msgstr ""
|
||||
|
|
@ -8197,8 +8201,8 @@ msgstr[1] ""
|
|||
msgid "Blocked Users"
|
||||
msgstr ""
|
||||
|
||||
#: src/Module/Moderation/Users/Blocked.php:154
|
||||
#: src/Module/Moderation/Users/Index.php:172
|
||||
#: src/Module/Moderation/Users/Blocked.php:155
|
||||
#: src/Module/Moderation/Users/Index.php:174
|
||||
#, php-format
|
||||
msgid "User \"%s\" unblocked"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -7,5 +7,5 @@
|
|||
|
||||
{{include file="field_combobox.tpl"}}
|
||||
<div class="settings-submit-wrapper">
|
||||
<input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
|
||||
</div>
|
||||
<input id="filer_save" type="button" class="btn btn-primary" value="{{$submit}}" />
|
||||
</div>
|
||||
|
|
@ -296,27 +296,33 @@
|
|||
}
|
||||
|
||||
function itemFiler(id) {
|
||||
const bordercolor = $("input").css("border-color");
|
||||
var modal = $('#modal').modal();
|
||||
|
||||
$.get('filer/', function (data) {
|
||||
$.colorbox({html: data});
|
||||
$("#id_term").keypress(function () {
|
||||
$(this).css("border-color", bordercolor);
|
||||
})
|
||||
$("#select_term").change(function () {
|
||||
$("#id_term").css("border-color", bordercolor);
|
||||
})
|
||||
modal
|
||||
.find('#modal-body')
|
||||
.append(data);
|
||||
|
||||
modal
|
||||
.find('#modal-header h4')
|
||||
.append("{{$fileas}}");
|
||||
|
||||
// Ensure focus after the modal is fully visible
|
||||
modal.on('shown.bs.modal', function () {
|
||||
$('#id_term').trigger('focus');
|
||||
});
|
||||
|
||||
$("#filer_save").click(function (e) {
|
||||
e.preventDefault();
|
||||
const reply = $("#id_term").val();
|
||||
if (reply && reply.length) {
|
||||
const term = $("#id_term").val();
|
||||
if (term && term.length) {
|
||||
commentBusy = true;
|
||||
formModified = true;
|
||||
$('body').css('cursor', 'wait');
|
||||
$.get('filer/' + id + '?term=' + reply)
|
||||
$.get('filer/' + id + '?term=' + term)
|
||||
.done(function () {
|
||||
$.colorbox.close();
|
||||
$('#modal-body').empty();
|
||||
$('#modal').modal('hide');
|
||||
resetFormModifiedFlag();
|
||||
})
|
||||
.always(function () {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue