b55bbfa2b3 
								
							 
						 
						
							
							
								
								[Glitch] Change design of notification about lost connections in web UI  
							
							... 
							
							
							
							Port 29f9dc742e 
							
						 
						
							2024-04-06 21:49:57 +02:00  
				
					
						
							
							
								 
						
							
								1ae08ae257 
								
							 
						 
						
							
							
								
								[Glitch] Change out-of-band hashtags design in web UI  
							
							... 
							
							
							
							Port dd061291b1 
							
						 
						
							2024-04-06 21:48:52 +02:00  
				
					
						
							
							
								 
						
							
								0e76b919b5 
								
							 
						 
						
							
							
								
								Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-04-06 21:48:35 +02:00  
				
					
						
							
							
								 
						
							
								a844a6a577 
								
							 
						 
						
							
							
								
								[Glitch] Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately  
							
							... 
							
							
							
							Port dfa43707eb 
							
						 
						
							2024-04-06 21:39:04 +02:00  
				
					
						
							
							
								 
						
							
								c3a128f31e 
								
							 
						 
						
							
							
								
								Remove strings already defined upstream  
							
							
							
						 
						
							2024-04-06 21:25:04 +02:00  
				
					
						
							
							
								 
						
							
								afaad0755f 
								
							 
						 
						
							
							
								
								[Glitch] Remove setting for unfollow confirmation modal, and make it unconditional  
							
							... 
							
							
							
							Port 37ca59815c 
							
						 
						
							2024-04-06 21:17:45 +02:00  
				
					
						
							
							
								 
						
							
								1d1c3a808a 
								
							 
						 
						
							
							
								
								Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed. 
							
						 
						
							2024-04-06 21:01:40 +02:00  
				
					
						
							
							
								 
						
							
								f635cde756 
								
							 
						 
						
							
							
								
								[Glitch] Change new modals to allow vertical scrolling  
							
							... 
							
							
							
							Port de6c9e0fcd 
							
						 
						
							2024-04-06 20:43:43 +02:00  
				
					
						
							
							
								 
						
							
								0f8b33238f 
								
							 
						 
						
							
							
								
								[Glitch] Change icon of severed relationships notifications  
							
							... 
							
							
							
							Port 387c78ddf9 
							
						 
						
							2024-04-06 20:39:07 +02:00  
				
					
						
							
							
								 
						
							
								576c085ea0 
								
							 
						 
						
							
							
								
								[Glitch] Add the role ID to the badge component  
							
							... 
							
							
							
							Port ec1e770fea 
							
						 
						
							2024-04-06 20:35:29 +02:00  
				
					
						
							
							
								 
						
							
								777984faeb 
								
							 
						 
						
							
							
								
								Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-04-06 20:34:07 +02:00  
				
					
						
							
							
								 
						
							
								f14b6f3d99 
								
							 
						 
						
							
							
								
								[Glitch] Fix duplicate translation string for severed relationships  
							
							... 
							
							
							
							Port 885d0faf83 
							
						 
						
							2024-04-06 20:31:09 +02:00  
				
					
						
							
							
								 
						
							
								903dc53522 
								
							 
						 
						
							
							
								
								Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-04-06 20:01:25 +02:00  
				
					
						
							
							
								 
						
							
								375af259a2 
								
							 
						 
						
							
							
								
								[Glitch] Change back button to always appear in advanced web UI  
							
							... 
							
							
							
							Port be52633ee4 
							
						 
						
							2024-04-06 19:55:13 +02:00  
				
					
						
							
							
								 
						
							
								67842ffb22 
								
							 
						 
						
							
							
								
								Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-04-06 19:54:11 +02:00  
				
					
						
							
							
								 
						
							
								0f966209ca 
								
							 
						 
						
							
							
								
								[Glitch] Add notifications of severed relationships  
							
							... 
							
							
							
							Port 44bf7b8128 
							
						 
						
							2024-04-06 19:38:57 +02:00  
				
					
						
							
							
								 
						
							
								f2b23aa5f3 
								
							 
						 
						
							
							
								
								Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes. 
							
						 
						
							2024-04-06 19:35:21 +02:00  
				
					
						
							
							
								 
						
							
								9451997fa8 
								
							 
						 
						
							
							
								
								Refactor notifications code to reduce differences with upstream ( #2692 )  
							
							... 
							
							
							
							* Merge back `Follow` notification component
* Merge back part of `FollowRequestContainer` notification container
* Reduce differences with upstream in the `mention` case
* Reduce differences with upstream in the `favourite` case
* Reduce differences with upstream in the `reblog` case
* Reduce differences with upstream in the `status` case
* Reduce differences with upstream in the `update` case
* Reduce differences with upstream in the `poll` case
* Merge back `AdminSignup` notification component
* Merge back `AdminReport` notification container 
							
						 
						
							2024-04-06 19:34:30 +02:00  
				
					
						
							
							
								 
						
							
								8a64406d34 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #2668 )  
							
							... 
							
							
							
							* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-04-06 18:18:06 +02:00  
				
					
						
							
							
								 
						
							
								0cea7a623b 
								
							 
						 
						
							
							
								
								Fix background and icon on notification requests in web UI ( #29706 )  
							
							
							
						 
						
							2024-03-25 13:39:06 +00:00  
				
					
						
							
							
								 
						
							
								29f9dc742e 
								
							 
						 
						
							
							
								
								Change design of notification about lost connections in web UI ( #29731 )  
							
							
							
						 
						
							2024-03-25 13:27:38 +00:00  
				
					
						
							
							
								 
						
							
								dd061291b1 
								
							 
						 
						
							
							
								
								Change out-of-band hashtags design in web UI ( #29732 )  
							
							
							
						 
						
							2024-03-25 12:45:00 +00:00  
				
					
						
							
							
								 
						
							
								766c1fea20 
								
							 
						 
						
							
							
								
								Update devDependencies (non-major) ( #29746 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-03-25 12:14:46 +00:00  
				
					
						
							
							
								 
						
							
								55e2c827bd 
								
							 
						 
						
							
							
								
								Update DefinitelyTyped types (non-major) ( #29743 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-03-25 11:09:05 +00:00  
				
					
						
							
							
								 
						
							
								45f8364cd1 
								
							 
						 
						
							
							
								
								Update dependency typescript to v5.4.3 ( #29744 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-03-25 11:09:00 +00:00  
				
					
						
							
							
								 
						
							
								bbf36836b6 
								
							 
						 
						
							
							
								
								Update formatjs monorepo ( #29733 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-03-25 11:07:47 +00:00  
				
					
						
							
							
								 
						
							
								799e3be9bd 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29726 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-25 11:07:38 +00:00  
				
					
						
							
							
								 
						
							
								8e7e86ee35 
								
							 
						 
						
							
							
								
								Add ability to reorder uploaded media before posting in web UI ( #28456 )  
							
							
							
						 
						
							2024-03-25 10:29:55 +00:00  
				
					
						
							
							
								 
						
							
								6c381f20b1 
								
							 
						 
						
							
							
								
								Restore advanced filter bar setting ( #29737 )  
							
							
							
						 
						
							2024-03-24 14:17:06 +00:00  
				
					
						
							
							
								 
						
							
								81a04ac25c 
								
							 
						 
						
							
							
								
								Improve specs for severed relationships ( #29688 )  
							
							
							
						 
						
							2024-03-22 16:25:36 +00:00  
				
					
						
							
							
								 
						
							
								37ca59815c 
								
							 
						 
						
							
							
								
								Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )  
							
							
							
						 
						
							2024-03-22 16:24:04 +00:00  
				
					
						
							
							
								 
						
							
								119c7aa0df 
								
							 
						 
						
							
							
								
								Update dependency rails-i18n to v7.0.9 ( #29564 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-03-22 16:22:52 +00:00  
				
					
						
							
							
								 
						
							
								58376eedda 
								
							 
						 
						
							
							
								
								Remove obsolete `admin` and `moderator` columns from `users` table ( #29718 )  
							
							
							
						 
						
							2024-03-22 16:22:36 +00:00  
				
					
						
							
							
								 
						
							
								d71d26a3c9 
								
							 
						 
						
							
							
								
								Reattribute notification-related records if possible when merging accounts ( #29694 )  
							
							
							
						 
						
							2024-03-22 16:21:53 +00:00  
				
					
						
							
							
								 
						
							
								de6c9e0fcd 
								
							 
						 
						
							
							
								
								Change new modals to allow vertical scrolling ( #29644 )  
							
							
							
						 
						
							2024-03-22 16:21:50 +00:00  
				
					
						
							
							
								 
						
							
								387c78ddf9 
								
							 
						 
						
							
							
								
								Change icon of severed relationships notifications ( #29712 )  
							
							
							
						 
						
							2024-03-22 15:45:04 +00:00  
				
					
						
							
							
								 
						
							
								dfa43707eb 
								
							 
						 
						
							
							
								
								Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately ( #29714 )  
							
							
							
						 
						
							2024-03-22 15:44:31 +00:00  
				
					
						
							
							
								 
						
							
								34f293475e 
								
							 
						 
						
							
							
								
								Fix results/query in `api/v1/featured_tags/suggestions` ( #29597 )  
							
							
							
						 
						
							2024-03-22 15:08:27 +00:00  
				
					
						
							
							
								 
						
							
								5db5fa879b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29708 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-22 14:50:03 +00:00  
				
					
						
							
							
								 
						
							
								8c1d29df7e 
								
							 
						 
						
							
							
								
								Use `has_many through` instead of `delegate` for ARSE<>SR ( #29672 )  
							
							
							
						 
						
							2024-03-22 14:43:35 +00:00  
				
					
						
							
							
								 
						
							
								ec1e770fea 
								
							 
						 
						
							
							
								
								Add the role ID to the badge component ( #29707 )  
							
							
							
						 
						
							2024-03-22 11:59:35 +00:00  
				
					
						
							
							
								 
						
							
								05eda8d193 
								
							 
						 
						
							
							
								
								Remove severed relationship notifications for single account suspensions ( #29700 )  
							
							
							
						 
						
							2024-03-21 21:53:24 +00:00  
				
					
						
							
							
								 
						
							
								70a8fcf07d 
								
							 
						 
						
							
							
								
								Fix notification policy migration not preserving `filter_private_mentions` correctly ( #29699 )  
							
							
							
						 
						
							2024-03-21 21:52:29 +00:00  
				
					
						
							
							
								 
						
							
								142c018cfa 
								
							 
						 
						
							
							
								
								Add ruby 3.3 to CI test matrix ( #29705 )  
							
							
							
						 
						
							2024-03-21 21:48:41 +00:00  
				
					
						
							
							
								 
						
							
								ec6d016da1 
								
							 
						 
						
							
							
								
								Update dependency ox to v2.14.18 ( #29701 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-03-21 18:09:45 +00:00  
				
					
						
							
							
								 
						
							
								7f5e930bd2 
								
							 
						 
						
							
							
								
								Update dependency strong_migrations to v1.8.0 ( #29556 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-03-21 18:09:26 +00:00  
				
					
						
							
							
								 
						
							
								f5444c8fe4 
								
							 
						 
						
							
							
								
								Update dependency rspec-rails to v6.1.2 ( #29691 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-03-21 18:06:32 +00:00  
				
					
						
							
							
								 
						
							
								05abefe989 
								
							 
						 
						
							
							
								
								Update RuboCop (non-major) to v1.62.1 ( #29692 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2024-03-21 17:39:27 +00:00  
				
					
						
							
							
								 
						
							
								814a48517f 
								
							 
						 
						
							
							
								
								Add some more tests for notification policies ( #29698 )  
							
							
							
						 
						
							2024-03-21 16:46:38 +00:00  
				
					
						
							
							
								 
						
							
								a59f5694fe 
								
							 
						 
						
							
							
								
								Add empty line after  ✨ magic ✨  frozen string comment ( #29696 )  
							
							
							
						 
						
							2024-03-21 14:12:50 +00:00