fef
029097a1a0
remove outdated comments
2022-12-09 23:08:41 +01:00
fef
a47ecf6e69
clean up new imports in vanilla flavour
2022-12-09 23:08:41 +01:00
fef
f4dbfdb9c9
rebase with upstream
2022-12-09 23:08:36 +01:00
fef
be0bf21f3b
make number of visible reactions a vanilla setting
...
Reactions will be backported to the vanilla
flavour, which requires all related settings to
be accessible from the vanilla settings page
rather than the glitch specific settings modal.
2022-12-09 23:04:13 +01:00
fef
6d2ad83c02
make number of displayed reactions a setting
...
This adds an extra item to the local settings for
specifying the number of reactions shown in toots.
The detailed status view always shows all
reactions.
2022-12-09 23:04:13 +01:00
fef
f535ddc445
change default reaction limit to 1
2022-12-09 23:04:13 +01:00
fef
e247dd17ed
limit number of reactions displayed
...
Too many reactions on a single post quickly get
spammy, so they are now sorted by count and only
the first MAX_REACTIONS number of different
emojis are actually displayed.
2022-12-09 23:04:13 +01:00
fef
fd885bec48
fix reaction margins and paddings
2022-12-09 23:04:13 +01:00
fef
b82984f0b5
cleanup frontend emoji reaction code
2022-12-09 23:04:13 +01:00
fef
852e6ef195
cleanup backend emoji reaction code
2022-12-09 23:04:12 +01:00
fef
266bf2543d
fix padding for reaction button
2022-12-09 23:04:12 +01:00
fef
758f9f6384
handle misskey reactions properly
...
misskey federates emoji reactions as likes.
2022-12-09 23:04:12 +01:00
fef
8398f7ad4e
move react button to action bar
2022-12-09 23:04:12 +01:00
fef
079b0d15c5
cherry-pick emoji reaction changes
2022-12-09 23:04:12 +01:00
fef
4577711201
make frontend fetch reaction limit
...
the maximum number of reactions was previously
hardcoded to 8. this commit also fixes an
incorrect query in StatusReactionValidator where
it didn't count per-user reactions but the total
amount of different ones.
2022-12-09 23:04:12 +01:00
fef
092e42a567
make status reaction count limit configurable
2022-12-09 23:04:11 +01:00
fef
cacabea938
remove accidentally created file
2022-12-09 23:04:11 +01:00
fef
5b30421f3b
federate emoji reactions
...
this is kind of experimental, but it should work
in theory. at least i tested it with a remove
akkoma instance and it didn't crash.
2022-12-09 23:04:11 +01:00
fef
91fcd87069
show reactions in detailed status view
2022-12-09 23:04:11 +01:00
fef
a5c6f4f4b0
add frontend for emoji reactions
...
this is still pretty bare bones but hey, it works.
2022-12-09 23:04:11 +01:00
fef
c3d4a644cf
add backend support for status emoji reactions
...
turns out we can just reuse the code for
announcement reactions.
2022-12-09 23:04:10 +01:00
Claire
5d95e6debb
Merge pull request #2001 from ClearlyClaire/glitch-soc/main
...
Merge upstream changes
2022-12-09 22:59:01 +01:00
dependabot[bot]
ad568924c0
Bump axios from 1.2.0 to 1.2.1 ( #22076 )
...
Bumps [axios](https://github.com/axios/axios ) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v1.2.0...v1.2.1 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-patch
...
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>
2022-12-10 00:58:15 +09:00
dependabot[bot]
2b0112aab1
Bump sidekiq-unique-jobs from 7.1.27 to 7.1.29 ( #22078 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.1.27 to 7.1.29.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.27...v7.1.29 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
dependency-type: direct:production
update-type: version-update:semver-patch
...
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>
2022-12-10 00:57:51 +09:00
Claire
3ea445bb5c
[Glitch] Fix potential duplicate statuses in Explore tab
...
Port c8a1faa86b
2022-12-09 16:50:53 +01:00
Claire
e877bb47b8
Merge branch 'main' into glitch-soc/main
2022-12-09 16:48:55 +01:00
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>
2022-12-10 00:37:37 +09:00
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>
2022-12-10 00:12:56 +09:00
Jeremy Kescher
3992d8393d
Merge remote-tracking branch 'upstream/main' into develop
2022-12-09 14:47:08 +01:00
Nick Schonning
e8481e67a7
Add CI job to label PRs with merge conflicts ( #22020 )
2022-12-09 06:37:13 +01:00
Erik Sundell
64bea71714
helm: cleanup helm chart, now in mastodon/chart ( #21801 )
2022-12-09 06:36:29 +01:00
Michal Dvorak
859db01268
initial translation of Glitch-specific texts into Czech ( #1997 )
2022-12-08 10:38:52 +01:00
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop
2022-12-07 17:49:14 +01:00
Claire
ed07f10ca8
Fix failure when “Require a reason to join” is set with open registrations ( #22127 )
2022-12-07 16:39:58 +01:00
Claire
c52263f6f8
Fix deprecation warning in tootctl accounts rotate ( #22120 )
2022-12-07 14:13:10 +01:00
Claire
c8a1faa86b
Fix potential duplicate statuses in Explore tab ( #22121 )
2022-12-07 14:12:55 +01:00
Claire
0194bd33fe
Merge pull request #1995 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-12-07 10:50:52 +01:00
Juan Xavier Gomez
16fb604c52
[Glitch] Fix hidden overflow on interaction modal
...
Port 21b208afcb
2022-12-07 09:11:57 +01:00
Claire
4642f7d830
[Glitch] Fix UI header overflow on mobile
...
Port 76454cc638
2022-12-07 09:10:47 +01:00
Claire
0e70215c40
[Glitch] Fix “Sign up” button with closed registrations not opening modal on mobile
...
Port 51098035ed
2022-12-07 09:09:23 +01:00
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.
2022-12-07 09:03:42 +01:00
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
2022-12-07 02:35:39 +01:00
Juan Xavier Gomez
21b208afcb
Fix hidden overflow on interaction modal ( #21763 )
...
* Fix hidden overflow on interaction modal
* only update overflow y
2022-12-07 00:40:37 +01:00
Claire
76454cc638
Fix UI header overflow on mobile ( #21783 )
2022-12-07 00:40:18 +01:00
Claire
3d40282f1b
Change postgres connection timeout ( #21790 )
2022-12-07 00:39:36 +01:00
Yamagishi Kazutoshi
e538584fbe
See version file in GitHub Actions ( #21927 )
2022-12-07 00:30:59 +01:00
Claire
51098035ed
Fix “Sign up” button with closed registrations not opening modal on mobile ( #22060 )
...
Fixes #20840
2022-12-07 00:25:40 +01:00
Francis Murillo
f6492a7c4d
Log admin approve and reject account ( #22088 )
...
* Log admin approve and reject account
* Add unit tests for approve and reject logging
2022-12-07 00:25:18 +01:00
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
2022-12-07 00:15:24 +01:00
Jonathan Hawkes
98a9347dd7
Update Ubuntu, Node versions, dependencies ( #22075 )
2022-12-07 00:13:14 +01:00
