787449c12f
Merge pull request #925 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-19 22:42:22 +01:00
ff0576cc2b
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-19 20:18:40 +01:00
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
2019-02-19 20:00:41 +01:00
359d26a053
Fix “reset” button of instance filter switching to custom emoji admin panel ( #10076 )
2019-02-19 14:01:22 +01:00
896beb16c5
[Glitch] Internationalize unexpected error message
...
Port 4e71b104e6
2019-02-18 19:49:06 +01:00
be9352266c
Fix hashtag column not subscribing to stream on mount ( #10040 )
...
Fix #9895
2019-02-18 18:16:35 +01:00
3a8cb6c737
Add quick link from admin account view to block/unblock instance ( #10073 )
2019-02-18 14:59:46 +01:00
6840a77711
Add domain search/filter to the "Federation" (/admin/instances) page ( #10071 )
2019-02-18 14:59:19 +01:00
2f7f6af26a
Hide domain filter in admin page when “local” filter is active ( #10074 )
...
Since the “domain” field is ignored in this case.
2019-02-18 13:37:13 +01:00
d974988541
Fix video player width not being updated to fit container width
2019-02-18 10:44:37 +01:00
d1d7d14f77
Fix video player width not being updated to fit container width ( #10069 )
2019-02-18 00:10:21 +01:00
7853be1f06
Bump version to 2.7.2 ( #10067 )
2019-02-17 20:24:12 +01:00
1aa87a1967
Merge pull request #920 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-17 16:00:24 +01:00
f6a4493a58
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-17 15:43:12 +01:00
ec18359c3d
Fix CW fold/unfold in remote interaction dialog
2019-02-17 15:40:49 +01:00
fa9635c741
Allow multi-line image descriptions. (Glitch)
2019-02-17 15:19:12 +01:00
1a1b8170bb
Fix Announce activities of unknown statuses not fetching those statuses ( #10065 )
...
Regression from #9998
2019-02-17 15:16:36 +01:00
a2b4b82f0f
Merge pull request #918 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-17 15:13:17 +01:00
e31fc2b458
[Glitch] Fix crash on public hashtag pages when streaming fails
...
Port 041ff5fa9a
2019-02-17 14:28:25 +01:00
cac75e01b8
Fix static error page to use the correct pack
2019-02-17 13:34:40 +01:00
91c9cb6022
[Glitch] Change buttons on timeline preview to open the interaction dialog
...
Port 71e28ba399
2019-02-17 12:39:44 +01:00
9a47f2cbdf
Port upstream's javascript to the error page
2019-02-17 12:27:01 +01:00
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.
2019-02-17 12:26:55 +01:00
147b4c2c3a
Add logging for rejected ActivityPub payloads and add tests ( #10062 )
2019-02-17 03:38:25 +01:00
041ff5fa9a
Fix crash on public hashtag pages when streaming fails ( #10061 )
2019-02-16 14:53:27 +01:00
ab9082b332
Merge pull request #916 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-16 13:43:23 +01:00
ea7ad59af2
Fix mutes, blocks, domain blocks and follow requests not paginating ( #10057 )
...
Regression from #9581
2019-02-16 11:56:09 +01:00
cc84a407f4
Add vapid_key to the application entity in the REST API ( #10058 )
...
Fix #8785
2019-02-16 05:27:05 +01:00
a006d4afbe
Add registrations attribute to instance entity in REST API ( #10060 )
...
Fix #9350
2019-02-16 05:23:47 +01:00
80388a3ffe
Change error graphic to hover-to-play ( #10055 )
...
Fix #6060
2019-02-15 23:33:25 +01:00
71e28ba399
Change buttons on timeline preview to open the interaction dialog ( #10054 )
...
Fix #9922
2019-02-15 19:43:09 +01:00
59fa38a4f6
Fix style regressions on landing page ( #10030 )
2019-02-15 18:22:06 +01:00
a151c5566a
[Glitch] Fix hashtags select styling in default and high contrast skins
...
Port 169b9d4428
2019-02-15 18:21:00 +01:00
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
2019-02-15 18:19:45 +01:00
4dcb04b888
Fix color of static page links in high contrast theme ( #10028 )
2019-02-15 18:10:26 +01:00
06cc04fd23
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-15 18:02:45 +01:00
2769b54466
[Glitch] Fix occasional crash in detailed toot view
...
Port f9a338b473
2019-02-15 17:34:15 +01:00
8ef50706a1
Fix relay enabling/disabling not resetting inbox availability status ( #10048 )
...
Fix #10033
2019-02-15 16:08:59 +01:00
b01f26ffbd
Change conversations to always show names of other participants ( #10047 )
...
Fix #9190
2019-02-15 16:08:48 +01:00
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 >
2019-02-15 15:38:29 +01:00
f9a338b473
Fix breaks when opening a reply tree in WebUI ( #10046 )
...
fix #10045
2019-02-14 17:03:01 +01:00
aa83219875
Fix hashtag column not subscribing to stream on mount ( #10040 )
...
Fix #9895
2019-02-14 15:46:42 +01:00
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
2019-02-14 06:27:54 +01:00
a5992e5883
Change robots.txt to exclude only media proxy URLs ( #10038 )
...
* Revert "Change robots.txt to exclude some URLs (#10037 )"
This reverts commit 80161f4351
2019-02-14 03:11:47 +01:00
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 )
2019-02-14 01:04:43 +01:00
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
2019-02-13 21:28:18 +01:00
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
2019-02-13 18:53:01 +01:00
658b4621a6
perf: run node directly when streaming ( #10032 )
2019-02-13 18:52:36 +01:00
188f1c7c89
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
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
2019-02-13 18:42:47 +01:00
