Commit Graph

16929 Commits (5b69f3db1005bc3c00c7e903fa4638557d15b942)
 

Author SHA1 Message Date
anna 5b69f3db10
merge catcatnya/main into main 1 year ago
anna d5753035e2
fix 404 when reacting with Keycap Number Sign
The Unicode sequence for this emoji starts with an
ASCII # character, which the browser's URI parser
truncates before sending the request to the
backend.
1 year ago
Jeremy Kescher 3e17e5b2cb
Merge remote-tracking branch 'upstream/main' into develop 1 year ago
Claire 5d95e6debb
Merge pull request #2001 from ClearlyClaire/glitch-soc/main
Merge upstream changes
1 year ago
Claire 3ea445bb5c [Glitch] Fix potential duplicate statuses in Explore tab
Port c8a1faa86b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire e877bb47b8 Merge branch 'main' into glitch-soc/main 1 year ago
dependabot[bot] 4555ecf995
Bump nokogiri from 1.13.9 to 1.13.10 (#22145)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.9 to 1.13.10.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.9...v1.13.10)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 year ago
Eugen Rochko 97b6e38a7d
New Crowdin updates (#21954)
* New translations en.json (Serbian (Cyrillic))

* New translations en.json (Serbian (Latin))

* New translations en.yml (Serbian (Latin))

* New translations simple_form.en.yml (Serbian (Latin))

* New translations activerecord.en.yml (Serbian (Latin))

* New translations doorkeeper.en.yml (Serbian (Latin))

* New translations devise.en.yml (Serbian (Latin))

* New translations en.json (Serbian (Cyrillic))

* New translations en.json (Chinese Traditional)

* New translations en.json (Serbian (Latin))

* New translations en.json (Serbian (Cyrillic))

* New translations en.json (Icelandic)

* New translations en.json (Serbian (Latin))

* New translations en.json (Serbian (Cyrillic))

* New translations en.json (Serbian (Latin))

* New translations en.json (Malay)

* New translations en.json (Malay)

* New translations activerecord.en.yml (Malay)

* New translations devise.en.yml (Malay)

* New translations en.yml (Malay)

* New translations en.yml (Arabic)

* New translations en.yml (Greek)

* New translations en.yml (Galician)

* New translations simple_form.en.yml (Malay)

* New translations en.yml (Greek)

* New translations en.yml (Russian)

* New translations en.yml (Belarusian)

* New translations en.yml (Greek)

* New translations en.yml (Belarusian)

* New translations simple_form.en.yml (Greek)

* New translations en.json (Greek)

* New translations en.yml (Greek)

* New translations en.yml (Belarusian)

* New translations doorkeeper.en.yml (Greek)

* New translations en.yml (Greek)

* New translations en.yml (Malay)

* New translations simple_form.en.yml (Malay)

* New translations en.json (Esperanto)

* New translations en.yml (Malay)

* New translations en.yml (Esperanto)

* New translations devise.en.yml (Esperanto)

* New translations en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.json (Serbian (Cyrillic))

* New translations en.json (Serbian (Latin))

* New translations en.yml (Belarusian)

* New translations en.yml (Vietnamese)

* New translations en.yml (Belarusian)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.json (Serbian (Cyrillic))

* New translations en.json (Serbian (Latin))

* New translations en.json (Occitan)

* New translations en.json (Czech)

* New translations en.yml (Hebrew)

* New translations doorkeeper.en.yml (Spanish, Argentina)

* New translations en.json (German)

* New translations en.yml (Spanish, Argentina)

* New translations en.json (German)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations en.json (German)

* New translations en.json (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Thai)

* New translations activerecord.en.yml (Scots)

* New translations en.json (Scottish Gaelic)

* New translations en.yml (Belarusian)

* New translations en.yml (Belarusian)

* New translations en.json (Latvian)

* New translations en.json (Latvian)

* New translations activerecord.en.yml (Latvian)

* New translations devise.en.yml (Latvian)

* New translations en.yml (Turkish)

* New translations en.yml (Scottish Gaelic)

* New translations en.yml (Danish)

* New translations en.yml (Thai)

* New translations en.yml (Belarusian)

* New translations simple_form.en.yml (Thai)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations en.yml (German)

* New translations en.yml (German)

* New translations simple_form.en.yml (German)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Belarusian)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.json (Latvian)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations en.yml (Belarusian)

* New translations en.yml (German)

* New translations en.json (German)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations en.yml (German)

* New translations en.json (German)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Persian)

* New translations en.json (Spanish, Mexico)

* New translations en.yml (Belarusian)

* New translations en.yml (German)

* New translations en.json (Danish)

* New translations en.yml (Danish)

* New translations simple_form.en.yml (Scots)

* New translations en.yml (Belarusian)

* New translations en.yml (Danish)

* New translations en.yml (Scots)

* New translations simple_form.en.yml (Scots)

* New translations en.json (Scots)

* New translations devise.en.yml (Scots)

* New translations doorkeeper.en.yml (Scots)

* New translations en.yml (Greek)

* New translations en.yml (Greek)

* New translations en.yml (Belarusian)

* New translations en.json (German)

* New translations en.yml (Belarusian)

* New translations en.yml (Spanish, Argentina)

* New translations en.json (Spanish, Argentina)

* New translations en.json (German)

* New translations en.json (Esperanto)

* New translations en.json (French)

* New translations en.yml (Esperanto)

* New translations en.yml (Belarusian)

* New translations en.json (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Belarusian)

* New translations devise.en.yml (Esperanto)

* New translations en.json (Slovak)

* New translations en.yml (Slovak)

* New translations activerecord.en.yml (Slovak)

* New translations devise.en.yml (Slovak)

* New translations doorkeeper.en.yml (Slovak)

* New translations en.yml (Belarusian)

* New translations en.yml (Slovak)

* New translations en.yml (Belarusian)

* New translations en.yml (Belarusian)

* New translations en.json (Lithuanian)

* New translations en.yml (Belarusian)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations en.yml (Belarusian)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations en.json (Esperanto)

* New translations en.json (Vietnamese)

* New translations en.yml (Belarusian)

* New translations en.yml (Belarusian)

* New translations en.yml (Belarusian)

* New translations simple_form.en.yml (Belarusian)

* New translations en.yml (Belarusian)

* New translations en.yml (Latvian)

* New translations en.yml (Belarusian)

* New translations en.json (Welsh)

* New translations en.yml (Welsh)

* New translations simple_form.en.yml (Welsh)

* New translations activerecord.en.yml (Welsh)

* New translations devise.en.yml (Welsh)

* New translations doorkeeper.en.yml (Welsh)

* New translations en.json (Welsh)

* New translations en.json (Welsh)

* New translations en.yml (Welsh)

* New translations en.yml (Hebrew)

* New translations en.yml (Welsh)

* New translations en.yml (Hebrew)

* New translations en.yml (Russian)

* New translations simple_form.en.yml (Serbian (Cyrillic))

* New translations simple_form.en.yml (Belarusian)

* New translations en.yml (Ukrainian)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Simplified)

* New translations en.json (Slovak)

* New translations en.json (Slovak)

* New translations en.yml (Slovak)

* New translations en.yml (Belarusian)

* normalize

* New translations en.yml (Belarusian)

* normalize

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
1 year ago
anna e0c55d6043
bump to nyastodon 1.1.8 1 year ago
anna 380567f453
merge catstodon/main into main 1 year ago
Jeremy Kescher 3992d8393d
Merge remote-tracking branch 'upstream/main' into develop 1 year ago
Nick Schonning e8481e67a7
Add CI job to label PRs with merge conflicts (#22020) 1 year ago
Erik Sundell 64bea71714
helm: cleanup helm chart, now in mastodon/chart (#21801) 1 year ago
anna 546220fe89
fix status action bar after upstream changes 1 year ago
Michal Dvorak 859db01268
initial translation of Glitch-specific texts into Czech (#1997) 1 year ago
Jeremy Kescher 7e19321520
Merge remote-tracking branch 'upstream/main' into develop 1 year ago
Claire ed07f10ca8
Fix failure when “Require a reason to join” is set with open registrations (#22127) 1 year ago
anna ea10eabad6
merge catstodon/main into main 1 year ago
Claire c52263f6f8
Fix deprecation warning in `tootctl accounts rotate` (#22120) 1 year ago
Claire c8a1faa86b
Fix potential duplicate statuses in Explore tab (#22121) 1 year ago
anna 3b511a3290
delete reaction notifications when deleting status 1 year ago
anna e48cad81d2
support reacting with foreign custom emojis 1 year ago
Claire 0194bd33fe
Merge pull request #1995 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
1 year ago
Juan Xavier Gomez 16fb604c52 [Glitch] Fix hidden overflow on interaction modal
Port 21b208afcb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire 4642f7d830 [Glitch] Fix UI header overflow on mobile
Port 76454cc638 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire 0e70215c40 [Glitch] Fix “Sign up” button with closed registrations not opening modal on mobile
Port 51098035ed to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.
1 year ago
Claire b59fb28e90
Fix 500 error when trying to migrate to an invalid address (#21462)
* Fix 500 error when trying to migrate to an invalid address

* Add tests
1 year ago
Juan Xavier Gomez 21b208afcb
Fix hidden overflow on interaction modal (#21763)
* Fix hidden overflow on interaction modal

* only update overflow y
1 year ago
Claire 76454cc638
Fix UI header overflow on mobile (#21783) 1 year ago
Claire 3d40282f1b
Change postgres connection timeout (#21790) 1 year ago
Yamagishi Kazutoshi e538584fbe
See version file in GitHub Actions (#21927) 1 year ago
Claire 51098035ed
Fix “Sign up” button with closed registrations not opening modal on mobile (#22060)
Fixes #20840
1 year ago
Francis Murillo f6492a7c4d
Log admin approve and reject account (#22088)
* Log admin approve and reject account

* Add unit tests for approve and reject logging
1 year ago
Claire c8849d6cee
Fix unbounded recursion in account discovery (#22025)
* Fix trying to fetch posts from other users when fetching featured posts

* Rate-limit discovery of new subdomains

* Put a limit on recursively discovering new accounts
1 year ago
Jonathan Hawkes 98a9347dd7
Update Ubuntu, Node versions, dependencies (#22075) 1 year ago
Claire 69137f4a90
Fix irreversible and whole_word parameters handling in /api/v1/filters (#21988)
Fixes #21965
1 year ago
Mikhail Paulyshka f80c3d40e8
enable be locale (#22022)
It already has 80+% completion, which is enough for everyday use.
Test instance runs on https://meowstodon.net/
1 year ago
Jed Fox 33f06a4ae7
Fix the top border of verified account fields (#22006) 1 year ago
Claire 66a70ebb6e
Fix pre-4.0 admin action logs (#22091)
* Fix BackfillAdminActionLogs post-deployment migration

* Improve migration tests

* Backfill admin action logs again
1 year ago
Jeremy Kescher 8a24bef2e3
Fix Redis warnings regarding version 5.0.0 1 year ago
Jeremy Kescher 3520ebbd3b
v4.0.2+1.0.10 1 year ago
Jeremy Kescher 6f338e6719
Merge remote-tracking branch 'upstream/main' into develop 1 year ago
Claire fe523a3045
Fix unbounded recursion in account discovery (#1994)
* Fix trying to fetch posts from other users when fetching featured posts

* Rate-limit discovery of new subdomains

* Put a limit on recursively discovering new accounts
1 year ago
Jeremy Kescher 9554a005cd
v4.0.2+1.0.9 1 year ago
Jeremy Kescher cf912c6ccb
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	Gemfile.lock
1 year ago
Claire f4879c4481
Fix content-type being reset when editing toots (#1993)
Fixes #1990
1 year ago
Claire e7ff8111b1
Merge pull request #1991 from ClearlyClaire/glitch-soc/merge-upstream
Glitch soc/merge upstream
1 year ago
Claire 3be6aff1a8 Merge branch 'main' into glitch-soc/merge-upstream 1 year ago
anna 51e441bbda
properly disable reactions when not logged in 1 year ago