Yurii Izorkin
|
87b5ede13a
|
nginx: optimize locations (#19438)
* nginx: optimize locations
* nginx: don't use regex in locations
* nginx: optimize Cache-Control headaers
* nginx: use 404 error_page for missing static files
* nginx: sort locations
* nginx: add missing HSTS header
|
2022-10-29 15:06:23 +02:00 |
|
Eugen Rochko
|
57d54172f4
|
Fix wrong host being used for custom.css when asset host configured (#19521)
|
2022-10-29 14:04:24 +02:00 |
|
Matthias Bethke
|
150f5b0e6c
|
fix name of Lao language (#19520)
It said ພາສາ or pha-sa, which means just "language" in Lao. "ພາສາລາວ",
pha-sa lao, is the full name but the short "ລາວ" is commonly used.
|
2022-10-29 13:34:56 +02:00 |
|
Eugen Rochko
|
973d496b86
|
Fix logged out search and changed logged-in search placeholder (#19514)
|
2022-10-29 13:32:49 +02:00 |
|
Eugen Rochko
|
6ad2304088
|
New Crowdin updates (#19425)
* New translations en.yml (Occitan)
* New translations doorkeeper.en.yml (Armenian)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Greek)
* New translations doorkeeper.en.yml (Frisian)
* New translations doorkeeper.en.yml (Basque)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Catalan)
* New translations doorkeeper.en.yml (Japanese)
* New translations doorkeeper.en.yml (Georgian)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Dutch)
* New translations doorkeeper.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Polish)
* New translations doorkeeper.en.yml (Portuguese)
* New translations doorkeeper.en.yml (Czech)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (French)
* New translations doorkeeper.en.yml (Spanish)
* New translations doorkeeper.en.yml (Afrikaans)
* New translations doorkeeper.en.yml (Russian)
* New translations doorkeeper.en.yml (Slovak)
* New translations doorkeeper.en.yml (Breton)
* New translations doorkeeper.en.yml (Welsh)
* New translations doorkeeper.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Tatar)
* New translations doorkeeper.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Asturian)
* New translations doorkeeper.en.yml (Occitan)
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Corsican)
* New translations doorkeeper.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Hindi)
* New translations doorkeeper.en.yml (Estonian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Albanian)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Turkish)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Galician)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Kazakh)
* New translations doorkeeper.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Persian)
* New translations doorkeeper.en.yml (Tamil)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations doorkeeper.en.yml (Marathi)
* New translations doorkeeper.en.yml (Thai)
* New translations doorkeeper.en.yml (Croatian)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Czech)
* New translations en.json (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Hungarian)
* New translations en.yml (Polish)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.yml (Polish)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Icelandic)
* New translations en.yml (Icelandic)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Icelandic)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations en.yml (Vietnamese)
* New translations en.yml (Finnish)
* New translations en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Turkish)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Turkish)
* New translations en.json (Dutch)
* New translations en.yml (Catalan)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Scottish Gaelic)
* New translations en.yml (Greek)
* New translations en.yml (Italian)
* New translations en.yml (Dutch)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Dutch)
* New translations en.yml (Slovenian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Galician)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.json (French)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Spanish)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Breton)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations en.yml (German)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations en.yml (German)
* New translations activerecord.en.yml (Turkish)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Slovak)
* New translations activerecord.en.yml (Slovenian)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Indonesian)
* New translations activerecord.en.yml (Persian)
* New translations activerecord.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Romanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (Danish)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations activerecord.en.yml (Armenian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Georgian)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Corsican)
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Sinhala)
* New translations activerecord.en.yml (Malayalam)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Tatar)
* New translations activerecord.en.yml (Welsh)
* New translations activerecord.en.yml (Esperanto)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Icelandic)
* New translations activerecord.en.yml (Chinese Traditional)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations activerecord.en.yml (Korean)
* New translations activerecord.en.yml (Portuguese)
* New translations en.yml (Korean)
* New translations en.json (Galician)
* New translations en.yml (Galician)
* New translations activerecord.en.yml (Galician)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
2022-10-29 14:35:49 +09:00 |
|
Eugen Rochko
|
6099eecf57
|
Fix account migration form ever using outdated account data (#18429)
|
2022-10-29 01:31:45 +02:00 |
|
Eugen Rochko
|
92a6d04ba6
|
Fix error when uploading malformed CSV import (#19509)
|
2022-10-28 23:30:44 +02:00 |
|
Claire
|
1686374b2f
|
Fix domain block export not exporting blocks with only media rejection
|
2022-10-28 20:14:25 +02:00 |
|
Claire
|
ba03c25249
|
Revert Home controller test to upstream
|
2022-10-28 20:12:04 +02:00 |
|
Eugen Rochko
|
1a71d95760
|
[Glitch] Fix closed registrations message not appearing in web UI
Port 528f96e769 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:49:45 +02:00 |
|
Eugen Rochko
|
96e921ff5e
|
[Glitch] Fix number of uses being shown again on trending hashtags in web UI
Port c7f1ae40b5 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:49:45 +02:00 |
|
Claire
|
b1875bdb6f
|
[Glitch] Change admin announcement edition interface to use datetime-local
Port 9cb523d3be to glitch-soc
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:49:45 +02:00 |
|
Robert Laurenz
|
c7f3efb312
|
[Glitch] fix(component): adjust style of counter button to fix overflow issue
Port 21aa2217de to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:49:45 +02:00 |
|
Claire
|
d192bdf6f6
|
Merge branch 'main' into glitch-soc/merge-upstream
|
2022-10-28 19:49:42 +02:00 |
|
Eugen Rochko
|
528f96e769
|
Fix closed registrations message not appearing in web UI (#19508)
Regression from #19486
|
2022-10-28 19:34:22 +02:00 |
|
Claire
|
9e071d5c78
|
Remove local settings items that make no sense anymore
|
2022-10-28 19:30:51 +02:00 |
|
Claire
|
f1d9278d0a
|
[Glitch] Remove navigation links to /explore when trends are disabled
Port 4a6fb0ea2a to glithc-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:26:28 +02:00 |
|
Eugen Rochko
|
97e7443443
|
[Glitch] Fix redirecting to /publish when compose form is visible in web UI
Port 2e0f4c286f to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:26:28 +02:00 |
|
Eugen Rochko
|
7d3b787d05
|
[Glitch] Change settings area to be separated into categories in admin UI
Port 2130895196 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
2caae26da9
|
[Glitch] Fix media, following and followers tabs in web UI
Port 14b27b92e2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
6ecd6364be
|
[Glitch] Fix too many featured tags causing navigation panel scroll in web UI
Port a51d8075b6 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
e06a095eb4
|
[Glitch] Change featured hashtags to be displayed in navigation panel
Port 6ab724918b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
ad94457784
|
[Glitch] Remove volume number from hashtags in web UI
Port 93ef719ce2 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Takeshi Umeda
|
87d3b61bb6
|
[Glitch] Add featured tags selector for WebUI
Port 3e88e7ba20 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
ccdf8b587f
|
[Glitch] Fix nofollow rel being removed in web UI
Port b01fad5dbd to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
3c8f8ed8e3
|
[Glitch] Change floating action button to be a button in header in web UI
Port 370f2609b8 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Claire
|
535bd4712c
|
[Glitch] Add closed registrations modal
Port d94b1c682a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
62ab234587
|
[Glitch] Fix notifications about deleted reports not being also deleted
Port 35b5120c5d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
358012fefd
|
[Glitch] Fix missing delete and redraft link in web UI
Port 4b0d58f0ad to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
60bd9718cf
|
[Glitch] Change post editing to be enabled in web UI
Port 85fc370638 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
76e6e35a52
|
[Glitch] Add ability to view previous edits of a status in admin UI
Port 3e5588bf70 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Claire
|
5cf02124ed
|
[Glitch] Fix WebUI notification settings for new user and new report notifications
Port 0e682bbe24 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
354ebf9483
|
[Glitch] Fix language dropdown causing zoom on mobile devices in web UI
Port aa2d04e53e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
a27d108cea
|
[Glitch] Add error boundary around routes in web UI
Port daaa66a2c2 to glitch-soc
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
7ed4c4db9e
|
[Glitch] Fix reply not opening compose page on certain screen sizes in web UI
Port 01980c975b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
f3c3f1f244
|
[Glitch] Fix error when rendering limited account in web UI
Port a041d3cb27 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Claire
|
e90ba7df8f
|
[Glitch] Change landing page to be /about instead of /explore when trends are disabled
Port f272594be6 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
a916c471d1
|
[Glitch] Fix case-sensitive look-up for profiles in web UI
Port e700e95246 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
1f9f465931
|
[Glitch] Fix error on profile in web UI
Port 8e0daf2214 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
prplecake
|
8a6d6ae4fc
|
[Glitch] Don't use "unfollow language" when cancelling follow requests
Port 2690a13d0e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Claire
|
37879eb72e
|
fixup! [Glitch] Fix logged-out web UI on smaller screens
|
2022-10-28 19:24:02 +02:00 |
|
Claire
|
3462b81094
|
fixup! [Glitch] Change public accounts pages to mount the web UI
|
2022-10-28 19:24:02 +02:00 |
|
Claire
|
3e360ed0b4
|
fixup! [Glitch] Fix intermediary responsive layout, accessibility on navigation in web UI
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
104af53947
|
[Glitch] Change public accounts pages to mount the web UI
Port 0fdfbe555e to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
b8c9d74210
|
[Glitch] Fix missing rules in report modal in web UI
Port 0b84d15288 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
ca506459b7
|
[Glitch] Fix error while server rules are loading in report modal in web UI
Port 3e88e7ba20 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Yamagishi Kazutoshi
|
32716cf0d3
|
[Glitch] Fix missing isCancel
Port 14bae3580b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Yamagishi Kazutoshi
|
935359fcc7
|
[Glitch] Replace CancelToken to AbortSignal
Port 4266397139 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Eugen Rochko
|
5f44aae001
|
[Glitch] Change about page to be mounted in the web UI
Port e376f33207 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|
Yamagishi Kazutoshi
|
9e32bcc0d8
|
[Glitch] Redirect non-logged-in user to owner statuses on single user mode
Port f84bee7d78 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
2022-10-28 19:24:02 +02:00 |
|