Claire
ee7e49d1b1
Merge pull request #1910 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-10 13:27:40 +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
Eugen Rochko
ef582dc4f2
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
e37e8deb0f
Fix profile header being cut off in light theme in web UI ( #20298 )
2022-11-10 07:32:37 +01:00
Eugen Rochko
9965a23b04
Change link verification to ignore IDN domains ( #20295 )
...
Fix #3833
2022-11-10 06:27:45 +01:00
James Tucker
78a6b871fe
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
0cd0786aef
Revert filtering public timelines by locale by default ( #20294 )
2022-11-10 05:34:42 +01:00
trwnh
b280a255c4
Change master branch to main branch ( #20290 )
2022-11-10 04:02:05 +01:00
Eugen Rochko
45ce858fd9
Fix mailers queue not being used for mailers ( #20274 )
...
Regression since Rails 6.1
2022-11-10 02:31:09 +01:00
Claire
a5394980f2
Fix NameError in Webfinger redirect handling in ActivityPub::FetchRemoteActorService ( #20260 )
2022-11-09 20:10:38 +01:00
Eugen Rochko
cd0a87f170
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
104157bd01
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
029b5cd5b1
Fix GET /api/v1/admin/ip_blocks/:id ( #20207 )
2022-11-09 15:22:58 +01:00
Claire
5333447be0
Change account deletion requests to spread out over time ( #20222 )
2022-11-09 14:08:19 +01:00
Eugen Rochko
e98833748e
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
53817294fc
Fix nginx location matching ( #20198 )
2022-11-09 04:12:57 +01:00
Claire
dd7176a4b5
Fix redirects from /web/ discarding everything after a dot ( #20148 )
...
Fixes #20145
2022-11-09 01:30:33 +01:00
luzpaz
6ba52306f9
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
6f1559ed0f
CHANGELOG.md: Fix typos ( #19838 )
2022-11-08 17:31:52 +01:00
Sasha Sorokin
d055d75172
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
d70303bba6
Add server-side route so that legacy /web/statuses/:id URLs keep being supported ( #19978 )
2022-11-08 17:29:14 +01:00
trwnh
b1a48e05b6
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
c476dfc725
Fix nodeinfo metadata attribute being an array instead of an object ( #20114 )
...
Fixes #20111
2022-11-08 17:26:11 +01:00
Alex Nordlund
476e74b4c4
Assign unique set of labels to k8s deployments #19703 ( #19706 )
2022-11-08 17:21:06 +01:00
Sheogorath
f4b78028a3
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
f7613febb3
helm: Fix ingress pathType ( #19729 )
2022-11-08 17:20:09 +01:00
Alex Nordlund
fd3c482104
Roll pods to pick up db migrations even if podAnnotations is empty ( #19702 )
2022-11-08 17:19:14 +01:00
Alex Nordlund
d3afd7a2f1
Fix helm postgresql secret ( #19678 )
...
* Revert "Fix helm chart use of Postgres Password (#19537 )"
This reverts commit 6094a916b1#19504 )"
This reverts commit dae954ef11#19502 )"
This reverts commit 9bf6a8af82
2022-11-08 17:18:57 +01:00
k.bigwheel (kazufumi nishida)
9358fd295d
Add postgresql password settings hint ( #19112 )
2022-11-08 17:18:22 +01:00
trwnh
c374729225
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
b2a25d446a
Merge pull request #1905 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-08 16:42:24 +01:00
trwnh
89e1974f30
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
455a754081
Fix missing cast of status and rule IDs to string ( fix #19048 ) ( #20122 )
2022-11-08 16:37:41 +01:00
trwnh
68d9dcd425
Fix uncaught 500 error on invalid replies_policy ( Fix #19097 ) ( #20126 )
2022-11-08 16:37:28 +01:00
Claire
c989faaa62
Change Request connection logic to try both IPv6 and IPv4 when available ( #20108 )
...
Fixes #19751
2022-11-08 16:36:26 +01:00
Roni Laukkarinen
36b0ff57b7
Fix grammar ( #20106 )
2022-11-08 16:35:42 +01:00
Claire
9b6d6a919f
[Glitch] Fix redrafting a currently-editing post not leaving edit mode
...
Port 782b6835f7
2022-11-08 16:26:25 +01:00
Claire
fe1b694128
[Glitch] Fix opening the language picker scrolling the single-column view to the top
...
Port 608343c135
2022-11-08 15:49:09 +01:00
Zach Flanders
6eac1cfccd
[Glitch] Fix spoiler buttons css not rendering correct color in light theme
...
Port 0beb095a4b
2022-11-08 15:47:48 +01:00
Claire
a8c854b3ea
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-08 15:44:57 +01:00
Claire
782b6835f7
Fix redrafting a currently-editing post not leaving edit mode ( #20023 )
2022-11-08 04:06:54 +01:00
