about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2022-11-10Merge remote-tracking branch 'glitch/main'Starfall
- Remove Helm charts - Lots of conflicts with our removal of recommended settings and custom icons
2022-11-10Merge pull request #1910 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-11-10[Glitch] Add option to open original page in dropdowns of remote content in ↵Eugen Rochko
web UI Port ef582dc4f2fe53b08988faf8d51f567ac32e5b93 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10[Glitch] Remove aria-pressed where it's redundantSasha Sorokin
Port d055d751720b7494ba990a43434b73e17596b5e8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10[Glitch] Change larger reblogs/favourites numbers to be shortened in web UIEugen Rochko
Port 7bdb2433f1a6e0b6a5e4df068003ac6e2e296048 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10[Glitch] Remove unused timeline_container to fix linter errorsEffy Elden
Port 8fdbb4d00d371e7a900bec3a262216d95a784d52 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10[Glitch] Fix confusing wording in interaction modal in web UIEugen Rochko
Port 16122761c5eca0f25f17968a208a24ddd99e073e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10[Glitch] Fix profile header being cut off in light theme in web UIEugen Rochko
Port e37e8deb0ff207d36bb359ce395e2888dacc216d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
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-10Remove unused timeline_container to fix linter errors (#20305)Effy Elden
2022-11-10Change larger reblogs/favourites numbers to be shortened in web UI (#20303)Eugen Rochko
2022-11-10Fix confusing wording in interaction modal in web UI (#20302)Eugen Rochko
2022-11-10Add option to open original page in dropdowns of remote content in web UI ↵Eugen Rochko
(#20299) Change profile picture click to open profile picture in modal in web UI
2022-11-10Fix profile header being cut off in light theme in web UI (#20298)Eugen Rochko
2022-11-10Change link verification to ignore IDN domains (#20295)Eugen Rochko
Fix #3833
2022-11-10Improve performance by avoiding regex construction (#20215)James Tucker
```ruby 10.times { p /#{FOO}/.object_id } 10.times { p FOO_RE.object_id } ```
2022-11-10Revert filtering public timelines by locale by default (#20294)Eugen Rochko
2022-11-10Change `master` branch to `main` branch (#20290)trwnh
2022-11-10Fix `mailers` queue not being used for mailers (#20274)Eugen Rochko
Regression since Rails 6.1
2022-11-09Fix NameError in Webfinger redirect handling in ↵Claire
ActivityPub::FetchRemoteActorService (#20260)
2022-11-10New Crowdin updates (#20016)Eugen Rochko
* 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-09Add Balaibalan, Láadan, Lingua Franca Nova, Lojban, Toki Pona to language ↵Vyr Cossont
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-09Fix GET /api/v1/admin/ip_blocks/:id (#20207)trwnh
2022-11-09Change account deletion requests to spread out over time (#20222)Claire
2022-11-09Fix being able to spoof link verification (#20217)Eugen Rochko
- 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-09Fix nginx location matching (#20198)keiya
2022-11-09Fix redirects from /web/ discarding everything after a dot (#20148)Claire
Fixes #20145
2022-11-08Fix typos (#19849)luzpaz
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-08CHANGELOG.md: Fix typos (#19838)Christian Clauss
2022-11-08Remove aria-pressed where it's redundant (#19912)Sasha Sorokin
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-08Add server-side route so that legacy /web/statuses/:id URLs keep being ↵Claire
supported (#19978)
2022-11-08Change Report category to "violation" if rule IDs are provided (#20137)trwnh
* Change Report category to "violation" if rule IDs are provided * Fix LiteralAsCondition * Add parentheses to conditional statement
2022-11-08Fix nodeinfo metadata attribute being an array instead of an object (#20114)Claire
Fixes #20111
2022-11-08Assign unique set of labels to k8s deployments #19703 (#19706)Alex Nordlund
2022-11-08chore(chart): Update appVersion in helm chart (#19653)Sheogorath
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-08helm: Fix ingress pathType (#19729)Moritz Hedtke
2022-11-08Roll pods to pick up db migrations even if podAnnotations is empty (#19702)Alex Nordlund
2022-11-08Fix helm postgresql secret (#19678)Alex Nordlund
* Revert "Fix helm chart use of Postgres Password (#19537)" This reverts commit 6094a916b185ae0634e016004deb4cec11afbaca. * Revert "Fix PostgreSQL password reference for jobs (#19504)" This reverts commit dae954ef111b8e0ab17812d156f6c955b77d9859. * Revert "Fix PostgreSQL password reference (#19502)" This reverts commit 9bf6a8af82391fa8b32112deb4a36a0cfc68143e. * Correct default username in postgresql auth
2022-11-08Add postgresql password settings hint (#19112)k.bigwheel (kazufumi nishida)
2022-11-08Add `sensitized` to Admin::Account serializer (fix #19148) (#20094)trwnh
* Add `sensitized` to Admin::Account serializer (fix #19148) * remove whitespace, please linter
2022-11-08Merge pull request #1905 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2022-11-08Make account endorsements idempotent (fix #19045) (#20118)trwnh
* 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-08Fix missing cast of status and rule IDs to string (fix #19048) (#20122)trwnh
2022-11-08Fix uncaught 500 error on invalid `replies_policy` (Fix #19097) (#20126)trwnh
2022-11-08Change Request connection logic to try both IPv6 and IPv4 when available ↵Claire
(#20108) Fixes #19751
2022-11-08Fix grammar (#20106)Roni Laukkarinen
2022-11-08[Glitch] Fix redrafting a currently-editing post not leaving edit modeClaire
Port 782b6835f786385c41c6455f2a251d1925b19eb5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-08[Glitch] Fix opening the language picker scrolling the single-column view to ↵Claire
the top Port 608343c135c087ab7fa9bd401dce8a705720fdb8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-08[Glitch] Fix spoiler buttons css not rendering correct color in light themeZach Flanders
Port 0beb095a4bfbcce55acb016eaaa54b5e93a56023 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-08Merge branch 'main' into glitch-soc/merge-upstreamClaire
generated by cgit-pink (git 2.37.1) at 2024-07-08 10:02:16 +0000