about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-02-19Merge pull request #925 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-02-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-02-19Fix crash when conversations have no valid participants (#10078)ThibG
* Never return empty participants for conversations Fixes #10068 * Fix client-side crash when conversations have no participants
2019-02-19Fix “reset” button of instance filter switching to custom emoji admin ↵ThibG
panel (#10076)
2019-02-18[Glitch] Internationalize unexpected error messageThibaut Girka
Port 4e71b104e6d5f02069120c7a56b26888c6f0fef5 to glitch-soc, fixing a crash in the process
2019-02-18Fix hashtag column not subscribing to stream on mount (#10040)Eugen Rochko
Fix #9895
2019-02-18Add quick link from admin account view to block/unblock instance (#10073)ThibG
2019-02-18Add domain search/filter to the "Federation" (/admin/instances) page (#10071)ThibG
2019-02-18Hide domain filter in admin page when “local” filter is active (#10074)ThibG
Since the “domain” field is ignored in this case.
2019-02-18Fix video player width not being updated to fit container widthThibaut Girka
2019-02-18Fix video player width not being updated to fit container width (#10069)ThibG
2019-02-17Bump version to 2.7.2 (#10067)Eugen Rochko
2019-02-17Merge pull request #920 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-02-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-02-17Fix CW fold/unfold in remote interaction dialogThibaut Girka
2019-02-17Allow multi-line image descriptions. (Glitch)Ben Lubar
2019-02-17Fix Announce activities of unknown statuses not fetching those statuses (#10065)Eugen Rochko
Regression from #9998
2019-02-17Merge pull request #918 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-02-17[Glitch] Fix crash on public hashtag pages when streaming failsThibaut Girka
Port 041ff5fa9a45f7b8d1048a05a35611622b6f5fdb to glitch-soc
2019-02-17Fix static error page to use the correct packThibaut Girka
2019-02-17[Glitch] Change buttons on timeline preview to open the interaction dialogThibaut Girka
Port 71e28ba39993d6eb3c5966e20214214c9d81b173 to glitch-soc
2019-02-17Port upstream's javascript to the error pageThibaut Girka
2019-02-17Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-17Add logging for rejected ActivityPub payloads and add tests (#10062)Eugen Rochko
2019-02-16Fix crash on public hashtag pages when streaming fails (#10061)ThibG
2019-02-16Merge pull request #916 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-02-16Fix mutes, blocks, domain blocks and follow requests not paginating (#10057)Eugen Rochko
Regression from #9581
2019-02-16Add vapid_key to the application entity in the REST API (#10058)Eugen Rochko
Fix #8785
2019-02-16Add registrations attribute to instance entity in REST API (#10060)Eugen Rochko
Fix #9350
2019-02-15Change error graphic to hover-to-play (#10055)Eugen Rochko
Fix #6060
2019-02-15Change buttons on timeline preview to open the interaction dialog (#10054)Eugen Rochko
Fix #9922
2019-02-15Fix style regressions on landing page (#10030)Eugen Rochko
2019-02-15[Glitch] Fix hashtags select styling in default and high contrast skinsThibaut Girka
Port 169b9d4428d8e54d7bee365fd76be9a6e2a92da5 to glitch-soc
2019-02-15Filter incoming Announce activities by relation to local activity (#10041)Eugen Rochko
* 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-15Fix color of static page links in high contrast theme (#10028)Eugen Rochko
2019-02-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-02-15[Glitch] Fix occasional crash in detailed toot viewThibaut Girka
Port f9a338b473e181dd725f9185d09394624088efac to glitch-soc
2019-02-15Fix relay enabling/disabling not resetting inbox availability status (#10048)Eugen Rochko
Fix #10033
2019-02-15Change conversations to always show names of other participants (#10047)Eugen Rochko
Fix #9190
2019-02-15Bump better_errors from 2.5.0 to 2.5.1 (#10050)dependabot[bot]
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-14Fix breaks when opening a reply tree in WebUI (#10046)rinsuki
fix #10045
2019-02-14Fix hashtag column not subscribing to stream on mount (#10040)Eugen Rochko
Fix #9895
2019-02-14Add tight rate-limit for API deletions (#10042)Eugen Rochko
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-14Change robots.txt to exclude only media proxy URLs (#10038)nightpool
* Revert "Change robots.txt to exclude some URLs (#10037)" This reverts commit 80161f43510ad9316c60c9b50dd5c09c2dae4d54. * 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-14Improve image description user experience (#10036)Ben Lubar
* 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-13Change robots.txt to exclude some URLs (#10037)Eugen Rochko
- Exclude static assets - Exclude uploaded files - Exclude alternate versions of the profile page - Exclude media proxy URLs
2019-02-13I18n: Update Czech pluralization and fix some language names (#10015)Aditoo17
* I18n: Update Czech pluralization * I18n: Fix some language names * I18n: Fix some language names
2019-02-13perf: run node directly when streaming (#10032)Nolan Lawson
2019-02-13Add list title editing (#9748)ThibG
* Add list title editing Port changes made by ash for glitch-soc * Code style fixes
2019-02-13Filter incoming Create activities by relation to local activity (#10005)Eugen Rochko
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