57 commits

Author	SHA1	Message	Date
Mark Felder	6ef145b4fc	Merge branch 'develop' into feature/digest-email	2019-06-03 15:29:53 -05:00
rinpatch	026b245dbc	Merge branch 'develop' into feature/polls-2-electric-boogalo	2019-06-03 11:14:52 +03:00
rinpatch	300d94c628	Add poll votes ... Also in this commit by accident: - Fix query ordering causing exclude_poll_votes to not work - Do not create notifications for Answer objects	2019-06-01 16:17:46 +03:00
Roman Chvanikov	ce47017c89	Merge develop	2019-05-29 18:18:22 +03:00
William Pitcock	750ede5764	notification: remove local/remote match rules (too complicated)	2019-05-26 00:05:47 +00:00
William Pitcock	4030837d91	notification: add non_follows/non_followers notification control settings	2019-05-25 05:19:47 +00:00
Roman Chvanikov	0f0cc2703b	Merge develop	2019-04-30 20:17:52 +07:00
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	2019-04-25 13:41:10 +07:00
Egor	b9cdf6d3b9	Use User.get_cached* everywhere	2019-04-22 07:20:43 +00:00
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-22 13:08:30 +07:00
Roman Chvanikov	aeafa0b2ef	Add Notification.for_user_since/2	2019-04-19 22:16:17 +07:00
Roman Chvanikov	dc21181f65	Update updated_at field on notification read	2019-04-14 22:29:05 +07:00
Alexander Strizhakov	711ade961e	adding destroy multiple for mastofe	2019-04-12 02:28:46 +00:00
Egor Kislitsyn	db4badc6aa	move user disable into deactivation	2019-04-11 17:22:42 +07:00
Egor Kislitsyn	0f2f7d2cec	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	2019-04-11 15:51:52 +07:00
Sadposter	be8350baa2	Merge branch 'develop' into feature/user-status-subscriptions	2019-04-10 10:44:54 +01:00
Sadposter	007762e767	Add notification checks	2019-04-05 15:30:23 +01:00
eugenijm	cd90695a34	Add PUT /api/pleroma/notification_settings endpoint	2019-03-28 18:55:16 +03:00
eugenijm	55d086b520	Notification controls ... Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances	2019-03-28 07:52:07 +03:00
William Pitcock	aabcecb269	notification: formatting	2019-03-23 02:30:53 +00:00
William Pitcock	9a06d9f6e8	notification: preload child objects	2019-03-23 02:28:57 +00:00
eugenijm	1588688a11	Added support for exclude_types, limit, and min_id in Mastodon ... notifications. Unify Mastodon-compatible pagination logic.	2019-03-18 11:27:27 +03:00
eugenijm	43fb03be5a	Allow to mark a single notification as read	2019-03-15 23:56:14 +03:00
Haelwenn (lanodan) Monnier	a3a9cec483	[Credo] fix Credo.Check.Readability.AliasOrder	2019-03-13 04:26:54 +01:00
Egor Kislitsyn	eb84de0143	allow users to disable their own account	2019-03-04 19:55:11 +07:00
Karen Konou	ac72b578da	Merge branch 'develop' into feature/thread-muting	2019-02-11 12:10:49 +01:00
Karen Konou	c01ef574c1	Refactor as per Rin's suggestions, add endpoint tests	2019-02-11 12:04:02 +01:00
Karen Konou	638456ce8f	elixir too new for CI's mix format lol	2019-02-09 18:08:46 +01:00
Karen Konou	a0d732ec55	it works!!	2019-02-09 17:47:57 +01:00
Haelwenn (lanodan) Monnier	6a6a5b3251	de-group alias/es	2019-02-09 16:31:17 +01:00
href	8018ae7ae5	Join on preloads to avoid N+1 queries	2019-01-26 15:55:53 +01:00
kaniini	4c99b6d35a	Merge branch 'fix/tusky-dm' into 'develop' ... Add actor to recipients list Closes #390 See merge request pleroma/pleroma!683	2019-01-25 05:19:32 +00:00
Maxim Filippov	9274cabe01	Use correct logic to determine "attentions" list	2019-01-24 23:30:43 +03:00
href	28d77e373c	Flake Ids for Users and Activities	2019-01-23 11:26:27 +01:00
Sadposter	042852ecf3	Add check to prevent multiple follow notifications from the same user	2019-01-05 22:54:25 +00:00
William Pitcock	980b5288ed	update copyright years to 2019	2018-12-31 15:41:47 +00:00
kaniini	bee6acd51d	Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop' ... Create tombstone instead of object deletion See merge request pleroma/pleroma!593	2018-12-27 19:37:55 +00:00
Maxim Filippov	ca2e9ce9cc	Revert unneeded changes	2018-12-25 03:44:48 +03:00
Maxim Filippov	2bbec33c71	Fix failing tests	2018-12-25 00:29:13 +03:00
William Pitcock	2791ce9a1f	add license boilerplate to pleroma core	2018-12-23 20:56:42 +00:00
Maksim Pechnikov	074fa790ba	fix compile warnings	2018-12-09 20:50:08 +03:00
Egor Kislitsyn	8b4397c704	Merge branch 'develop' into feature/compat/push-subscriptions ... # Conflicts: # lib/mix/tasks/sample_config.eex # lib/pleroma/web/twitter_api/controllers/util_controller.ex # mix.exs # mix.lock	2018-12-06 19:55:58 +07:00
Egor Kislitsyn	04a48286e6	Add web push support	2018-12-06 19:29:04 +07:00
William Pitcock	b3c360ce2c	notification: add fallback get_notified_from_activity()	2018-11-09 09:07:40 +00:00
William Pitcock	cdfdd77e30	notification: implement new Notification.get_notified_from_activity()	2018-11-09 09:01:36 +00:00
William Pitcock	f16c2e0b1b	notification: add Notification.set_read_up_to()	2018-11-06 22:50:43 +00:00
Pierrick Brun	89603eda9e	do not create notification for yourself	2018-05-11 11:31:17 +02:00
lain	4afbef39f4	Format the code.	2018-03-30 15:01:53 +02:00
Thog	59770c3f5c	Fix all compilation warnings	2017-11-19 02:22:07 +01:00
Roger Braun	a743940463	MastoAPI: Implement all streaming functions.	2017-11-16 16:49:51 +01:00