| 
								
								
									 lain | 696c13ce54 | Revert "Merge branch 'linkify' into 'develop'" This reverts merge request !2677 | 2020-07-21 22:17:34 +00:00 |  | 
				
					
						| 
								
								
									 Alex Gleason | 613e096389 | Migrate :auto_linker --> Pleroma.Formatter in ConfigDB | 2020-07-16 16:35:03 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 9d30bacace | Merge branch 'develop' into refactor/notification_settings | 2020-07-15 09:30:23 -05:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8d56fb6d22 | Migrate in-db config after updating to Oban 2.0 | 2020-07-14 13:15:46 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 80c21100db | Merge branch 'develop' into refactor/notification_settings | 2020-07-13 13:32:21 -05:00 |  | 
				
					
						| 
								
								
									 lain | b39eb6ecc5 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information | 2020-07-10 12:26:53 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn | 5ea6387572 | Merge branch 'user-search-nickname-rank-boost' into 'develop' Improved search results for localized nickname match
See merge request pleroma/pleroma!2733 | 2020-07-10 08:49:14 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 123352ffa1 | Removed unused trigram index on users. Fixedusers_fts_indexusage. | 2020-07-08 22:50:15 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 013e2c5057 | Use instances table instead of Cachex | 2020-07-08 06:28:39 +02:00 |  | 
				
					
						| 
								
								
									 lain | 74b88c0a8b | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information | 2020-07-06 11:27:06 +02:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 465ddcfd20 | migration to delete migrated tesla setting | 2020-07-06 09:12:29 +03:00 |  | 
				
					
						| 
								
								
									 lain | 37fdb05058 | User, Migration: Change accepts_chat_messagesto be nullableThis is to model the ambiguous state of most users. | 2020-07-03 13:12:23 +02:00 |  | 
				
					
						| 
								
								
									 lain | 8ad166e8e3 | Migrations: Add accepts_chat_messagesto users. | 2020-07-03 12:46:28 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | d69af7f742 | Rename user.settings column This is used exclusively by MastoFE/GlitchFE now | 2020-06-30 11:50:53 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 69848d5c97 | Rename notification "privacy_option" setting | 2020-06-26 12:45:46 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | fd5e797379 | Simplify notification filtering settings further | 2020-06-26 11:24:28 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 433c01b370 | Merge branch 'develop' into refactor/notification_settings | 2020-06-25 14:26:21 -05:00 |  | 
				
					
						| 
								
								
									 lain | 88ccade1cb | Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' admin api status count per instance
See merge request pleroma/pleroma!2500 | 2020-06-24 10:42:07 +00:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 1471b70ef1 | Merge develop | 2020-06-23 20:56:55 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | cb96c82f70 | moving to mrf namespace migration fix | 2020-06-23 20:28:48 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn | c7d69e9256 | Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320 | 2020-06-23 16:38:27 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 4ec2fb967e | Merge branch 'features/users-raw_bio' into 'develop' User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326 | 2020-06-17 10:34:23 +00:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | ed189568f3 | moving mrf settings from instance to separate group | 2020-06-16 18:32:18 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | b15cfc3d36 | Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page | 2020-06-14 18:27:11 +03:00 |  | 
				
					
						| 
								
								
									 lain | e1bc37d118 | MigrationHelper: Move notification backfilling to own module. | 2020-06-09 09:20:55 +02:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 604a83ae3e | merge develop | 2020-06-08 19:21:07 +03:00 |  | 
				
					
						| 
								
								
									 lain | 1a11f0e453 | Chats: Change id to flake id. | 2020-06-07 14:25:30 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | e1b07402ab | User: Add raw_bio, storing unformatted bio Related: https://git.pleroma.social/pleroma/pleroma/issues/1643 | 2020-06-06 16:23:16 +02:00 |  | 
				
					
						| 
								
								
									 lain | 9189b489ee | Migrations: Move Notification migration code to helper | 2020-06-06 15:33:02 +02:00 |  | 
				
					
						| 
								
								
									 lain | 9fa3f0b156 | Notification: Change type of typeto an enum. | 2020-06-06 13:08:45 +02:00 |  | 
				
					
						| 
								
								
									 lain | a8ca030d85 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-06-05 16:53:56 +02:00 |  | 
				
					
						| 
								
								
									 lain | 00748e9650 | ChatMessageReferences: Change seen -> unread | 2020-06-04 17:14:42 +02:00 |  | 
				
					
						| 
								
								
									 lain | 7b79871e97 | Migrations: Add chat_id, seen index to ChatMessageReferences This ensures fast count of unseen messages | 2020-06-03 14:34:33 +02:00 |  | 
				
					
						| 
								
								
									 lain | 1e9efcf7c3 | Migrations: Fix migration module name | 2020-06-03 14:27:54 +02:00 |  | 
				
					
						| 
								
								
									 lain | 7f5c5b11a5 | Chats: Remove unreadfrom the db, calculate from unseen messages. | 2020-06-03 14:26:50 +02:00 |  | 
				
					
						| 
								
								
									 lain | 8edead7c1d | Migration: Remove superfluous imports | 2020-06-03 13:19:38 +02:00 |  | 
				
					
						| 
								
								
									 lain | 6413e06a86 | Migrations: Add unique index to ChatMessageReferences. | 2020-06-03 13:13:44 +02:00 |  | 
				
					
						| 
								
								
									 lain | aa22fce8f4 | ChatMessageReference: Introduce and switch in chat controller. | 2020-06-03 12:30:12 +02:00 |  | 
				
					
						| 
								
								
									 lain | 6cd2fa2a4c | Migrations: Add a migration to backfill notification types. | 2020-06-02 15:13:19 +02:00 |  | 
				
					
						| 
								
								
									 lain | 805ab86933 | Notifications: Make notifications save their type. | 2020-06-02 13:24:34 +02:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 7e6ec778d9 | exclude replies on blocked domains | 2020-06-01 21:17:32 +03:00 |  | 
				
					
						| 
								
								
									 lain | af6d01ec93 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-29 12:36:17 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | d4b20c96c4 | Migrate old notification settings to new variants | 2020-05-28 15:34:11 -05:00 |  | 
				
					
						| 
								
								
									 rinpatch | 91f73a7592 | Merge branch 'notification-fixes' into 'develop' Notification performance fixes
See merge request pleroma/pleroma!2595 | 2020-05-27 13:45:14 +00:00 |  | 
				
					
						| 
								
								
									 lain | 73f222d76a | Migrations: Make user_id index on notifications better for query. | 2020-05-27 12:56:15 +02:00 |  | 
				
					
						| 
								
								
									 lain | acba7043be | Migrations: Add index on client_id and client_secret for apps. Greatly speeds up app lookup. | 2020-05-26 16:46:57 +02:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 1be6b3056e | Use indexed split_part/3 to get a hostname rather than ts_ functions | 2020-05-18 12:38:16 +03:00 |  | 
				
					
						| 
								
								
									 Roman Chvanikov | 8a383707ae | Merge develop | 2020-05-13 19:56:40 +03:00 |  | 
				
					
						| 
								
								
									 lain | dcb5cda324 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms | 2020-05-12 13:13:43 +02:00 |  | 
				
					
						| 
								
								
									 lain | f6aa0b4a07 | Migration: Fix typo | 2020-05-11 22:03:29 +02:00 |  |