Skip to content

Commit

Permalink
Merge branch 'glitch-soc-main' into mastodon.galileivr.org
Browse files Browse the repository at this point in the history
  • Loading branch information
ciao1092 committed Mar 5, 2024
2 parents 8739cab + 6fe1a35 commit 847a6ed
Show file tree
Hide file tree
Showing 124 changed files with 900 additions and 486 deletions.
11 changes: 11 additions & 0 deletions .github/codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
comment: false # Do not leave PR comments
coverage:
status:
project:
default:
# Github status check is not blocking
informational: true
patch:
default:
# Github status check is not blocking
informational: true
20 changes: 10 additions & 10 deletions app/javascript/core/admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Rails.delegate(
},
);

const onDomainBlockSeverityChange = (target: HTMLInputElement) => {
const onDomainBlockSeverityChange = (target: HTMLSelectElement) => {
const rejectMediaDiv = document.querySelector(
'.input.with_label.domain_block_reject_media',
);
Expand All @@ -170,7 +170,7 @@ const onDomainBlockSeverityChange = (target: HTMLInputElement) => {
};

Rails.delegate(document, '#domain_block_severity', 'change', ({ target }) => {
if (target instanceof HTMLInputElement) onDomainBlockSeverityChange(target);
if (target instanceof HTMLSelectElement) onDomainBlockSeverityChange(target);
});

const onEnableBootstrapTimelineAccountsChange = (target: HTMLInputElement) => {
Expand Down Expand Up @@ -207,7 +207,7 @@ Rails.delegate(
},
);

const onChangeRegistrationMode = (target: HTMLInputElement) => {
const onChangeRegistrationMode = (target: HTMLSelectElement) => {
const enabled = target.value === 'approved';

document
Expand Down Expand Up @@ -257,16 +257,16 @@ Rails.delegate(
'#form_admin_settings_registrations_mode',
'change',
({ target }) => {
if (target instanceof HTMLInputElement) onChangeRegistrationMode(target);
if (target instanceof HTMLSelectElement) onChangeRegistrationMode(target);
},
);

ready(() => {
const domainBlockSeverityInput = document.querySelector<HTMLInputElement>(
'input#domain_block_severity',
const domainBlockSeveritySelect = document.querySelector<HTMLSelectElement>(
'select#domain_block_severity',
);
if (domainBlockSeverityInput)
onDomainBlockSeverityChange(domainBlockSeverityInput);
if (domainBlockSeveritySelect)
onDomainBlockSeverityChange(domainBlockSeveritySelect);

const enableBootstrapTimelineAccounts =
document.querySelector<HTMLInputElement>(
Expand All @@ -275,8 +275,8 @@ ready(() => {
if (enableBootstrapTimelineAccounts)
onEnableBootstrapTimelineAccountsChange(enableBootstrapTimelineAccounts);

const registrationMode = document.querySelector<HTMLInputElement>(
'input#form_admin_settings_registrations_mode',
const registrationMode = document.querySelector<HTMLSelectElement>(
'select#form_admin_settings_registrations_mode',
);
if (registrationMode) onChangeRegistrationMode(registrationMode);

Expand Down
1 change: 1 addition & 0 deletions app/javascript/flavours/glitch/locales/es-AR.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"column_subheading.lists": "Listas",
"column_subheading.navigation": "Navegación",
"community.column_settings.allow_local_only": "Mostrar sólo toots locales",
"compose.attach.doodle": "Dibujá algo",
"compose.change_federation": "Cambiar configuración de la federación",
"compose.content-type.change": "Cambiar opciones avanzadas de formato",
"compose.content-type.html": "HTML",
Expand Down
1 change: 1 addition & 0 deletions app/javascript/flavours/glitch/locales/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"column_subheading.lists": "列表",
"column_subheading.navigation": "导航",
"community.column_settings.allow_local_only": "只显示仅本站可见的嘟文",
"compose.attach.doodle": "涂鸦",
"compose.change_federation": "更改联动设置",
"compose.content-type.change": "更改高级格式选项",
"compose.content-type.html": "HTML",
Expand Down
1 change: 1 addition & 0 deletions app/javascript/flavours/glitch/locales/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"column_subheading.lists": "列表",
"column_subheading.navigation": "導覽",
"community.column_settings.allow_local_only": "顯示僅限本地的貼文",
"compose.attach.doodle": "塗鴉",
"compose.change_federation": "變更聯邦設定",
"compose.content-type.change": "變更進階格式設定",
"compose.content-type.html": "HTML",
Expand Down
21 changes: 21 additions & 0 deletions app/javascript/images/mailer-new/heading/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020-2024 Paweł Kuna

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions app/javascript/images/mailer-new/heading/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Images in this folder are based on [Tabler.io icons](https://tabler.io/icons).
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions app/javascript/images/mailer-new/welcome-icons/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2020-2024 Paweł Kuna

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions app/javascript/images/mailer-new/welcome-icons/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Images in this folder are based on [Tabler.io icons](https://tabler.io/icons).
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 847a6ed

Please sign in to comment.