369a475a70
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
Took our version (same as upstream but without the things that only
make sense in an animation).
Additional changes:
- app/javascript/flavours/vanilla/theme.yml
Include upstream's javascript in error pages.
6 years ago
147b4c2c3a
Add logging for rejected ActivityPub payloads and add tests ( #10062 )
6 years ago
041ff5fa9a
Fix crash on public hashtag pages when streaming fails ( #10061 )
6 years ago
ab9082b332
Merge pull request #916 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ea7ad59af2
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
...
Regression from #9581
6 years ago
cc84a407f4
Add vapid_key to the application entity in the REST API ( #10058 )
...
Fix #8785
6 years ago
a006d4afbe
Add registrations attribute to instance entity in REST API ( #10060 )
...
Fix #9350
6 years ago
80388a3ffe
Change error graphic to hover-to-play ( #10055 )
...
Fix #6060
6 years ago
71e28ba399
Change buttons on timeline preview to open the interaction dialog ( #10054 )
...
Fix #9922
6 years ago
59fa38a4f6
Fix style regressions on landing page ( #10030 )
6 years ago
a151c5566a
[Glitch] Fix hashtags select styling in default and high contrast skins
...
Port 169b9d4428
6 years ago
c417e8c198
Filter incoming Announce activities by relation to local activity ( #10041 )
...
* Filter incoming Announce activities by relation to local activity
Reject if announcer is not followed by local accounts, and is not
from an enabled relay, and the object is not a local status
Follow-up to #10005
* Fix tests
6 years ago
4dcb04b888
Fix color of static page links in high contrast theme ( #10028 )
6 years ago
06cc04fd23
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
2769b54466
[Glitch] Fix occasional crash in detailed toot view
...
Port f9a338b473
6 years ago
8ef50706a1
Fix relay enabling/disabling not resetting inbox availability status ( #10048 )
...
Fix #10033
6 years ago
b01f26ffbd
Change conversations to always show names of other participants ( #10047 )
...
Fix #9190
6 years ago
57c2fc8454
Bump better_errors from 2.5.0 to 2.5.1 ( #10050 )
...
Bumps [better_errors](https://github.com/BetterErrors/better_errors ) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases )
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md )
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.0...v2.5.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
f9a338b473
Fix breaks when opening a reply tree in WebUI ( #10046 )
...
fix #10045
6 years ago
aa83219875
Fix hashtag column not subscribing to stream on mount ( #10040 )
...
Fix #9895
6 years ago
99fa1ce93d
Add tight rate-limit for API deletions ( #10042 )
...
Deletions take a lot of resources to execute and cause a lot of
federation traffic, so it makes sense to decrease the number
someone can queue up through the API.
30 per 30 minutes
6 years ago
a5992e5883
Change robots.txt to exclude only media proxy URLs ( #10038 )
...
* Revert "Change robots.txt to exclude some URLs (#10037 )"
This reverts commit 80161f4351
6 years ago
309043b158
Improve image description user experience ( #10036 )
...
* Add image descriptions to searchable post content.
* Allow multi-line image descriptions.
* Request image descriptions in the same query as posts when creating the search index.
(see https://github.com/tootsuite/mastodon/pull/10036#discussion_r256551624 )
6 years ago
80161f4351
Change robots.txt to exclude some URLs ( #10037 )
...
- Exclude static assets
- Exclude uploaded files
- Exclude alternate versions of the profile page
- Exclude media proxy URLs
6 years ago
7750416597
I18n: Update Czech pluralization and fix some language names ( #10015 )
...
* I18n: Update Czech pluralization
* I18n: Fix some language names
* I18n: Fix some language names
6 years ago
658b4621a6
perf: run node directly when streaming ( #10032 )
6 years ago
188f1c7c89
Add list title editing ( #9748 )
...
* Add list title editing
Port changes made by ash for glitch-soc
* Code style fixes
6 years ago
dad339da6d
Filter incoming Create activities by relation to local activity ( #10005 )
...
Reject those from accounts with no local followers, from relays
that are not enabled, which do not address local accounts and are
not replies to accounts that do have local followers
6 years ago
011b476d38
Bump faker from 1.9.2 to 1.9.3 ( #10031 )
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.2 to 1.9.3.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.2...v1.9.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
114cdc36aa
Fix style regressions on landing page ( #10030 )
6 years ago
6a5307a573
Alternative handling of private self-boosts ( #9998 )
...
* When self-boosting, embed original toot into Announce serialization
* Process unknown self-boosts from Announce object if it is more than an URI
* Add some self-boost specs
* Only serialize private toots in self-Announces
6 years ago
169b9d4428
Fix hashtags select styling in default and high contrast themes ( #10029 )
6 years ago
98d1a1f117
Disable box shadows for featured hashtags in light theme ( #10034 )
...
Fixes #9990
6 years ago
435a367c10
Merge pull request #914 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
614ea184bb
[Glitch] Add "copy link" item to status action bars
...
Port 3cfadd875c
6 years ago
c6e7b97baa
Fix color of static page links in high contrast theme ( #10028 )
6 years ago
3d374ed18b
Bump bootsnap from 1.3.2 to 1.4.0 ( #10022 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.3.2 to 1.4.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.3.2...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
5977e6af32
Bump faker from 1.9.1 to 1.9.2 ( #10020 )
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.1...v1.9.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
3a2e44b62c
Bump pkg-config from 1.3.2 to 1.3.3 ( #10023 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.2...1.3.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
fbe527ccfc
Bump sidekiq-unique-jobs from 6.0.8 to 6.0.9 ( #10019 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.8 to 6.0.9.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.8...v6.0.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
67215692fc
Save IP address used for sign-up, not only sign-in ( #10026 )
...
Fixes #9995
6 years ago
e230b176fb
[Glitch] Don't focus spoiler input when disabled spoiler
...
Inspired by 0e513ff862
6 years ago
0e34e91661
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
a3ba28eb17
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
2f80a348c9
Bump active_model_serializers from 0.10.8 to 0.10.9 ( #10018 )
...
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.8 to 0.10.9.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.9/CHANGELOG.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.8...v0.10.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
4f0322dcae
Add support for IPv6 only MXes in Email validation ( #10009 )
...
* Add support for IPv6 only MXes
* Fixed email validator tests
6 years ago
241661e009
Bump rubocop from 0.63.1 to 0.64.0 ( #10006 )
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.63.1 to 0.64.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.63.1...v0.64.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
99c4b5b75a
Move sending account Delete to anyone but the account's followers to the pull̀ queue ( #10016 )
6 years ago
0e513ff862
Don't focus spiler input when disabled spoiler ( #10017 )
6 years ago
aee93bfc9c
Fix timeline jumps ( #10001 )
...
* Avoid two-step rendering of statuses as much as possible
Cache width shared by Video player, MediaGallery and Cards at the
ScrollableList level, pass it down through StatusList and Notifications.
* Adjust scroll when new preview cards appear
* Adjust scroll when statuses above the current scroll position are deleted
6 years ago
Thibaut Girka