Claire
efa93f0b5a
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
285e4f762a
Make trendable_by_default not apply to posts
2022-11-12 10:59:17 +01:00
Claire
33596cc371
Change "Allow trends without prior review' setting to include statuses
...
Port SCSS changes from ecddc06474
2022-11-12 10:59:17 +01:00
Claire
e2179547a6
Revert "Revert "Change "Allow trends without prior review" setting to include statuses ( #17977 )""
...
This reverts commit 4e066c5e1e
2022-11-12 10:17:22 +01:00
Claire
bef72dcabb
Fix styling of advanced options dropdown ( #1916 )
...
Fixes #1914
2022-11-12 09:59:28 +01:00
atsuchan
f39f4f4296
Update Flavour 'ja' Translation ( #1911 )
2022-11-10 17:26:28 +01:00
Claire
713da87a8e
Merge pull request #1910 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-10 13:27:40 +01:00
Eugen Rochko
3b3886e80b
[Glitch] Add option to open original page in dropdowns of remote content in web UI
...
Port 3ff5a02f65
2022-11-10 11:06:56 +01:00
Sasha Sorokin
a0b5700720
[Glitch] Remove aria-pressed where it's redundant
...
Port f3339b4ba9
2022-11-10 10:25:43 +01:00
Eugen Rochko
f3e39d1776
[Glitch] Change larger reblogs/favourites numbers to be shortened in web UI
...
Port 40a2ab1dfe
2022-11-10 10:15:21 +01:00
Effy Elden
fba5b1f83b
[Glitch] Remove unused timeline_container to fix linter errors
...
Port 117a2c290c
2022-11-10 09:54:19 +01:00
Eugen Rochko
4e183e1e4a
[Glitch] Fix confusing wording in interaction modal in web UI
...
Port 802416d2e9
2022-11-10 09:53:06 +01:00
Eugen Rochko
d5875dda34
[Glitch] Fix profile header being cut off in light theme in web UI
...
Port 9f8e8662b9
2022-11-10 09:51:46 +01:00
Claire
09f987bce1
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
117a2c290c
Remove unused timeline_container to fix linter errors ( #20305 )
2022-11-10 08:50:45 +01:00
Eugen Rochko
40a2ab1dfe
Change larger reblogs/favourites numbers to be shortened in web UI ( #20303 )
2022-11-10 08:49:59 +01:00
Eugen Rochko
802416d2e9
Fix confusing wording in interaction modal in web UI ( #20302 )
2022-11-10 08:49:48 +01:00
Eugen Rochko
3ff5a02f65
Add option to open original page in dropdowns of remote content in web UI ( #20299 )
...
Change profile picture click to open profile picture in modal in web UI
2022-11-10 08:49:35 +01:00
Eugen Rochko
9f8e8662b9
Fix profile header being cut off in light theme in web UI ( #20298 )
2022-11-10 07:32:37 +01:00
Eugen Rochko
ea7cc10811
Change link verification to ignore IDN domains ( #20295 )
...
Fix #3833
2022-11-10 06:27:45 +01:00
James Tucker
c4ff2640c1
Improve performance by avoiding regex construction ( #20215 )
...
```ruby
10.times { p /#{FOO}/.object_id }
10.times { p FOO_RE.object_id }
```
2022-11-10 05:49:30 +01:00
Eugen Rochko
17881148e4
Revert filtering public timelines by locale by default ( #20294 )
2022-11-10 05:34:42 +01:00
trwnh
429e77d263
Change master branch to main branch ( #20290 )
2022-11-10 04:02:05 +01:00
Eugen Rochko
04a9359ffc
Fix mailers queue not being used for mailers ( #20274 )
...
Regression since Rails 6.1
2022-11-10 02:31:09 +01:00
Claire
0ac21d1fb8
Fix NameError in Webfinger redirect handling in ActivityPub::FetchRemoteActorService ( #20260 )
2022-11-09 20:10:38 +01:00
Eugen Rochko
9ee302b30f
New Crowdin updates ( #20016 )
...
* New translations en.json (Telugu)
* New translations en.yml (Telugu)
* New translations en.yml (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.yml (Kabyle)
* New translations en.json (Igbo)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Frisian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.yml (Silesian)
* New translations en.json (Silesian)
* New translations en.yml (Taigi)
* New translations en.json (Taigi)
* New translations en.json (Kabyle)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Sanskrit)
* New translations en.json (Sanskrit)
* New translations en.yml (Sardinian)
* New translations en.json (Sardinian)
* New translations en.yml (Corsican)
* New translations en.json (Corsican)
* New translations en.yml (Sorani (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Igbo)
* New translations en.json (Hebrew)
* New translations en.json (Polish)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.json (Latvian)
* New translations en.json (Icelandic)
* New translations en.yml (Swedish)
* New translations en.json (Swedish)
* New translations en.json (Slovenian)
* New translations en.json (Russian)
* New translations en.json (Italian)
* New translations en.json (German)
* New translations en.yml (Hebrew)
* New translations en.yml (Finnish)
* New translations en.json (Finnish)
* New translations en.yml (Danish)
* New translations en.json (Afrikaans)
* New translations en.json (Spanish)
* New translations en.json (French)
* New translations en.json (Dutch)
* New translations simple_form.en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations en.json (Spanish, Argentina)
* New translations activerecord.en.yml (Hebrew)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Occitan)
* New translations en.json (Welsh)
* New translations en.yml (Chinese Traditional)
* New translations en.json (German)
* New translations en.json (Chinese Traditional)
* New translations en.json (Ukrainian)
* New translations en.json (Portuguese)
* New translations en.yml (Hebrew)
* New translations en.json (Finnish)
* New translations en.json (Japanese)
* New translations devise.en.yml (Chinese Traditional)
* New translations en.yml (Thai)
* New translations en.json (Hebrew)
* New translations en.json (Thai)
* New translations en.json (Greek)
* New translations en.yml (Hebrew)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Occitan)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Thai)
* New translations en.json (Catalan)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Polish)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Esperanto)
* New translations en.json (Chinese Simplified)
* New translations en.json (Irish)
* New translations activerecord.en.yml (Irish)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (Danish)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Czech)
* New translations en.json (Turkish)
* New translations en.json (Vietnamese)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations en.json (Bulgarian)
* New translations en.json (Czech)
* New translations en.json (Albanian)
* New translations en.json (Arabic)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Bulgarian)
* New translations en.json (Macedonian)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Bulgarian)
* New translations devise.en.yml (Polish)
* New translations en.json (Bulgarian)
* New translations en.json (Hungarian)
* New translations en.yml (Japanese)
* New translations en.json (Norwegian)
* New translations en.json (Bulgarian)
* New translations en.json (Korean)
* 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 doorkeeper.en.yml (Scottish Gaelic)
* New translations en.json (Bulgarian)
* New translations en.json (German)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Esperanto)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.json (Norwegian)
* New translations en.json (Vietnamese)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.yml (Romanian)
* New translations en.yml (Frisian)
* New translations en.json (Norwegian)
* New translations en.yml (Russian)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.json (Norwegian)
* New translations en.yml (Russian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Norwegian)
* New translations en.json (Swedish)
* New translations en.json (Occitan)
* New translations en.json (Afrikaans)
* New translations en.json (Catalan)
* New translations en.json (Norwegian)
* New translations en.json (Swedish)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Welsh)
* New translations en.yml (Esperanto)
* New translations en.json (Occitan)
* New translations doorkeeper.en.yml (French)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Norwegian)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Chinese Simplified)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (Norwegian)
* New translations activerecord.en.yml (Norwegian)
* New translations devise.en.yml (Norwegian)
* New translations en.json (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Norwegian)
* New translations doorkeeper.en.yml (Norwegian)
* New translations en.json (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Norwegian)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations doorkeeper.en.yml (English, United Kingdom)
* New translations activerecord.en.yml (English, United Kingdom)
* New translations en.json (Dutch)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Irish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations en.json (Bulgarian)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations simple_form.en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations en.json (Bulgarian)
* New translations en.yml (Irish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Galician)
* New translations en.json (Bulgarian)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Igbo)
* New translations en.json (Thai)
* New translations en.json (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.json (Irish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Czech)
* New translations en.json (Esperanto)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Breton)
* New translations en.yml (Breton)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations en.yml (Czech)
* New translations en.json (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.json (Afrikaans)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Esperanto)
* New translations en.json (Breton)
* New translations en.yml (Breton)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Bulgarian)
* New translations en.json (Afrikaans)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* New translations en.json (Occitan)
* Run `yarn manage:translations`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-10 00:43:48 +09:00
Vyr Cossont
75cb668fa9
Add Balaibalan, Láadan, Lingua Franca Nova, Lojban, Toki Pona to language list ( #20168 )
...
* Add Balaibalan, Láadan, Lojban, Toki Pona to language list
Fixes #8995 .
* Correct translated names for Lojban and Toki Pona
* Correct translated name for Balaibalan
* Add Lingua Franca Nova aka Elefen
* Disable unhelpful Rubocop checks
* Re-enable Rubocop checks at end of file
2022-11-09 15:23:52 +01:00
trwnh
96f0997992
Fix GET /api/v1/admin/ip_blocks/:id ( #20207 )
2022-11-09 15:22:58 +01:00
Claire
9a98169232
Change account deletion requests to spread out over time ( #20222 )
2022-11-09 14:08:19 +01:00
Eugen Rochko
3c80a6e445
Fix being able to spoof link verification ( #20217 )
...
- Change verification to happen in `default` queue
- Change verification worker to only be queued if there's something to do
- Add `link` tags from metadata fields to page header of profiles
2022-11-09 08:24:21 +01:00
keiya
4ee9d2381e
Fix nginx location matching ( #20198 )
2022-11-09 04:12:57 +01:00
Claire
070e7f51b4
Fix redirects from /web/ discarding everything after a dot ( #20148 )
...
Fixes #20145
2022-11-09 01:30:33 +01:00
luzpaz
1edd90fe99
Fix typos ( #19849 )
...
Found via `codespell -q 3 -S ./yarn.lock,./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,followings,keypair,medias,pattens,pixelx,rememberable,ro,te`
2022-11-08 17:32:03 +01:00
Christian Clauss
d0763d7acd
CHANGELOG.md: Fix typos ( #19838 )
2022-11-08 17:31:52 +01:00
Sasha Sorokin
f3339b4ba9
Remove aria-pressed where it's redundant ( #19912 )
...
This commit removes aria-pressed attribute from all elements which
contents or other descriptive attributes change in active state,
effectively replacing the meaning of the button, in which case
aria-pressed, an attribute specified whether the button is currently
pressed, would create a confusion. (Spoiler: it's everywhere).
See https://github.com/mastodon/mastodon/issues/13545#issuecomment-1304886969
2022-11-08 17:31:32 +01:00
Claire
417664d1e4
Add server-side route so that legacy /web/statuses/:id URLs keep being supported ( #19978 )
2022-11-08 17:29:14 +01:00
trwnh
260ea7b222
Change Report category to "violation" if rule IDs are provided ( #20137 )
...
* Change Report category to "violation" if rule IDs are provided
* Fix LiteralAsCondition
* Add parentheses to conditional statement
2022-11-08 17:28:02 +01:00
Claire
5f391239e3
Fix nodeinfo metadata attribute being an array instead of an object ( #20114 )
...
Fixes #20111
2022-11-08 17:26:11 +01:00
Alex Nordlund
a6bd6f5b6a
Assign unique set of labels to k8s deployments #19703 ( #19706 )
2022-11-08 17:21:06 +01:00
Sheogorath
bb6f2e952d
chore(chart): Update appVersion in helm chart ( #19653 )
...
This patch updates the helm chart appVersion to the current release and
removes the additional definition in the image tag field, to reduce
duplication.
Since the image will automatically default to the Charts' app version
anyway and this is the more common place to specifiy application
versions for helm charts, this patch switches the prefering this field.
The reason why to use the tag field for the chart itself, seems to be
gone. Since renovatebot is no longer used.
2022-11-08 17:20:34 +01:00
Moritz Hedtke
43284c37ef
helm: Fix ingress pathType ( #19729 )
2022-11-08 17:20:09 +01:00
Alex Nordlund
b02f54b301
Roll pods to pick up db migrations even if podAnnotations is empty ( #19702 )
2022-11-08 17:19:14 +01:00
Alex Nordlund
4e9d05bee8
Fix helm postgresql secret ( #19678 )
...
* Revert "Fix helm chart use of Postgres Password (#19537 )"
This reverts commit 6682f12a9e#19504 )"
This reverts commit d6618048b7#19502 )"
This reverts commit e330a3b107
2022-11-08 17:18:57 +01:00
k.bigwheel (kazufumi nishida)
9b550e1734
Add postgresql password settings hint ( #19112 )
2022-11-08 17:18:22 +01:00
trwnh
821fcfb930
Add sensitized to Admin::Account serializer ( fix #19148 ) ( #20094 )
...
* Add `sensitized` to Admin::Account serializer (fix #19148 )
* remove whitespace, please linter
2022-11-08 17:15:54 +01:00
Claire
f428bf341a
Merge pull request #1905 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-08 16:42:24 +01:00
trwnh
9d3cf4d9d4
Make account endorsements idempotent ( fix #19045 ) ( #20118 )
...
* Make account endorsements idempotent (fix #19045 )
* Accept suggestion to use exists? instead of find_by + nil check
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
* fix logic (unless, not if)
* switch to using `find_or_create_by!`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-11-08 16:39:15 +01:00
trwnh
c8933e9275
Fix missing cast of status and rule IDs to string ( fix #19048 ) ( #20122 )
2022-11-08 16:37:41 +01:00
trwnh
9596a1374d
Fix uncaught 500 error on invalid replies_policy ( Fix #19097 ) ( #20126 )
2022-11-08 16:37:28 +01:00
Claire
18a11da3b5
Change Request connection logic to try both IPv6 and IPv4 when available ( #20108 )
...
Fixes #19751
2022-11-08 16:36:26 +01:00
