Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3fe7a1fd35
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into issue/1342
							
							
							
							
							
						 | 
						
							2019-12-05 15:46:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								7722e5a67a
								
							
						 | 
						
							
							
								
								Merge branch 'feature/move-activity' into 'develop'
							
							
							
							
							
							
							
							Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883 
							
						 | 
						
							2019-12-02 16:26:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								04a8ffbe84
								
							
						 | 
						
							
							
								
								added privacy option to push notifications
							
							
							
							
							
						 | 
						
							2019-11-28 22:13:11 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1fc28a4b44
								
							
						 | 
						
							
							
								
								Add a view for the move notification
							
							
							
							
							
						 | 
						
							2019-11-27 17:52:02 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								4af69f047d
								
							
						 | 
						
							
							
								
								Remove account field from web push payload
							
							
							
							
							
						 | 
						
							2019-11-27 02:32:55 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								80ededc04f
								
							
						 | 
						
							
							
								
								Add direct_conversation_id to web push payload
							
							
							
							
							
						 | 
						
							2019-11-26 19:53:43 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								152caef51d
								
							
						 | 
						
							
							
								
								Direct messages should provide a distinct push notification subject
							
							
							
							
							
						 | 
						
							2019-10-18 17:51:34 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								e9d1aa75d5
								
							
						 | 
						
							
							
								
								Revert subscription refactoring.
							
							
							
							
							
							
							
							As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984. 
							
						 | 
						
							2019-09-29 18:43:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4b147000c
								
							
						 | 
						
							
							
								
								Merge develop
							
							
							
							
							
						 | 
						
							2019-09-26 10:38:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								b5dfe83433
								
							
						 | 
						
							
							
								
								Replace Pleroma.FlakeId with flake_id hex package
							
							
							
							
							
						 | 
						
							2019-09-25 17:14:31 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								76c3e290fc
								
							
						 | 
						
							
							
								
								Merge develop
							
							
							
							
							
						 | 
						
							2019-09-16 20:30:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roman Chvanikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0bd2b85edb
								
							
						 | 
						
							
							
								
								Separate Subscription Notifications from regular Notifications
							
							
							
							
							
						 | 
						
							2019-09-13 18:25:27 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd017c65a4
								
							
						 | 
						
							
							
								
								[#1149] Refactored Oban workers API (introduced enqueue/3).
							
							
							
							
							
						 | 
						
							2019-08-31 21:58:42 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a90ea8ba15
								
							
						 | 
						
							
							
								
								[#1149] Addressed code review comments (code style, jobs pruning etc.).
							
							
							
							
							
						 | 
						
							2019-08-31 19:08:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e1c481a94
								
							
						 | 
						
							
							
								
								[#1149] Added more oban workers. Refactoring.
							
							
							
							
							
						 | 
						
							2019-08-13 20:20:26 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0951a8849
								
							
						 | 
						
							
							
								
								WebPush: Use Object.normalize, rewrite tests so they test reality.
							
							
							
							
							
						 | 
						
							2019-04-29 18:15:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								1c2e4f88d1
								
							
						 | 
						
							
							
								
								fix credo
							
							
							
							
							
						 | 
						
							2019-04-05 19:46:28 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1712cd2f1
								
							
						 | 
						
							
							
								
								Use PleromaJobQueue in Pleroma.Web.Push
							
							
							
							
							
						 | 
						
							2019-04-05 19:38:44 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c42d34b2ec
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.MaxLineLength
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								fb82f6fc7c
								
							
						 | 
						
							
							
								
								[Credo] Remove parentesis on argument-less functions
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:56 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483
								
							
						 | 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder
							
							
							
							
							
						 | 
						
							2019-03-13 04:26:54 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								07277879e5
								
							
						 | 
						
							
							
								
								Linting.
							
							
							
							
							
						 | 
						
							2019-03-11 19:32:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								600f428db4
								
							
						 | 
						
							
							
								
								WebPush: Add activity id to the push messages.
							
							
							
							
							
							
							
							Makes it easier to relate the push to a given status. 
							
						 | 
						
							2019-03-11 19:23:21 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc7570c282
								
							
						 | 
						
							
							
								
								[#647] tests for web push
							
							
							
							
							
						 | 
						
							2019-03-06 13:20:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								0245ce842f
								
							
						 | 
						
							
							
								
								Remove unused code
							
							
							
							
							
						 | 
						
							2019-03-04 20:49:20 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maxim Filippov
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc7b35e097
								
							
						 | 
						
							
							
								
								Add status text to notifications (mentions and reposts)
							
							
							
							
							
						 | 
						
							2019-03-04 20:47:34 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251
								
							
						 | 
						
							
							
								
								de-group alias/es
							
							
							
							
							
						 | 
						
							2019-02-09 16:31:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								28d77e373c
								
							
						 | 
						
							
							
								
								Flake Ids for Users and Activities
							
							
							
							
							
						 | 
						
							2019-01-23 11:26:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								980b5288ed
								
							
						 | 
						
							
							
								
								update copyright years to 2019
							
							
							
							
							
						 | 
						
							2018-12-31 15:41:47 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								2791ce9a1f
								
							
						 | 
						
							
							
								
								add license boilerplate to pleroma core
							
							
							
							
							
						 | 
						
							2018-12-23 20:56:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								412df2cd38
								
							
						 | 
						
							
							
								
								Warn if push is disabled..
							
							
							
							
							
						 | 
						
							2018-12-14 16:19:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ec0e613eca
								
							
						 | 
						
							
							
								
								Pleroma.Activity.mastodon_notification_type/1
							
							
							
							
							
						 | 
						
							2018-12-14 13:22:10 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								331396cbcd
								
							
						 | 
						
							
							
								
								Properly disable Web Push if no VAPID key is set
							
							
							
							
							
						 | 
						
							2018-12-14 13:05:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								6822916183
								
							
						 | 
						
							
							
								
								Typos
							
							
							
							
							
						 | 
						
							2018-12-14 13:05:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b1bcd97a0f
								
							
						 | 
						
							
							
								
								Push: respect alerts settings
							
							
							
							
							
						 | 
						
							2018-12-14 13:05:49 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d8984b7bf8
								
							
						 | 
						
							
							
								
								Push: add missing notification_type field
							
							
							
							
							
						 | 
						
							2018-12-14 13:05:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								7facbb2b8d
								
							
						 | 
						
							
							
								
								Push.Subscription: convert base64 to base64 urlsafe
							
							
							
							
							
						 | 
						
							2018-12-14 13:05:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								324933a0ac
								
							
						 | 
						
							
							
								
								improve push message format (compatibility with mastodon)
							
							
							
							
							
						 | 
						
							2018-12-14 13:05:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								658edb166f
								
							
						 | 
						
							
							
								
								fix and improve web push; add configuration docs
							
							
							
							
							
						 | 
						
							2018-12-14 13:05:29 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								6f36e903b0
								
							
						 | 
						
							
							
								
								use User.avatar_url
							
							
							
							
							
						 | 
						
							2018-12-06 20:55:46 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								79668c08fc
								
							
						 | 
						
							
							
								
								cleanup
							
							
							
							
							
						 | 
						
							2018-12-06 20:50:20 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								bac58b1524
								
							
						 | 
						
							
							
								
								show warning if VAPID is not set
							
							
							
							
							
						 | 
						
							2018-12-06 19:56:56 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								04a48286e6
								
							
						 | 
						
							
							
								
								Add web push support
							
							
							
							
							
						 | 
						
							2018-12-06 19:29:04 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Martin Kühl
								
							 
						 | 
						
							
							
							
							
								
							
							
								d94ee5cd50
								
							
						 | 
						
							
							
								
								Mastodon API: Support push subscription CRUD
							
							
							
							
							
						 | 
						
							2018-09-22 07:04:01 +02:00 | 
						
						
							
							
							
								
							
							
						 |