Cutls
e2315876f4
[Glitch] Do not show drag&drop dialog when not logined
...
Port 553b169d48
2022-11-12 13:59:03 +01:00
Claire
8ac4165c72
[Glitch] Remove “No description added” media warning in edit mode
...
Port 5e796dc6f8
2022-11-12 13:57:41 +01:00
Eugen Rochko
400d168310
[Glitch] Fix domain blocks on about page not working well on small screens in web UI
...
Port 6774c339b2
2022-11-12 13:56:49 +01:00
Connor Shea
d525ae4bdd
[Glitch] Only remove padding when listing applications
...
Port cf4992c918
2022-11-12 13:55:43 +01:00
Yamagishi Kazutoshi
0071582c6d
[Glitch] Delay workbox import
...
Port 53d26cfc1c
2022-11-12 13:55:02 +01:00
Claire
5394ca6807
[Glitch] Fix unnecessary service worker registration and preloading when logged out
...
Port 894ce3726a
2022-11-12 13:54:09 +01:00
Claire
487689f062
[Glitch] Remove preview cards from fav and boost notifications
...
Port 99734ac936
2022-11-12 13:51:30 +01:00
Claire
3fa6c603ba
[Glitch] Fix color of the “No description added“ media upload warning on light theme
...
Port 89a6b76f99
2022-11-12 13:48:42 +01:00
Claire
93912f0498
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/account.rb`:
Conflict because we (glitch-soc) have disabled trending of posts without
review.
Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
Just an extra setting in glitch-soc.
Kept that extra setting.
2022-11-12 13:28:03 +01:00
Claire
d37f426f95
Add back missing glitch-soc admin settings ( #1919 )
...
Fixes #1890
2022-11-12 13:24:53 +01:00
Claire
6a96b17a2d
Add “Glitch-only” label to glitch-specific settings
2022-11-12 11:30:35 +01:00
Claire
c813df2ebb
Merge pull request #1917 from ClearlyClaire/glitch-soc/fixes/not-recommended-label
...
Fix “not recommended” label being shown as “recommended”
2022-11-12 11:10:39 +01:00
Claire
0d43d9926a
Make trendable_by_default not apply to posts
2022-11-12 10:59:17 +01:00
Claire
1ce29aeabf
Change "Allow trends without prior review' setting to include statuses
...
Port SCSS changes from 546672e292
2022-11-12 10:59:17 +01:00
Eugen Rochko
d26c1cb2fe
Fix missing "not recommended" label on "Allow trends without review" ( #20480 )
2022-11-12 10:54:51 +01:00
Claire
fdfacb0ec0
Revert "Revert "Change "Allow trends without prior review" setting to include statuses ( #17977 )""
...
This reverts commit bfc539cfb4
2022-11-12 10:17:22 +01:00
Claire
73b68fcabb
Fix styling of advanced options dropdown ( #1916 )
...
Fixes #1914
2022-11-12 09:59:28 +01:00
Eugen Rochko
e1af21cfd0
New Crowdin updates ( #20258 )
...
* New translations en.json (Asturian)
* New translations en.yml (Telugu)
* New translations en.yml (Tamil)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.json (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Asturian)
* New translations en.json (Occitan)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Sinhala)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Sanskrit)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Croatian)
* New translations activerecord.en.yml (Icelandic)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Slovak)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Georgian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Czech)
* 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 (Armenian)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations activerecord.en.yml (Irish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Sardinian)
* New translations activerecord.en.yml (Indonesian)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Persian)
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Tatar)
* New translations activerecord.en.yml (Corsican)
* New translations en.yml (Burmese)
* New translations en.yml (Igbo)
* New translations activerecord.en.yml (Malayalam)
* New translations activerecord.en.yml (Sinhala)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Welsh)
* New translations activerecord.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.json (Hungarian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Slovenian)
* New translations en.json (Swedish)
* New translations en.json (Chinese Simplified)
* New translations en.json (Vietnamese)
* New translations en.json (Icelandic)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Korean)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Romanian)
* New translations en.json (Catalan)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Norwegian)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Latvian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Arabic)
* New translations en.json (Catalan)
* New translations en.yml (Korean)
* New translations en.json (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Thai)
* New translations en.json (Bulgarian)
* New translations en.yml (Ukrainian)
* New translations en.json (Indonesian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (German)
* New translations en.json (Portuguese)
* New translations en.json (Spanish)
* New translations en.json (Danish)
* New translations en.json (Ukrainian)
* New translations en.json (Tamil)
* New translations en.json (Chinese Traditional)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations en.json (Norwegian)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Korean)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Basque)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Occitan)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (Czech)
* New translations en.json (German)
* New translations en.json (Czech)
* New translations en.json (French)
* New translations en.yml (Hebrew)
* New translations en.json (Norwegian)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations en.json (Ukrainian)
* New translations en.json (Romanian)
* New translations en.json (Russian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Chinese Traditional)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-12 15:56:25 +09:00
Bearice Ren
28cda42af5
fixes ArgumentError when proxy is used ( #20420 )
...
* fixes ArgumentError when proxy is used
* Update app/lib/request.rb
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2022-11-11 21:31:03 +01:00
Jeong Arm
c4c1bee880
Fix trendable status without review ( #20214 )
2022-11-11 21:24:10 +01:00
Claire
93a6ebc83d
Fix WebUI crash when listing server blocks and rationale is not available ( #20408 )
...
Regression from #20391
Fixes #20405
2022-11-11 21:23:03 +01:00
Emily Strickland
96f51e593f
Guard against error extracting body from URL ( #20428 )
...
If `Nokogiri::HTML(value).at_xpath('//body')` fails to find the `body` element, it will return `nil`. We can guard against that with an early return. Avoids calling `children` on `Nilclass` in those cases.
2022-11-11 21:22:28 +01:00
Claire
31005aad12
Add the ability to edit media attachment metadata for any unattached media ( #20402 )
2022-11-11 21:22:17 +01:00
Cutls
553b169d48
Do not show drag&drop dialog when not logined ( #20400 )
...
* Cannot upload until login
* and do not fire upload
* change username props to context
2022-11-11 21:19:48 +01:00
Claire
5e796dc6f8
Remove “No description added” media warning in edit mode ( #20393 )
...
Editing media metadata is not currently possible in edit mode, the button would
open the modal but saving the changes would error out.
2022-11-11 09:20:24 +01:00
Eugen Rochko
9bc0a6c861
Fix metadata scrubbing removing color profile from images ( #20389 )
2022-11-11 09:20:10 +01:00
Eugen Rochko
53028af10e
Bump version to 4.0.0rc3 ( #20378 )
2022-11-11 08:39:38 +01:00
Eugen Rochko
6774c339b2
Fix domain blocks on about page not working well on small screens in web UI ( #20391 )
2022-11-11 08:26:58 +01:00
Connor Shea
cf4992c918
Only remove padding when listing applications ( #20382 )
...
This prevents styling issues on the Authorization page.
2022-11-11 02:55:20 +01:00
Yamagishi Kazutoshi
53d26cfc1c
Delay workbox import ( #20376 )
2022-11-11 01:33:59 +01:00
Claire
86f6631d28
Remove dead code and refactor status threading code ( #20357 )
...
* Remove dead code
* Remove unneeded/broken parameters and refactor descendant computation
2022-11-10 22:30:00 +01:00
F
a02a453a40
Add Scots to the supported locales ( #20283 )
...
Fixes #20249
2022-11-10 21:11:38 +01:00
Eugen Rochko
c6c7c6223d
Change verification to only work for https links ( #20304 )
...
Fix #20242
2022-11-10 21:09:03 +01:00
Claire
1615c3eb6e
Change logged out /api/v1/statuses/:id/context logged out limits ( #20355 )
2022-11-10 21:06:08 +01:00
Claire
894ce3726a
Fix unnecessary service worker registration and preloading when logged out ( #20341 )
2022-11-10 20:26:04 +01:00
Claire
8e1e7fe2e0
Add old logo files back ( #20332 )
...
Fixes #20221
2022-11-10 20:25:12 +01:00
Claire
99734ac936
Remove preview cards from fav and boost notifications ( #20335 )
...
Fixes #20329
2022-11-10 19:36:12 +01:00
atsuchan
6df9d388e7
Update Flavour 'ja' Translation ( #1911 )
2022-11-10 17:26:28 +01:00
Eugen Rochko
f8e8e622e5
Change incoming activity processing to happen in ingress queue ( #20264 )
2022-11-10 14:21:51 +01:00
Claire
89a6b76f99
Fix color of the “No description added“ media upload warning on light theme ( #20328 )
2022-11-10 14:21:31 +01:00
Eugen Rochko
c4d2c72924
[Glitch] Add option to open original page in dropdowns of remote content in web UI
...
Port ef582dc4f2
2022-11-10 11:06:56 +01:00
Sasha Sorokin
099b3011aa
[Glitch] Remove aria-pressed where it's redundant
...
Port d055d75172
2022-11-10 10:25:43 +01:00
Eugen Rochko
65b6c4f6df
[Glitch] Change larger reblogs/favourites numbers to be shortened in web UI
...
Port 7bdb2433f1
2022-11-10 10:15:21 +01:00
Effy Elden
c722c4cce8
[Glitch] Remove unused timeline_container to fix linter errors
...
Port 8fdbb4d00d
2022-11-10 09:54:19 +01:00
Eugen Rochko
41ea39903d
[Glitch] Fix confusing wording in interaction modal in web UI
...
Port 16122761c5
2022-11-10 09:53:06 +01:00
Eugen Rochko
d3a29a136c
[Glitch] Fix profile header being cut off in light theme in web UI
...
Port e37e8deb0f
2022-11-10 09:51:46 +01:00
Claire
c118918520
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/custom_emoji.rb`:
Not a real conflict, just upstream changing a line too close to
a glitch-soc-specific validation.
Applied upstream changes.
- `app/models/public_feed.rb`:
Not a real conflict, just upstream changing a line too close to
a glitch-soc-specific parameter documentation.
Applied upstream changes.
2022-11-10 09:36:47 +01:00
Effy Elden
8fdbb4d00d
Remove unused timeline_container to fix linter errors ( #20305 )
2022-11-10 08:50:45 +01:00
Eugen Rochko
7bdb2433f1
Change larger reblogs/favourites numbers to be shortened in web UI ( #20303 )
2022-11-10 08:49:59 +01:00
Eugen Rochko
16122761c5
Fix confusing wording in interaction modal in web UI ( #20302 )
2022-11-10 08:49:48 +01:00
