Hinaloe
4340d338fd
correct opt-out showing application ( #10086 )
...
* correct opt-out showing application
refs #9994
* Revert "correct opt-out showing application"
This reverts commit 0e9bb70f145be42962416a6b87c08d59a2896486.
* User#shows_application? calls wrong value
6 years ago
Daigo 3 Dango
aa6a4b7b8a
Upgrade Ruby to 2.6.1 ( #9956 )
6 years ago
dependabot[bot]
addc8393e2
Bump pkg-config from 1.3.3 to 1.3.4 ( #10081 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.3 to 1.3.4.
- [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.3...1.3.4 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
dependabot[bot]
b8acdfedf1
Bump oj from 3.7.8 to 3.7.9 ( #10082 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.8 to 3.7.9.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.8...v3.7.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
ThibG
787449c12f
Merge pull request #925 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
ff0576cc2b
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
8e7fc7ec73
Fix crash when conversations have no valid participants ( #10078 )
...
* Never return empty participants for conversations
Fixes #10068
* Fix client-side crash when conversations have no participants
6 years ago
ThibG
359d26a053
Fix “reset” button of instance filter switching to custom emoji admin panel ( #10076 )
6 years ago
Thibaut Girka
896beb16c5
[Glitch] Internationalize unexpected error message
...
Port 4e71b104e6
to glitch-soc,
fixing a crash in the process
6 years ago
Eugen Rochko
be9352266c
Fix hashtag column not subscribing to stream on mount ( #10040 )
...
Fix #9895
6 years ago
ThibG
3a8cb6c737
Add quick link from admin account view to block/unblock instance ( #10073 )
6 years ago
ThibG
6840a77711
Add domain search/filter to the "Federation" (/admin/instances) page ( #10071 )
6 years ago
ThibG
2f7f6af26a
Hide domain filter in admin page when “local” filter is active ( #10074 )
...
Since the “domain” field is ignored in this case.
6 years ago
Thibaut Girka
d974988541
Fix video player width not being updated to fit container width
6 years ago
ThibG
d1d7d14f77
Fix video player width not being updated to fit container width ( #10069 )
6 years ago
Eugen Rochko
7853be1f06
Bump version to 2.7.2 ( #10067 )
6 years ago
ThibG
1aa87a1967
Merge pull request #920 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
f6a4493a58
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
ec18359c3d
Fix CW fold/unfold in remote interaction dialog
6 years ago
Ben Lubar
fa9635c741
Allow multi-line image descriptions. (Glitch)
6 years ago
Eugen Rochko
1a1b8170bb
Fix Announce activities of unknown statuses not fetching those statuses ( #10065 )
...
Regression from #9998
6 years ago
ThibG
a2b4b82f0f
Merge pull request #918 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
e31fc2b458
[Glitch] Fix crash on public hashtag pages when streaming fails
...
Port 041ff5fa9a
to glitch-soc
6 years ago
Thibaut Girka
cac75e01b8
Fix static error page to use the correct pack
6 years ago
Thibaut Girka
91c9cb6022
[Glitch] Change buttons on timeline preview to open the interaction dialog
...
Port 71e28ba399
to glitch-soc
6 years ago
Thibaut Girka
9a47f2cbdf
Port upstream's javascript to the error page
6 years ago
Thibaut Girka
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
Eugen Rochko
147b4c2c3a
Add logging for rejected ActivityPub payloads and add tests ( #10062 )
6 years ago
ThibG
041ff5fa9a
Fix crash on public hashtag pages when streaming fails ( #10061 )
6 years ago
ThibG
ab9082b332
Merge pull request #916 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Eugen Rochko
ea7ad59af2
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
...
Regression from #9581
6 years ago
Eugen Rochko
cc84a407f4
Add vapid_key to the application entity in the REST API ( #10058 )
...
Fix #8785
6 years ago
Eugen Rochko
a006d4afbe
Add registrations attribute to instance entity in REST API ( #10060 )
...
Fix #9350
6 years ago
Eugen Rochko
80388a3ffe
Change error graphic to hover-to-play ( #10055 )
...
Fix #6060
6 years ago
Eugen Rochko
71e28ba399
Change buttons on timeline preview to open the interaction dialog ( #10054 )
...
Fix #9922
6 years ago
Eugen Rochko
59fa38a4f6
Fix style regressions on landing page ( #10030 )
6 years ago
Thibaut Girka
a151c5566a
[Glitch] Fix hashtags select styling in default and high contrast skins
...
Port 169b9d4428
to glitch-soc
6 years ago
Eugen Rochko
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
Eugen Rochko
4dcb04b888
Fix color of static page links in high contrast theme ( #10028 )
6 years ago
Thibaut Girka
06cc04fd23
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
2769b54466
[Glitch] Fix occasional crash in detailed toot view
...
Port f9a338b473
to glitch-soc
6 years ago
Eugen Rochko
8ef50706a1
Fix relay enabling/disabling not resetting inbox availability status ( #10048 )
...
Fix #10033
6 years ago
Eugen Rochko
b01f26ffbd
Change conversations to always show names of other participants ( #10047 )
...
Fix #9190
6 years ago
dependabot[bot]
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
rinsuki
f9a338b473
Fix breaks when opening a reply tree in WebUI ( #10046 )
...
fix #10045
6 years ago
Eugen Rochko
aa83219875
Fix hashtag column not subscribing to stream on mount ( #10040 )
...
Fix #9895
6 years ago
Eugen Rochko
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
nightpool
a5992e5883
Change robots.txt to exclude only media proxy URLs ( #10038 )
...
* Revert "Change robots.txt to exclude some URLs (#10037 )"
This reverts commit 80161f4351
.
* 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
6 years ago
Ben Lubar
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
Eugen Rochko
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