Merge branch 'develop' into 'master'

Update MASTER for 2.4.2 See merge request pleroma/pleroma-fe!1421
2026-06-04 22:30:04 -04:00 · 2022-01-09 18:37:01 +00:00 · 2021-08-08 13:16:00 +00:00 · 2021-08-08 16:14:22 +03:00 · 2021-03-01 18:15:46 +00:00 · 2021-03-01 18:06:55 +00:00
1 changed files with 3 additions and 0 deletions
@@ -11,9 +11,12 @@ const fetchAndUpdate = ({ store, credentials, older = false, since }) => {
  const rootState = store.rootState || store.state
  const timelineData = rootState.statuses.notifications
  const hideMutedPosts = getters.mergedConfig.hideMutedPosts
+  const allowFollowingMove = rootState.users.currentUser.allow_following_move

  args['withMuted'] = !hideMutedPosts

+  args['withMove'] = !allowFollowingMove
+
  args['timeline'] = 'notifications'
  if (older) {
    if (timelineData.minId !== Number.POSITIVE_INFINITY) {
Author	SHA1	Message	Date
Shpuld Shpludson	b13d8f7e63	Merge branch 'develop' into 'master' Update MASTER for 2.4.2 See merge request pleroma/pleroma-fe!1421	2022-01-09 18:37:01 +00:00
Shpuld Shpludson	51d3d8d255	Merge branch 'develop' into 'master' Update MASTER for 2.4.0 See merge request pleroma/pleroma-fe!1406	2021-08-08 13:16:00 +00:00
Shpuld Shpuldson	cc170aa3ec	Update master with 2.4.0	2021-08-08 16:14:22 +03:00
Shpuld Shpludson	c3fcbbd918	Merge branch 'rc/2.3.0' into 'master' 2.3.0 to MASTER See merge request pleroma/pleroma-fe!1366	2021-03-01 18:15:46 +00:00
Shpuld Shpludson	0ac34b3014	Merge branch 'master' into 'rc/2.3.0' # Conflicts: # CHANGELOG.md	2021-03-01 18:06:55 +00:00
Shpuld Shpuldson	06cde8ad06	fix changelog entries in wrong places	2021-03-01 20:04:27 +02:00
Shpuld Shpuldson	434f9cdd7e	changelog date	2021-03-01 19:59:57 +02:00
Shpuld Shpuldson	35cde98d2c	Merge branch 'fix/punycode-buggy' into rc/2.3.0	2021-03-01 09:27:19 +02:00
Shpuld Shpuldson	44e687653c	set changelog version	2021-02-26 13:01:09 +02:00
Shpuld Shpludson	320418d524	Merge branch 'rc/2.2.3' into 'master' rc 2.2.3 to MASTER See merge request pleroma/pleroma-fe!1328	2021-01-18 13:44:31 +00:00
Shpuld Shpludson	8f55cb151c	Merge branch 'master' into 'rc/2.2.3' # Conflicts: # CHANGELOG.md	2021-01-18 13:35:53 +00:00
Shpuld Shpuldson	4f0c43bd84	rc 2.2.3	2021-01-18 15:30:42 +02:00
Shpuld Shpludson	a39866308c	Merge branch 'rc/2.2.2' into 'master' prepare master for 2.2.2 See merge request pleroma/pleroma-fe!1315	2020-12-22 16:00:12 +00:00
Shpuld Shpludson	00cb8d9dce	Merge branch 'master' into 'rc/2.2.2' # Conflicts: # CHANGELOG.md	2020-12-22 15:51:18 +00:00
Shpuld Shpuldson	19bde84f6d	mark unreleased as 2.2.2 in changelog	2020-12-22 17:49:13 +02:00
Shpuld Shpuldson	a7567ce6d0	set patch date to correct	2020-11-11 22:32:44 +02:00
Shpuld Shpuldson	8e87e3d88b	Update MASTER with develop for 2.2.1	2020-11-09 11:13:49 +02:00
Shpuld Shpuldson	6aa276374f	update changelog for 2.2.0	2020-11-06 19:35:01 +02:00
Shpuld Shpludson	23232e1c8f	Merge branch 'develop' into 'master' Merge develop into master for 2.2.0 See merge request pleroma/pleroma-fe!1278	2020-11-06 17:27:25 +00:00
Shpuld Shpludson	b225c3578f	Merge branch 'rc/2.1.2' into 'master' Merge 2.1.2 to MASTER See merge request pleroma/pleroma-fe!1236	2020-09-17 17:26:22 +00:00
Shpuld Shpludson	30efbaab34	Merge branch 'master' into 'rc/2.1.2' # Conflicts: # CHANGELOG.md	2020-09-17 17:17:21 +00:00
Shpuld Shpuldson	8ca0586c0f	update changelog for 2.1.2	2020-09-17 20:15:08 +03:00
Shpuld Shpludson	938887ef91	Merge branch 'rc/2.1.1' into 'master' Update master with 2.1.1 See merge request pleroma/pleroma-fe!1231	2020-09-08 09:46:19 +00:00
Shpuld Shpludson	f31bc5310e	Merge branch 'master' into 'rc/2.1.1' # Conflicts: # CHANGELOG.md	2020-09-08 09:35:36 +00:00
Shpuld Shpuldson	925bf5b5a4	update changelog with 2.1.1	2020-09-08 12:30:45 +03:00
Shpuld Shpludson	e768ec1fca	Merge branch '2.1.0-rc0' into 'master' 2.1.0 into master See merge request pleroma/pleroma-fe!1217	2020-08-27 14:45:03 +00:00
Shpuld Shpuldson	d09f43ba7a	Merge branch '2.1.0-rc0' of git.pleroma.social:pleroma/pleroma-fe into 2.1.0-rc0	2020-08-27 17:13:43 +03:00
Shpuld Shpuldson	748c4d8c71	fix boomarks mistake in changelog	2020-08-27 17:13:14 +03:00
Shpuld Shpludson	c7ddfefe34	Merge branch 'master' into '2.1.0-rc0' # Conflicts: # CHANGELOG.md # src/services/api/api.service.js	2020-08-27 13:59:56 +00:00
Shpuld Shpuldson	c0205d582a	add missing release to changelog to fix conflicts	2020-08-27 16:56:47 +03:00
Shpuld Shpuldson	4ac882a3b0	add back unreleased/patch	2020-08-27 16:51:16 +03:00
Shpuld Shpuldson	bdbc4b27b6	set 2.1.0 date and remove rc from changelog	2020-08-27 16:49:01 +03:00
Shpuld Shpuldson	42598fc675	change changelog	2020-08-26 14:28:43 +03:00
Shpuld Shpludson	5d49edc823	Merge branch 'rc/2.0.5' into 'master' Update MASTER for 2.0.5 patch See merge request pleroma/pleroma-fe!1105	2020-05-12 17:36:05 +00:00
Shpuld Shpuldson	0bc0a8d5f5	update changelog for 2.0.5	2020-05-12 20:27:37 +03:00
Shpuld Shpuldson	726d5279c1	Revert "remove with_move param" This reverts commit `02c8a9e314`.	2020-05-12 20:04:00 +03:00
Shpuld Shpludson	a0f780c455	Merge branch 'rc/2.0.3' into 'master' Update MASTER with 2.0.3 for real See merge request pleroma/pleroma-fe!1099	2020-05-02 14:17:27 +00:00