23 commits

Author	SHA1	Message	Date
lain	e853cfe7c3	Revert "Merge branch 'copyright-bump' into 'develop'" ... This reverts merge request !3825	2023-01-02 20:38:50 +00:00
marcin mikołajczak	10886eeaa2	Bump copyright year ... Signed-off-by: marcin mikołajczak <git@mkljczk.pl>	2023-01-01 12:13:06 +01:00
Haelwenn (lanodan) Monnier	2f301bbb87	timeline_controller_test: Fix test name for elixir 1.14	2022-09-03 03:58:22 +02:00
Tusooa Zhu	c48be59f58	Show local-only statuses in public timeline for authenticated users ... Ref: fix-local-public	2022-05-06 13:54:02 -04:00
Sean King	17aa3644be	Copyright bump for 2022	2022-02-25 23:11:42 -07:00
lain	e2772d6bf1	Merge branch 'block-behavior' into 'develop' ... Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242	2021-11-15 14:27:59 +00:00
Alex Gleason	762be6ce10	Merge remote-tracking branch 'upstream/develop' into block-behavior	2021-04-29 11:14:32 -05:00
Haelwenn (lanodan) Monnier	7eecc3b61d	OpenAPI: MastodonAPI Timeline Controller	2021-03-15 06:47:06 +01:00
Alexander Strizhakov	fdf1dfed56	only_remote -> remote renaming	2021-02-01 14:11:12 +03:00
Alexander Strizhakov	77f0a0af7d	more tests and update for docs and changelog	2021-02-01 14:11:12 +03:00
Alexander Strizhakov	2cb6dc5a3a	list timeline filtration by params	2021-02-01 14:11:12 +03:00
Alexander Strizhakov	b6a72680e2	added only_media flag to home timeline	2021-02-01 14:11:11 +03:00
Alexander Strizhakov	c3110c46f3	expanding filtration for home timeline ... added local & remote statuses filtration for home timeline	2021-02-01 14:11:11 +03:00
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	2021-01-13 07:49:50 +01:00
Alex Gleason	1438fd9583	Merge remote-tracking branch 'upstream/develop' into block-behavior	2021-01-06 15:22:35 -06:00
Egor Kislitsyn	35ba48494f	Stream follow updates	2020-12-02 00:18:58 +04:00
Egor Kislitsyn	fb41bd1a85	Hide reactions from muted and blocked users	2020-11-16 22:50:14 +04:00
lain	bae48c98e3	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior	2020-11-04 16:18:11 +01:00
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	2020-11-04 15:05:01 +01:00
Egor Kislitsyn	1a98476f48	Remove unused aliases	2020-10-30 18:42:43 +04:00
Alex Gleason	755f58168b	Merge remote-tracking branch 'upstream/develop' into restrict-domain	2020-10-13 19:26:04 -05:00
Alex Gleason	b3d6cf9022	Merge remote-tracking branch 'upstream/develop' into block-behavior	2020-10-13 19:22:32 -05:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00

Renamed from test/web/mastodon_api/controllers/timeline_controller_test.exs (Browse further)