Thibaut Girka
da24c6aced
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.
2019-02-17 12:26:55 +01:00
Eugen Rochko
397f180493
Add logging for rejected ActivityPub payloads and add tests ( #10062 )
2019-02-17 03:38:25 +01:00
ThibG
3547e3e59e
Fix crash on public hashtag pages when streaming fails ( #10061 )
2019-02-16 14:53:27 +01:00
ThibG
1cbb97ea7f
Merge pull request #916 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-16 13:43:23 +01:00
Eugen Rochko
8ff757ed6a
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
...
Regression from #9581
2019-02-16 11:56:09 +01:00
Eugen Rochko
99f902f224
Add vapid_key to the application entity in the REST API ( #10058 )
...
Fix #8785
2019-02-16 05:27:05 +01:00
Eugen Rochko
c7b6f2f6c6
Add registrations attribute to instance entity in REST API ( #10060 )
...
Fix #9350
2019-02-16 05:23:47 +01:00
Eugen Rochko
66758328ba
Change error graphic to hover-to-play ( #10055 )
...
Fix #6060
2019-02-15 23:33:25 +01:00
Eugen Rochko
6534acc019
Change buttons on timeline preview to open the interaction dialog ( #10054 )
...
Fix #9922
2019-02-15 19:43:09 +01:00
Eugen Rochko
85ef358a0a
Fix style regressions on landing page ( #10030 )
2019-02-15 18:22:06 +01:00
Thibaut Girka
f29b69c08b
[Glitch] Fix hashtags select styling in default and high contrast skins
...
Port bc9930f59d
to glitch-soc
2019-02-15 18:21:00 +01:00
Eugen Rochko
0230b3c41d
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
2019-02-15 18:19:45 +01:00
Eugen Rochko
74d84d2109
Fix color of static page links in high contrast theme ( #10028 )
2019-02-15 18:10:26 +01:00
Thibaut Girka
c8086b6efb
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-15 18:02:45 +01:00
Thibaut Girka
dabbbe1e71
[Glitch] Fix occasional crash in detailed toot view
...
Port f9a338b473
to glitch-soc
2019-02-15 17:34:15 +01:00
Eugen Rochko
ce470feefc
Fix relay enabling/disabling not resetting inbox availability status ( #10048 )
...
Fix #10033
2019-02-15 16:08:59 +01:00
Eugen Rochko
4b9df07eac
Change conversations to always show names of other participants ( #10047 )
...
Fix #9190
2019-02-15 16:08:48 +01:00
dependabot[bot]
e45f98c499
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>
2019-02-15 15:38:29 +01:00
rinsuki
1a12ef6099
Fix breaks when opening a reply tree in WebUI ( #10046 )
...
fix #10045
2019-02-14 17:03:01 +01:00
Eugen Rochko
dae31d8799
Fix hashtag column not subscribing to stream on mount ( #10040 )
...
Fix #9895
2019-02-14 15:46:42 +01:00
Eugen Rochko
9bf5658885
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
2019-02-14 06:27:54 +01:00
nightpool
b5e767c04b
Change robots.txt to exclude only media proxy URLs ( #10038 )
...
* Revert "Change robots.txt to exclude some URLs (#10037 )"
This reverts commit 0e8ebc2371
.
* Let's block media_proxy
/media_proxy/ is a dynamic route used for requesting uncached media, so it's
probably bad to let crawlers use it
* misleading comment
2019-02-14 03:11:47 +01:00
Ben Lubar
a679867d38
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 )
2019-02-14 01:04:43 +01:00
Eugen Rochko
0e8ebc2371
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
2019-02-13 21:28:18 +01:00
Aditoo17
f24e258692
I18n: Update Czech pluralization and fix some language names ( #10015 )
...
* I18n: Update Czech pluralization
* I18n: Fix some language names
* I18n: Fix some language names
2019-02-13 18:53:01 +01:00
Nolan Lawson
4a515905fc
perf: run node directly when streaming ( #10032 )
2019-02-13 18:52:36 +01:00
ThibG
793946fadb
Add list title editing ( #9748 )
...
* Add list title editing
Port changes made by ash for glitch-soc
* Code style fixes
2019-02-13 18:52:02 +01:00
Eugen Rochko
ddbf75ea87
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
2019-02-13 18:42:47 +01:00
dependabot[bot]
a4cfb5c36b
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>
2019-02-13 18:37:27 +01:00
Eugen Rochko
72190529d0
Fix style regressions on landing page ( #10030 )
2019-02-13 18:36:40 +01:00
ThibG
99dcb6d910
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
2019-02-13 18:36:23 +01:00
Eugen Rochko
bc9930f59d
Fix hashtags select styling in default and high contrast themes ( #10029 )
2019-02-13 18:34:58 +01:00
ThibG
bf0c9d7dfa
Disable box shadows for featured hashtags in light theme ( #10034 )
...
Fixes #9990
2019-02-13 18:33:03 +01:00
ThibG
9250511c44
Merge pull request #914 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-13 16:19:15 +01:00
Thibaut Girka
04d7200ba4
[Glitch] Add "copy link" item to status action bars
...
Port 12cb694634
to glitch-soc
2019-02-13 07:29:57 +01:00
Eugen Rochko
a90bbe9bc1
Fix color of static page links in high contrast theme ( #10028 )
2019-02-13 05:30:49 +01:00
dependabot[bot]
ee737fbbd3
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>
2019-02-13 02:55:06 +01:00
dependabot[bot]
222b0095bb
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>
2019-02-13 02:54:48 +01:00
dependabot[bot]
194afac341
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>
2019-02-13 02:54:27 +01:00
dependabot[bot]
394cc99d66
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>
2019-02-13 02:45:01 +01:00
ThibG
a60f90b078
Save IP address used for sign-up, not only sign-in ( #10026 )
...
Fixes #9995
2019-02-12 22:24:14 +01:00
Thibaut Girka
53cc85871d
[Glitch] Don't focus spoiler input when disabled spoiler
...
Inspired by 6866739387
2019-02-12 21:16:02 +01:00
Thibaut Girka
de60ff3809
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-12 20:32:48 +01:00
ThibG
1767bb542c
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-12 20:29:55 +01:00
dependabot[bot]
d5684d9d31
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>
2019-02-12 15:17:26 +01:00
Franck Zoccolo
ffe97d5dda
Add support for IPv6 only MXes in Email validation ( #10009 )
...
* Add support for IPv6 only MXes
* Fixed email validator tests
2019-02-12 14:48:04 +01:00
dependabot[bot]
6c9870bb8e
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>
2019-02-12 05:11:06 +01:00
ThibG
b27f715601
Move sending account Delete to anyone but the account's followers to the pull̀ queue ( #10016 )
2019-02-12 05:10:43 +01:00
Hinaloe
6866739387
Don't focus spiler input when disabled spoiler ( #10017 )
2019-02-12 05:10:31 +01:00
ThibG
98642fef2a
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
2019-02-11 13:19:59 +01:00