Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								520b570474 
								
							 
						 
						
							
							
								
								Fix notification permissions being requested immediately after login ( #26472 )  
							
							
							
						 
						
							2023-09-12 18:27:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								287520453c 
								
							 
						 
						
							
							
								
								Fix front-end bug when processing relationship-related account actions ( #26902 )  
							
							
							
						 
						
							2023-09-12 16:30:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0712cc2b99 
								
							 
						 
						
							
							
								
								Fix Redux types ( #26899 )  
							
							
							
						 
						
							2023-09-12 12:18:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Santiago Kozak 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2cfcdd09e 
								
							 
						 
						
							
							
								
								Fix recent search items not handling overflows correctly ( #26893 )  
							
							
							
						 
						
							2023-09-12 04:20:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bd06c13204 
								
							 
						 
						
							
							
								
								Convert actions/account_notes into Typescript ( #26601 )  
							
							
							
						 
						
							2023-09-11 16:09:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								91040da871 
								
							 
						 
						
							
							
								
								Fix confusing behavior of mute button and volume slider in web UI ( #26860 )  
							
							
							
						 
						
							2023-09-08 20:39:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9b2bc3d1de 
								
							 
						 
						
							
							
								
								Add recent searches in web UI ( #26834 )  
							
							
							
						 
						
							2023-09-07 14:56:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f3a2e15f8e 
								
							 
						 
						
							
							
								
								Fix mute button and volume slider feeling disconnected in web UI ( #26827 )  
							
							
							
						 
						
							2023-09-07 04:24:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1f141f656d 
								
							 
						 
						
							
							
								
								Change onboarding prompt to use full width of banner in web UI ( #26829 )  
							
							
							
						 
						
							2023-09-07 04:24:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								398635c0c4 
								
							 
						 
						
							
							
								
								Fix paragraph margins resulting in irregular read-more cut-off in web UI ( #26828 )  
							
							
							
						 
						
							2023-09-07 04:24:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9c1ef8302a 
								
							 
						 
						
							
							
								
								Add some information about Full-text search being disabled in search popout ( #26756 )  
							
							
							
						 
						
							2023-09-06 17:23:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d8bdba2f9f 
								
							 
						 
						
							
							
								
								Add in: to search popout in web UI ( #26807 )  
							
							
							
						 
						
							2023-09-06 06:46:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9d290c23d2 
								
							 
						 
						
							
							
								
								Remove obfuscation of reply count in web UI ( #26768 )  
							
							
							
						 
						
							2023-09-05 23:57:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d20733d8d 
								
							 
						 
						
							
							
								
								Add infinite scrolling for search results in web UI ( #26784 )  
							
							
							
						 
						
							2023-09-05 23:54:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								548c032dbb 
								
							 
						 
						
							
							
								
								Improve interaction modal error handling ( #26795 )  
							
							
							
						 
						
							2023-09-05 23:49:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
							
							
								
							
							
								d6f5c27fa9 
								
							 
						 
						
							
							
								
								[Glitch] Fix light mode colors for advanced interface banner  
							
							... 
							
							
							
							Port a106c46478 
							
						 
						
							2023-09-04 18:31:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								e66f961e05 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-04 18:27:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a106c46478 
								
							 
						 
						
							
							
								
								Fix light mode colors for advanced interface banner ( #26759 )  
							
							
							
						 
						
							2023-09-04 10:14:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6b0702a3b5 
								
							 
						 
						
							
							
								
								Add recent to search props ( #2394 )  
							
							... 
							
							
							
							The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-09-03 08:46:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5c7df20c13 
								
							 
						 
						
							
							
								
								[Glitch] Add admin notifications for new Mastodon versions  
							
							... 
							
							
							
							Port front-end changes from 16681e0f20 
							
						 
						
							2023-09-02 15:20:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c107512fa6 
								
							 
						 
						
							
							
								
								Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 15:02:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								4371df7fbe 
								
							 
						 
						
							
							
								
								[Glitch] Add authorized_fetch server setting in addition to env var  
							
							... 
							
							
							
							Port SCSS changes from 9e26cd5503 
							
						 
						
							2023-09-02 15:01:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								728eb6a153 
								
							 
						 
						
							
							
								
								Fix wrong color on active icons with counters in web UI ( #26767 )  
							
							
							
						 
						
							2023-09-02 14:46:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								4ed629cd7e 
								
							 
						 
						
							
							
								
								Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well. 
							
						 
						
							2023-09-02 14:44:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								807c0591e1 
								
							 
						 
						
							
							
								
								[Glitch] Fix search popout including full-text search instructions when full-text search is disabled  
							
							... 
							
							
							
							Port 6c4c72497a 
							
						 
						
							2023-09-02 13:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Santiago Kozak 
								
							 
						 
						
							
							
							
							
								
							
							
								64e661b930 
								
							 
						 
						
							
							
								
								[Glitch] Allow filter form in profiles directory to wrap  
							
							... 
							
							
							
							Port f1d250135c 
							
						 
						
							2023-09-02 13:55:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
							
							
								
							
							
								6c05ac4068 
								
							 
						 
						
							
							
								
								[Glitch] Add an explanation banner on switching to single column mode  
							
							... 
							
							
							
							Port 40b69cc1cd 
							
						 
						
							2023-09-02 13:54:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								ac2dae0d11 
								
							 
						 
						
							
							
								
								Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did. 
							
						 
						
							2023-09-02 13:50:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f5bd2014e2 
								
							 
						 
						
							
							
								
								[Glitch] Fix sign up steps progress layout in right-to-left locales  
							
							... 
							
							
							
							Port 21ec596dab 
							
						 
						
							2023-09-02 13:42:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Rogers 
								
							 
						 
						
							
							
							
							
								
							
							
								beb5fcd0dc 
								
							 
						 
						
							
							
								
								[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts  
							
							... 
							
							
							
							Port 74eb7dbf2d 
							
						 
						
							2023-09-02 13:42:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Rogers 
								
							 
						 
						
							
							
							
							
								
							
							
								871ab84854 
								
							 
						 
						
							
							
								
								[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts  
							
							... 
							
							
							
							Port ae6cf33321 
							
						 
						
							2023-09-02 13:39:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								ffb486648c 
								
							 
						 
						
							
							
								
								Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 13:34:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6ee3e382df 
								
							 
						 
						
							
							
								
								Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether. 
							
						 
						
							2023-09-02 13:18:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								fbbe9f1c12 
								
							 
						 
						
							
							
								
								Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 12:20:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cb50d95c06 
								
							 
						 
						
							
							
								
								[Glitch] Add search options to search popout in web UI  
							
							... 
							
							
							
							Port bceb893159 
							
						 
						
							2023-09-02 12:09:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c8aa3d6d06 
								
							 
						 
						
							
							
								
								Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 12:02:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3c7dbf3a16 
								
							 
						 
						
							
							
								
								Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc. 
							
						 
						
							2023-09-02 11:56:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								023673c0d9 
								
							 
						 
						
							
							
								
								[Glitch] Add data-nosnippet attribute to remote posts and local posts with noindex  
							
							... 
							
							
							
							Port c3a42e1280 
							
						 
						
							2023-09-02 11:49:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6b7c47311d 
								
							 
						 
						
							
							
								
								Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 11:41:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16681e0f20 
								
							 
						 
						
							
							
								
								Add admin notifications for new Mastodon versions ( #26582 )  
							
							
							
						 
						
							2023-09-01 17:47:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9e26cd5503 
								
							 
						 
						
							
							
								
								Add authorized_fetch server setting in addition to env var ( #25798 )  
							
							
							
						 
						
							2023-09-01 15:41:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6c4c72497a 
								
							 
						 
						
							
							
								
								Fix search popout including full-text search instructions when full-text search is disabled ( #26755 )  
							
							
							
						 
						
							2023-09-01 15:13:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Santiago Kozak 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f1d250135c 
								
							 
						 
						
							
							
								
								Allow filter form in profiles directory to wrap ( #26682 )  
							
							
							
						 
						
							2023-08-31 14:15:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								40b69cc1cd 
								
							 
						 
						
							
							
								
								Add an explanation banner on switching to single column mode ( #26019 )  
							
							
							
						 
						
							2023-08-31 12:18:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								21ec596dab 
								
							 
						 
						
							
							
								
								Fix sign up steps progress layout in right-to-left locales ( #26728 )  
							
							
							
						 
						
							2023-08-30 16:29:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Rogers 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74eb7dbf2d 
								
							 
						 
						
							
							
								
								Fix bug with reblogged view on Toots only showing latest reblogging accounts ( #26574 )  
							
							
							
						 
						
							2023-08-29 14:42:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Rogers 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ae6cf33321 
								
							 
						 
						
							
							
								
								Fix bug with favourited view on Toots only showing latest favouriting accounts ( #26577 )  
							
							
							
						 
						
							2023-08-29 10:56:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0719216368 
								
							 
						 
						
							
							
								
								Remove dead code from public.jsx ( #26547 )  
							
							
							
						 
						
							2023-08-29 10:16:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								786e586686 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2388 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-08-29 08:28:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								10b06436d1 
								
							 
						 
						
							
							
								
								Fix colors and typography on hashtag bar in web UI ( #26666 )  
							
							
							
						 
						
							2023-08-28 19:49:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bceb893159 
								
							 
						 
						
							
							
								
								Add search options to search popout in web UI ( #26662 )  
							
							
							
						 
						
							2023-08-28 13:18:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									renovate[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9d9de8d219 
								
							 
						 
						
							
							
								
								Update dependency @testing-library/jest-dom to v6 ( #26479 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2023-08-28 12:19:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								efb1888320 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2376 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-08-26 22:53:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71641766f2 
								
							 
						 
						
							
							
								
								Fix toast saying "published" instead of "saved" after editing post in web UI ( #26664 )  
							
							
							
						 
						
							2023-08-25 22:03:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3a42e1280 
								
							 
						 
						
							
							
								
								Add data-nosnippet attribute to remote posts and local posts with noindex ( #26648 )  
							
							
							
						 
						
							2023-08-25 11:31:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								685270f3f7 
								
							 
						 
						
							
							
								
								[Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode  
							
							... 
							
							
							
							Port e90649b064 
							
						 
						
							2023-08-24 22:00:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								66e82cb8e1 
								
							 
						 
						
							
							
								
								[Glitch] Fix selecting domains to forward reports to not passing the information correctly  
							
							... 
							
							
							
							Port b2ac93dd73 
							
						 
						
							2023-08-24 22:00:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								941a9df28a 
								
							 
						 
						
							
							
								
								Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly. 
							
						 
						
							2023-08-24 21:56:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Antonin Del Fabbro 
								
							 
						 
						
							
							
							
							
								
							
							
								406f3942a9 
								
							 
						 
						
							
							
								
								[Glitch] Change opacity of the delete icon in the search field to be more visible  
							
							... 
							
							
							
							Port 9a8190da4a 
							
						 
						
							2023-08-24 21:51:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								32e67e78a3 
								
							 
						 
						
							
							
								
								Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-24 21:50:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								def58f8ac3 
								
							 
						 
						
							
							
								
								[Glitch] Fix some React warnings  
							
							... 
							
							
							
							Port 152b10b624 
							
						 
						
							2023-08-24 21:49:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b6b68b44a1 
								
							 
						 
						
							
							
								
								Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version. 
							
						 
						
							2023-08-24 21:46:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								bdce78187c 
								
							 
						 
						
							
							
								
								[Glitch] Fix layout of the closed registrations modal  
							
							... 
							
							
							
							Port fe31571965 
							
						 
						
							2023-08-24 21:38:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								9b094f3653 
								
							 
						 
						
							
							
								
								[Glitch] Fix profile picture preview  
							
							... 
							
							
							
							Port SCSS changes from bb23116e8d 
							
						 
						
							2023-08-24 21:36:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								296b3d1560 
								
							 
						 
						
							
							
								
								Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change. 
							
						 
						
							2023-08-24 21:26:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								88ff45a3b2 
								
							 
						 
						
							
							
								
								Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-24 21:03:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								fbfc4145fd 
								
							 
						 
						
							
							
								
								Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there. 
							
						 
						
							2023-08-24 21:01:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								e67c28a5fe 
								
							 
						 
						
							
							
								
								[Glitch] Remove redundant ready() wrapper  
							
							... 
							
							
							
							Port bb51c0676d 
							
						 
						
							2023-08-24 20:35:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7b09f585fa 
								
							 
						 
						
							
							
								
								Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream refactored slightly (but touching almost all the lines in the code),
  glitch-soc had moved a few of the code to another file.
  Refactored as upstream did. 
							
						 
						
							2023-08-24 20:34:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e90649b064 
								
							 
						 
						
							
							
								
								Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode ( #26633 )  
							
							... 
							
							
							
							Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-08-24 14:10:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b2ac93dd73 
								
							 
						 
						
							
							
								
								Fix selecting domains to forward reports to not passing the information correctly ( #26636 )  
							
							
							
						 
						
							2023-08-24 14:06:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Antonin Del Fabbro 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a8190da4a 
								
							 
						 
						
							
							
								
								Change opacity of the delete icon in the search field to be more visible ( #26449 )  
							
							
							
						 
						
							2023-08-23 15:51:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								613cfd625c 
								
							 
						 
						
							
							
								
								Change hashtag bar tags to be de-emphasized ( #26606 )  
							
							
							
						 
						
							2023-08-23 15:44:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								152b10b624 
								
							 
						 
						
							
							
								
								Fix some React warnings ( #26609 )  
							
							
							
						 
						
							2023-08-23 15:43:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								44ba785242 
								
							 
						 
						
							
							
								
								Change the hashtag bar to be hidden when there is a CW and the post is not expanded ( #26615 )  
							
							
							
						 
						
							2023-08-23 15:40:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								58acaa9ae6 
								
							 
						 
						
							
							
								
								Better hashtag normalization when processing a post ( #26614 )  
							
							
							
						 
						
							2023-08-23 08:18:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c053bfc45a 
								
							 
						 
						
							
							
								
								[Glitch] Fix “legal” report category not showing up in moderation interface  
							
							... 
							
							
							
							Port 0446394465 
							
						 
						
							2023-08-22 18:54:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								10404aece8 
								
							 
						 
						
							
							
								
								Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-22 18:50:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								245fe855be 
								
							 
						 
						
							
							
								
								[Glitch] Fix unfollow icon styling in advanced column  
							
							... 
							
							
							
							Port d9c21293aa 
							
						 
						
							2023-08-22 18:48:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2126812f65 
								
							 
						 
						
							
							
								
								Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them. 
							
						 
						
							2023-08-22 18:31:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								128daefc7a 
								
							 
						 
						
							
							
								
								Remove leftover .orig files that were mistakenly included ( #2379 )  
							
							
							
						 
						
							2023-08-22 18:24:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fe31571965 
								
							 
						 
						
							
							
								
								Fix layout of the closed registrations modal ( #26593 )  
							
							
							
						 
						
							2023-08-22 09:11:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
							
							
								
							
							
								724d773844 
								
							 
						 
						
							
							
								
								[Glitch] Fix "Create Account" button in interaction modal  
							
							... 
							
							
							
							Port a664e15702 
							
						 
						
							2023-08-21 21:08:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7e25e311d5 
								
							 
						 
						
							
							
								
								Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-21 21:07:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								061fd66ee6 
								
							 
						 
						
							
							
								
								Remove hashtags from the last line of a status if it only contains hashtags ( #26499 )  
							
							
							
						 
						
							2023-08-21 19:39:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb23116e8d 
								
							 
						 
						
							
							
								
								Fix profile picture preview ( #26538 )  
							
							
							
						 
						
							2023-08-18 18:24:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb51c0676d 
								
							 
						 
						
							
							
								
								Remove redundant ready() wrapper ( #26533 )  
							
							
							
						 
						
							2023-08-18 12:06:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ed2bf92d0 
								
							 
						 
						
							
							
								
								Fix case-insensitive comparison of hashtags to do case-folding ( #26525 )  
							
							
							
						 
						
							2023-08-17 12:49:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0446394465 
								
							 
						 
						
							
							
								
								Fix “legal” report category not showing up in moderation interface ( #26509 )  
							
							
							
						 
						
							2023-08-16 16:38:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f0862bcf98 
								
							 
						 
						
							
							
								
								Fix hashtag bar sometimes including tags that appear in the post's body ( #26506 )  
							
							
							
						 
						
							2023-08-16 11:47:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Santiago Kozak 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								85ecadb630 
								
							 
						 
						
							
							
								
								Fix hashtag bar display when status is in a thread ( #26497 )  
							
							
							
						 
						
							2023-08-16 09:06:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								df6e719898 
								
							 
						 
						
							
							
								
								Add display of out-of-band hashtags in the web interface ( #26492 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-08-14 23:42:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9c21293aa 
								
							 
						 
						
							
							
								
								Fix unfollow icon styling in advanced column ( #26482 )  
							
							
							
						 
						
							2023-08-14 19:02:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c452ccd913 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26444 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-14 14:54:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a664e15702 
								
							 
						 
						
							
							
								
								Fix "Create Account" button in interaction modal ( #26459 )  
							
							
							
						 
						
							2023-08-14 12:04:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								987f190839 
								
							 
						 
						
							
							
								
								[Glitch] Fix reply not preserving the language from the replied-to post  
							
							... 
							
							
							
							Port 34f3001278 
							
						 
						
							2023-08-13 19:24:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								92df185be7 
								
							 
						 
						
							
							
								
								Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-13 19:23:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								e28727aab3 
								
							 
						 
						
							
							
								
								[Glitch] Change the hashtag column to not display the hashtag header on pinned columns  
							
							... 
							
							
							
							Port 4caa9f0e69 
							
						 
						
							2023-08-13 19:13:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7c4b115e7d 
								
							 
						 
						
							
							
								
								[Glitch] Fix interaction modal layout  
							
							... 
							
							
							
							Port cd6f2b3cbc 
							
						 
						
							2023-08-13 19:12:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0f8ddf367c 
								
							 
						 
						
							
							
								
								[Glitch] Change header of hashtag timelines in web UI  
							
							... 
							
							
							
							Port e325443b02 
							
						 
						
							2023-08-13 19:11:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d9451feef0 
								
							 
						 
						
							
							
								
								[Glitch] Fix report modal secondary buttons style  
							
							... 
							
							
							
							Port 79936c584f 
							
						 
						
							2023-08-13 19:08:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2f50b77ae8 
								
							 
						 
						
							
							
								
								[Glitch] Fix confirmation when closing media edition modal with unsaved changes  
							
							... 
							
							
							
							Port b59053ff8c 
							
						 
						
							2023-08-13 19:06:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
							
							
								
							
							
								f0ad745506 
								
							 
						 
						
							
							
								
								[Glitch] Fix light theme select option for hashtags  
							
							... 
							
							
							
							Port 93372fee1e 
							
						 
						
							2023-08-13 19:05:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								03ae73bdc5 
								
							 
						 
						
							
							
								
								[Glitch] Change design of hidden media overlay (again) in web UI  
							
							... 
							
							
							
							Port 04e7efac3f 
							
						 
						
							2023-08-13 19:04:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8247df3a8d 
								
							 
						 
						
							
							
								
								[Glitch] Change reblogs to be excluded from "Posts and replies" tab in web UI  
							
							... 
							
							
							
							Port 9d719bcd85 
							
						 
						
							2023-08-13 19:02:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CSDUMMI 
								
							 
						 
						
							
							
							
							
								
							
							
								64fc66d3db 
								
							 
						 
						
							
							
								
								[Glitch] Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )  
							
							... 
							
							
							
							Port 120f5802c0 
							
						 
						
							2023-08-13 19:00:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								1461cc53ed 
								
							 
						 
						
							
							
								
								[Glitch] Add alt text for preview card thumbnails  
							
							... 
							
							
							
							Port 8da99ffb0d 
							
						 
						
							2023-08-13 18:56:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6530f9709c 
								
							 
						 
						
							
							
								
								Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore. 
							
						 
						
							2023-08-13 18:47:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								57a4e7927a 
								
							 
						 
						
							
							
								
								[Glitch] Add client-side timeout on resend confirmation button  
							
							... 
							
							
							
							Port 2f932cb2bb 
							
						 
						
							2023-08-12 09:38:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								ea8802a05a 
								
							 
						 
						
							
							
								
								Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-08-12 09:36:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								150cfcf3ae 
								
							 
						 
						
							
							
								
								Fix border-radius on “sensitive media” overlay for full-width media ( #2364 )  
							
							
							
						 
						
							2023-08-12 09:30:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								34f3001278 
								
							 
						 
						
							
							
								
								Fix reply not preserving the language from the replied-to post ( #26452 )  
							
							
							
						 
						
							2023-08-12 00:06:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								882e770400 
								
							 
						 
						
							
							
								
								[Glitch] Change interaction modal input to disable browser spell-checking, capitalization and autocomplete  
							
							... 
							
							
							
							Port 71fd70335a 
							
						 
						
							2023-08-11 22:26:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								44a5f1b64a 
								
							 
						 
						
							
							
								
								Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README 
							
						 
						
							2023-08-11 22:15:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3378bdb01f 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2354 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-08-11 22:03:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8cbf4a5296 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26373 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-10 09:47:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4caa9f0e69 
								
							 
						 
						
							
							
								
								Change the hashtag column to not display the hashtag header on pinned columns ( #26416 )  
							
							
							
						 
						
							2023-08-09 16:32:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cd6f2b3cbc 
								
							 
						 
						
							
							
								
								Fix interaction modal layout ( #26368 )  
							
							
							
						 
						
							2023-08-07 17:58:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2dbaba407 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26209 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-07 13:37:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e325443b02 
								
							 
						 
						
							
							
								
								Change header of hashtag timelines in web UI ( #26362 )  
							
							
							
						 
						
							2023-08-07 09:46:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								79936c584f 
								
							 
						 
						
							
							
								
								Fix report modal secondary buttons style ( #26341 )  
							
							
							
						 
						
							2023-08-04 16:25:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b59053ff8c 
								
							 
						 
						
							
							
								
								Fix confirmation when closing media edition modal with unsaved changes ( #26342 )  
							
							
							
						 
						
							2023-08-04 15:48:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								93372fee1e 
								
							 
						 
						
							
							
								
								Fix light theme select option for hashtags ( #26311 )  
							
							
							
						 
						
							2023-08-04 09:41:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								04e7efac3f 
								
							 
						 
						
							
							
								
								Change design of hidden media overlay (again) in web UI ( #26330 )  
							
							
							
						 
						
							2023-08-03 20:39:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9d719bcd85 
								
							 
						 
						
							
							
								
								Change reblogs to be excluded from "Posts and replies" tab in web UI ( #26302 )  
							
							
							
						 
						
							2023-08-03 20:39:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									CSDUMMI 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								120f5802c0 
								
							 
						 
						
							
							
								
								Add direct link to the Single-Sign On provider if there is only one sign up method available ( #26083 )  
							
							
							
						 
						
							2023-08-03 16:43:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8da99ffb0d 
								
							 
						 
						
							
							
								
								Add alt text for preview card thumbnails ( #26184 )  
							
							
							
						 
						
							2023-08-03 15:41:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f932cb2bb 
								
							 
						 
						
							
							
								
								Add client-side timeout on resend confirmation button ( #26300 )  
							
							
							
						 
						
							2023-08-03 01:51:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6308dca76a 
								
							 
						 
						
							
							
								
								change column link to add a better keyboard focus indicator ( #26278 )  
							
							
							
						 
						
							2023-08-02 19:33:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2cbdff97ce 
								
							 
						 
						
							
							
								
								Change design of role badges in web UI ( #26281 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-08-02 17:24:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								01f0cffc2c 
								
							 
						 
						
							
							
								
								Fix line clamp for link previews in web UI ( #26286 )  
							
							
							
						 
						
							2023-08-02 04:17:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4c999a736c 
								
							 
						 
						
							
							
								
								Fix wrong border radius on link cards in web UI ( #26287 )  
							
							
							
						 
						
							2023-08-02 01:57:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71fd70335a 
								
							 
						 
						
							
							
								
								Change interaction modal input to disable browser spell-checking, capitalization and autocomplete ( #26267 )  
							
							
							
						 
						
							2023-08-01 17:11:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b49b5a880 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2348 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-31 07:44:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e02510c428 
								
							 
						 
						
							
							
								
								Remove .orig files ( #2347 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-31 07:43:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e96a90480b 
								
							 
						 
						
							
							
								
								Merge pull request  #2339  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							* Cleanup unused portions of statuses/status partial (#26045 )
* Wrong count in response when removing favourite/reblog (#24365 )
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Paperclip: add support for Azure blob storage (#23607 )
* Fix a missing redirection on getting-started in multi column mode (#26070 )
* Fix haml-lint Rubocop `Style/NumericPredicate` cop (#26040 )
* Change casing for 'Server Settings' string (#26011 )
* Move localized subject mailer shared example to separate file (#25889 )
* Fix haml-lint Rubocop `Lint/UnusedBlockArguments` cop (#26039 )
* Fix `Lint/Void` cop (#25922 )
* Add stricter protocol fields validation for accounts (#25937 )
* Improve the bug report templates (#25621 )
* Fix the crossorigin attribute (#26096 )
* Fix replica being used even if not explicitly defined (#26074 )
* Clean up unused application records (#24871 )
* Change thread view to scroll to the selected post rather than the post being replied to (#24685 )
* Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (#26023 )
* change focus ui for keyboard only input (#25935 )
* Use username as display name for suspended users or users with blank display names (#25276 )
* Fix CSP headers being unintendedly wide (#26105 )
* Fix linting issue (#26106 )
* Replace 'favourite' by 'favorite' for American English (#26009 )
* Override default Action Mailer `preview_path` (#26110 )
* Favourits -> Favorites (#26109 )
* Bump version to v4.1.5 (#26108 )
* Fix incorrect connect timeout in outgoing requests (#26116 )
* Fix missing translation strings for importing lists (#26120 )
* Use valid email address for first account (#26114 )
* Update haml-lint 0.49.1 (#26118 )
* Fix focus and hover styles in web UI (#26125 )
* Remove back button from bookmarks, favourites and lists screens in web UI (#26126 )
* Remove 16:9 cropping from web UI (#26132 )
* Change design of link previews in web UI (#26136 )
* change poll form element colors to fit with the rest of the ui (#26139 )
* Add `lang` attribute to trending links (#26111 )
* Update dependency rdf-normalize to v0.6.1 (#26130 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update dependency brakeman to v6.0.1 (#26141 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update dependency postcss to v8.4.27 (#26144 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Fix unexpected redirection to /explore after sign-in (#26143 )
* Update dependency aws-sdk-s3 to v1.131.0 (#26145 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Add report.updated webhook (#24211 )
* Fix LinkCrawlWorker crashing on `null` `created_at` (#26151 )
* Fix UI Overlap with the loupe icon in the Explore Tab (#26113 )
* Fix missing border on error screen in light theme in web UI (#26152 )
* Fix missing action label on sensitive videos and embeds in web UI (#26135 )
* Fix `lang` for UI texts in link preview (#26149 )
* Add published date and author to news on the explore screen in web UI (#26155 )
* Coverage for `Auth::OmniauthCallbacks` controller (#26147 )
* fix poll input active style (#26162 )
* Add `published_at` attribute to preview cards (#26153 )
* Update dependency sass to v1.64.1 (#26146 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Revert poll colors to green outside of compose form (#26164 )
* Preserve translation on status re-import (#26168 )
* Fix missing GIF badge in account gallery (#26166 )
* Reformat large text arg in `FetchLinkCardService` spec (#26183 )
* Ignore long line in regex initializer (#26182 )
* Reformat large key values in service specs (#26181 )
* Reformat large hash in `ContextHelper` module (#26180 )
* Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration (#26178 )
* Extract private methods in `StatusCacheHydrator` (#26177 )
* New Crowdin Translations (automated) (#26072 )
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Remove the `sr` locale override .rb files (#25927 )
* Use correct naming on controller concern specs (#26197 )
* Migrate to request specs in `/api/v2/filters` (#25721 )
* Fix wrong filters sometimes applying in streaming (#26159 )
* Refactor streaming's filtering logic & improve documentation (#26213 )
* Add role badges to the WebUI (#25649 )
* Change interaction modal in web UI (#26075 )
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
* Fix crash when processing Flag activity with no status (#26189 )
* Storage: add :azure to remaining callers (#26080 )
* Remove queued_at value from pubsub payloads (#26173 )
* Fix emoji picker button scrolling with textarea content in single-column view (#25304 )
* Change the wording of the dismissable explore prompt (#25917 )
* Update dependency haml_lint to v0.49.2 (#26222 )
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228 )
* Swap debug statements in streaming server (#26231 )
* Fix missing return values in streaming (#26233 )
* [Glitch] Wrong count in response when removing favourite/reblog
Port 4c18928a93586b1c9dcae4ea80d808217ef7f2af80809ef33e76fce34ebb9a567ec1d1d1a9f601c7714a20697f49d2e8979fce1f35d7e2f826a95f6e6781dc6462a4b69bec2eb4e739ff0fa4ec187a20 
							
						 
						
							2023-07-30 21:35:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ebfa184e74 
								
							 
						 
						
							
							
								
								Port search popout changes from upstream ( #2333 )  
							
							... 
							
							
							
							* [Glitch] Change search pop-out in web UI
Port 2b113764116028d047b9e38b39194051b83ed19573b64b8917 
							
						 
						
							2023-07-30 18:42:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								403a5c0f3f 
								
							 
						 
						
							
							
								
								[Glitch] Change the wording of the dismissable explore prompt  
							
							... 
							
							
							
							Port a4ec187a20 
							
						 
						
							2023-07-30 17:01:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								aa1789f0dd 
								
							 
						 
						
							
							
								
								[Glitch] Change interaction modal in web UI  
							
							... 
							
							
							
							Port b4e739ff0f 
							
						 
						
							2023-07-30 16:59:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a1f1424e76 
								
							 
						 
						
							
							
								
								Fix interaction modal being broken because of glitch-soc's theming system  
							
							
							
						 
						
							2023-07-30 16:45:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								92fa9d34b0 
								
							 
						 
						
							
							
								
								Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor. 
							
						 
						
							2023-07-30 16:11:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								879c7ed2d3 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing GIF badge in account gallery  
							
							... 
							
							
							
							Port a4b69bec2e 
							
						 
						
							2023-07-30 15:58:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								88ba538aad 
								
							 
						 
						
							
							
								
								[Glitch] Preserve translation on status re-import  
							
							... 
							
							
							
							Port 6781dc6462 
							
						 
						
							2023-07-30 15:57:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								454d8567d4 
								
							 
						 
						
							
							
								
								Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-30 15:54:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								450f75b6f7 
								
							 
						 
						
							
							
								
								[Glitch] Add published date and author to news on the explore screen in web UI  
							
							... 
							
							
							
							Port f826a95f6e 
							
						 
						
							2023-07-30 15:50:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								887a17bb83 
								
							 
						 
						
							
							
								
								[Glitch] Revert poll colors to green outside of compose form  
							
							... 
							
							
							
							Port ce1f35d7e2 
							
						 
						
							2023-07-30 15:50:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
							
							
								
							
							
								e92dde0b16 
								
							 
						 
						
							
							
								
								[Glitch] fix poll input active style  
							
							... 
							
							
							
							Port 49d2e8979f 
							
						 
						
							2023-07-30 15:50:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e48a6a5f2c 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing action label on sensitive videos and embeds in web UI  
							
							... 
							
							
							
							Port 714a20697f 
							
						 
						
							2023-07-30 15:50:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4b26e44ef4 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing border on error screen in light theme in web UI  
							
							... 
							
							
							
							Port d1a9f601c7 
							
						 
						
							2023-07-30 15:23:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gol-cha 
								
							 
						 
						
							
							
							
							
								
							
							
								168fadb6b9 
								
							 
						 
						
							
							
								
								[Glitch] Fix UI Overlap with the loupe icon in the Explore Tab  
							
							... 
							
							
							
							Port 9a567ec1d1 
							
						 
						
							2023-07-30 15:22:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								1d4df97049 
								
							 
						 
						
							
							
								
								[Glitch] Add lang attribute to trending links  
							
							... 
							
							
							
							Port 76fce34ebb 
							
						 
						
							2023-07-30 15:18:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
							
							
								
							
							
								f3bd96c91c 
								
							 
						 
						
							
							
								
								[Glitch] change poll form element colors to fit with the rest of the ui  
							
							... 
							
							
							
							Port 80809ef33e 
							
						 
						
							2023-07-30 15:18:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								bd349cb850 
								
							 
						 
						
							
							
								
								Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/schema.rb`:
  Upstream regenerated the schema file using Rails 7, the conflicts are
  caused by our extra columns.
  Applied upstream's changes, but keeping our extra columns. 
							
						 
						
							2023-07-30 14:58:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gunchleoc 
								
							 
						 
						
							
							
							
							
								
							
							
								09ebf7e37c 
								
							 
						 
						
							
							
								
								[Glitch] Replace 'favourite' by 'favorite' for American English  
							
							... 
							
							
							
							Port 217ef7f2af 
							
						 
						
							2023-07-30 14:44:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b2515feb29 
								
							 
						 
						
							
							
								
								Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-30 14:33:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5914dfdd69 
								
							 
						 
						
							
							
								
								[Glitch] Change thread view to scroll to the selected post rather than the post being replied to  
							
							... 
							
							
							
							Port e4ea80d808 
							
						 
						
							2023-07-30 14:26:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								42f36aa55a 
								
							 
						 
						
							
							
								
								Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version. 
							
						 
						
							2023-07-30 13:49:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
							
							
								
							
							
								f05effeb8f 
								
							 
						 
						
							
							
								
								[Glitch] Fix a missing redirection on getting-started in multi column mode  
							
							... 
							
							
							
							Port 586b1c9dca 
							
						 
						
							2023-07-30 13:32:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								d3d6147286 
								
							 
						 
						
							
							
								
								[Glitch] Wrong count in response when removing favourite/reblog  
							
							... 
							
							
							
							Port 4c18928a93 
							
						 
						
							2023-07-30 13:31:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								993d0a9950 
								
							 
						 
						
							
							
								
								Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/account.rb`:
  Upstream added new validations close to lines on which glitch-soc had
  modified validations to handle custom limits set through environment
  variables.
  Ported upstream changes.
- `config/initializers/content_security_policy.rb`:
  Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is
  completely different.
  Added `AZURE_ALIAS_HOST` to our version of the file. 
							
						 
						
							2023-07-30 13:15:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3a14104411 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2338 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-30 13:09:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4807a5e64 
								
							 
						 
						
							
							
								
								Change aspect ratios on link previews in web UI ( #26250 )  
							
							
							
						 
						
							2023-07-30 03:35:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4d3a129212 
								
							 
						 
						
							
							
								
								Fix public TL not indicating new toots when onlyRemote is enabled ( #26247 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-29 20:18:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1cc3fcf7d0 
								
							 
						 
						
							
							
								
								Fix Public TL not indicating new toots when onlyRemote or allowLocalOnly is enabled ( #2336 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-29 16:45:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								feaf3cf780 
								
							 
						 
						
							
							
								
								Fix firehose not indicating new toots in "All" ( #2335 )  
							
							... 
							
							
							
							When "Show local-only toots in All" is enabled, the column never indicated there are new toots, since `hasUnread` was always false.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-29 08:37:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e69fe94669 
								
							 
						 
						
							
							
								
								Fix "All" live feed not loading automatically. ( #2332 )  
							
							... 
							
							
							
							The dispatch to expand the timeline was missing the `allowLocalOnly` param.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-27 19:25:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8864d5b580 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2327 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-27 19:25:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6256cee034 
								
							 
						 
						
							
							
								
								Change error boundary to upstream's ( #2323 )  
							
							
							
						 
						
							2023-07-27 19:25:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a4ec187a20 
								
							 
						 
						
							
							
								
								Change the wording of the dismissable explore prompt ( #25917 )  
							
							
							
						 
						
							2023-07-27 16:51:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bbea052935 
								
							 
						 
						
							
							
								
								Fix emoji picker button scrolling with textarea content in single-column view ( #25304 )  
							
							
							
						 
						
							2023-07-27 16:20:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b4e739ff0f 
								
							 
						 
						
							
							
								
								Change interaction modal in web UI ( #26075 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-07-27 16:11:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1e4ccc655a 
								
							 
						 
						
							
							
								
								Add role badges to the WebUI ( #25649 )  
							
							
							
						 
						
							2023-07-27 16:05:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b9adea9695 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26072 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-26 13:46:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a4b69bec2e 
								
							 
						 
						
							
							
								
								Fix missing GIF badge in account gallery ( #26166 )  
							
							
							
						 
						
							2023-07-26 03:33:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6781dc6462 
								
							 
						 
						
							
							
								
								Preserve translation on status re-import ( #26168 )  
							
							
							
						 
						
							2023-07-25 20:29:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ce1f35d7e2 
								
							 
						 
						
							
							
								
								Revert poll colors to green outside of compose form ( #26164 )  
							
							
							
						 
						
							2023-07-25 15:32:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								49d2e8979f 
								
							 
						 
						
							
							
								
								fix poll input active style ( #26162 )  
							
							
							
						 
						
							2023-07-25 13:39:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f826a95f6e 
								
							 
						 
						
							
							
								
								Add published date and author to news on the explore screen in web UI ( #26155 )  
							
							
							
						 
						
							2023-07-25 00:57:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4299208487 
								
							 
						 
						
							
							
								
								Fix lang for UI texts in link preview ( #26149 )  
							
							
							
						 
						
							2023-07-24 23:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								714a20697f 
								
							 
						 
						
							
							
								
								Fix missing action label on sensitive videos and embeds in web UI ( #26135 )  
							
							
							
						 
						
							2023-07-24 22:04:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1a9f601c7 
								
							 
						 
						
							
							
								
								Fix missing border on error screen in light theme in web UI ( #26152 )  
							
							
							
						 
						
							2023-07-24 19:53:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gol-cha 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a567ec1d1 
								
							 
						 
						
							
							
								
								Fix UI Overlap with the loupe icon in the Explore Tab ( #26113 )  
							
							
							
						 
						
							2023-07-24 17:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								76fce34ebb 
								
							 
						 
						
							
							
								
								Add lang attribute to trending links ( #26111 )  
							
							
							
						 
						
							2023-07-24 13:48:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								80809ef33e 
								
							 
						 
						
							
							
								
								change poll form element colors to fit with the rest of the ui ( #26139 )  
							
							
							
						 
						
							2023-07-24 13:48:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6b2952d1dd 
								
							 
						 
						
							
							
								
								Change design of link previews in web UI ( #26136 )  
							
							
							
						 
						
							2023-07-24 13:47:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4d01d1a1ee 
								
							 
						 
						
							
							
								
								Remove 16:9 cropping from web UI ( #26132 )  
							
							
							
						 
						
							2023-07-24 13:46:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf9affdeac 
								
							 
						 
						
							
							
								
								Apply padding to all notifications in notif-cleaning mode ( #2325 )  
							
							... 
							
							
							
							* Add missing padding to notif-cleaning for admin-sign-up
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Apply padding to all notification types instead
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-23 18:50:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5e8cbb5f82 
								
							 
						 
						
							
							
								
								Remove back button from bookmarks, favourites and lists screens in web UI ( #26126 )  
							
							
							
						 
						
							2023-07-23 17:55:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cfd50f30bb 
								
							 
						 
						
							
							
								
								Fix focus and hover styles in web UI ( #26125 )  
							
							
							
						 
						
							2023-07-23 17:55:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51311c1978 
								
							 
						 
						
							
							
								
								Fix CW icon being on wrong side in app settings in RTL languages ( #2324 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-23 17:19:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								944c29033d 
								
							 
						 
						
							
							
								
								Fix relationship-tag background color ( #2322 )  
							
							
							
						 
						
							2023-07-23 14:40:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9ec43107f2 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2319 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-23 14:31:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								49767d20bd 
								
							 
						 
						
							
							
								
								Fix glitch local settings navigation items not being proper buttons ( #2320 )  
							
							
							
						 
						
							2023-07-23 14:31:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dd09535bda 
								
							 
						 
						
							
							
								
								Annotate doodle parameters to please eslint ( #2321 )  
							
							
							
						 
						
							2023-07-23 14:31:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52500965cc 
								
							 
						 
						
							
							
								
								Fix “Open in advanced web interface” being shown on mobile view ( #2318 )  
							
							... 
							
							
							
							Fixes  #2307  
						
							2023-07-22 17:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a45198ab0 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2317 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-22 09:53:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									наб 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1b4cf0eba0 
								
							 
						 
						
							
							
								
								Favourits -> Favorites ( #26109 )  
							
							
							
						 
						
							2023-07-21 21:13:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gunchleoc 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								217ef7f2af 
								
							 
						 
						
							
							
								
								Replace 'favourite' by 'favorite' for American English ( #26009 )  
							
							
							
						 
						
							2023-07-21 19:09:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								59478a1b46 
								
							 
						 
						
							
							
								
								change focus ui for keyboard only input ( #25935 )  
							
							
							
						 
						
							2023-07-21 13:20:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4ea80d808 
								
							 
						 
						
							
							
								
								Change thread view to scroll to the selected post rather than the post being replied to ( #24685 )  
							
							
							
						 
						
							2023-07-21 13:14:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e7cb6c6c44 
								
							 
						 
						
							
							
								
								New Crowdin translations ( #2314 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2023-07-21 09:26:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								586b1c9dca 
								
							 
						 
						
							
							
								
								Fix a missing redirection on getting-started in multi column mode ( #26070 )  
							
							
							
						 
						
							2023-07-20 14:46:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4c18928a93 
								
							 
						 
						
							
							
								
								Wrong count in response when removing favourite/reblog ( #24365 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-19 09:02:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0092fe50ac 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream entirely refactored this, while we changed the docker repository
  to upload to and disabled the “latest” tag.
  Applied the repository change to `.github/workflows/build-*.yml`, as well
  as disabling native ARMv64 builds.
- `README.md`:
  We have a completely different README.
  Kept ours.
- `app/views/admin/settings/shared/_links.html.haml`:
  Upstream refactored, we had an extra item.
  Refactored as upstream did.
- `spec/controllers/api/v1/timelines/public_controller_spec.rb`:
  Upstream deleted this file, to be replaced by a request spec at
  `spec/requests/api/v1/timelines/public_spec.rb`.
  We had an extra bit about enabling the public timelines because we have
  different defaults than upstream.
  Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb` 
							
						 
						
							2023-07-19 07:35:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								111686c38b 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2306 )  
							
							... 
							
							
							
							* New translations en.json (French)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Italian)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations en.yml (Ukrainian)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.yml (Esperanto)
[ci skip]
* New translations simple_form.en.yml (French)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations simple_form.en.yml (Italian)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Ukrainian)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (French, Quebec)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip] 
							
						 
						
							2023-07-19 07:05:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									github-actions[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								47832a1ac0 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #26054 )  
							
							... 
							
							
							
							Co-authored-by: renchap <renchap@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-07-18 21:13:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0c45bed333 
								
							 
						 
						
							
							
								
								[Glitch] Fix “Back” button sometimes redirecting out of Mastodon  
							
							... 
							
							
							
							Port a442a1d1c6 
							
						 
						
							2023-07-17 19:12:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c04f2d0cf7 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  had a different lambda due to its theming system.
  Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream enforced an uniform code style around lambdas, and glitch-soc
  removed some code just after the lambda.
  Applied the same code style changes. 
							
						 
						
							2023-07-17 19:02:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a442a1d1c6 
								
							 
						 
						
							
							
								
								Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )  
							
							
							
						 
						
							2023-07-17 17:32:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Stanclift 
								
							 
						 
						
							
							
							
							
								
							
							
								12e7f5fabd 
								
							 
						 
						
							
							
								
								[Glitch] Fix for "follows you" indicator in light web UI not readable  
							
							... 
							
							
							
							Port 97ce47e451 
							
						 
						
							2023-07-17 13:01:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Terence Eden 
								
							 
						 
						
							
							
							
							
								
							
							
								27f7e5b0f3 
								
							 
						 
						
							
							
								
								[Glitch] Prevent split line between icon and number on reposts & favourites  
							
							... 
							
							
							
							Port b923a4c755 
							
						 
						
							2023-07-17 13:01:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c943f17b1b 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-17 12:52:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Stanclift 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								97ce47e451 
								
							 
						 
						
							
							
								
								Fix for "follows you" indicator in light web UI not readable ( #25993 )  
							
							
							
						 
						
							2023-07-17 11:51:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								23197cebce 
								
							 
						 
						
							
							
								
								Reduce dropdown menu margin and padding ( #2301 )  
							
							... 
							
							
							
							* Reduce dropdown menu margin and padding
* Change horizontal padding back to what it was
* Reduce separator vertical margins for consistency 
							
						 
						
							2023-07-16 18:23:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Terence Eden 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b923a4c755 
								
							 
						 
						
							
							
								
								Prevent split line between icon and number on reposts & favourites ( #26004 )  
							
							
							
						 
						
							2023-07-16 10:06:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c45a965bf7 
								
							 
						 
						
							
							
								
								[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface  
							
							... 
							
							
							
							Port 71db616fed 
							
						 
						
							2023-07-14 13:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd012b7cb 
								
							 
						 
						
							
							
								
								[Glitch] Change links in multi-column mode so tabs are open in single-column mode  
							
							... 
							
							
							
							Port 5fad7bd58a 
							
						 
						
							2023-07-14 13:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0d61985713 
								
							 
						 
						
							
							
								
								Remove layout glitch-soc settings  
							
							
							
						 
						
							2023-07-14 13:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f0d3267fbf 
								
							 
						 
						
							
							
								
								[Glitch] Fix dropdowns being disabled for logged out users in web UI  
							
							... 
							
							
							
							Port a8edbcf963 
							
						 
						
							2023-07-14 13:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a98b5c2246 
								
							 
						 
						
							
							
								
								[Glitch] Fix embed dropdown menu item for unauthenticated users  
							
							... 
							
							
							
							Port 41f65edb21 
							
						 
						
							2023-07-13 22:42:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d9adda1a99 
								
							 
						 
						
							
							
								
								Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 22:40:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								470ded3687 
								
							 
						 
						
							
							
								
								Fix notifications not loading when slow mode active ( #2292 )  
							
							... 
							
							
							
							When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.
This change has been missed in e91bf82083 
							
						 
						
							2023-07-13 21:36:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								e271d018b7 
								
							 
						 
						
							
							
								
								Fix home timeline's regexp field  
							
							
							
						 
						
							2023-07-13 19:33:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								71db616fed 
								
							 
						 
						
							
							
								
								Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )  
							
							
							
						 
						
							2023-07-13 17:59:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5fad7bd58a 
								
							 
						 
						
							
							
								
								Change links in multi-column mode so tabs are open in single-column mode ( #25893 )  
							
							
							
						 
						
							2023-07-13 17:18:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								41f65edb21 
								
							 
						 
						
							
							
								
								Fix embed dropdown menu item for unauthenticated users ( #25964 )  
							
							
							
						 
						
							2023-07-13 15:53:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								98e5589ed4 
								
							 
						 
						
							
							
								
								[Glitch] Fix follow link style in embeds  
							
							... 
							
							
							
							Port 5a3f174d56 
							
						 
						
							2023-07-13 14:52:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								18f55567b0 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to typescript-eslint v6  
							
							... 
							
							
							
							Port a7253075d1 
							
						 
						
							2023-07-13 14:51:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3be4f4266d 
								
							 
						 
						
							
							
								
								Fix incorrect types in DisplayName  
							
							
							
						 
						
							2023-07-13 14:51:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								25571b18ed 
								
							 
						 
						
							
							
								
								Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 14:22:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								447ab7ab24 
								
							 
						 
						
							
							
								
								[Glitch] Convert Home timeline components to Typescript  
							
							... 
							
							
							
							Port a75138d073 
							
						 
						
							2023-07-13 14:21:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								177497b367 
								
							 
						 
						
							
							
								
								Merge commit '3ed9b55cb3987e3d32c56f857cb6903ca8bec3d4' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-13 14:02:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0870c7c95e 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to Prettier 3  
							
							... 
							
							
							
							Port 73b64b8917 
							
						 
						
							2023-07-13 14:01:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								95a1fde6b6 
								
							 
						 
						
							
							
								
								Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file. 
							
						 
						
							2023-07-13 13:49:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a3f174d56 
								
							 
						 
						
							
							
								
								Fix follow link style in embeds ( #25965 )  
							
							
							
						 
						
							2023-07-13 12:58:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a7253075d1 
								
							 
						 
						
							
							
								
								Upgrade to typescript-eslint v6 ( #25904 )  
							
							
							
						 
						
							2023-07-13 11:49:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a75138d073 
								
							 
						 
						
							
							
								
								Convert Home timeline components to Typescript ( #25583 )  
							
							
							
						 
						
							2023-07-13 11:28:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								73b64b8917 
								
							 
						 
						
							
							
								
								Upgrade to Prettier 3 ( #25902 )  
							
							
							
						 
						
							2023-07-13 11:26:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c2bfbf53a1 
								
							 
						 
						
							
							
								
								Fix various CSS issues  
							
							
							
						 
						
							2023-07-12 19:13:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								9ae60f8738 
								
							 
						 
						
							
							
								
								Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file. 
							
						 
						
							2023-07-12 16:03:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
							
							
								
							
							
								ec95f62cb4 
								
							 
						 
						
							
							
								
								[Glitch] Fix sounds not being loaded from assets host  
							
							... 
							
							
							
							Port 1392f31ed8 
							
						 
						
							2023-07-12 16:00:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2aadebc769 
								
							 
						 
						
							
							
								
								Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes 
							
						 
						
							2023-07-12 15:54:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
							
							
								
							
							
								15f6fa8d47 
								
							 
						 
						
							
							
								
								[Glitch] fix buttons showing inconsistent styles  
							
							... 
							
							
							
							Port ea10febd25 
							
						 
						
							2023-07-12 15:50:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c3af91ce48 
								
							 
						 
						
							
							
								
								[Glitch] Fix filters not applying to explore tab  
							
							... 
							
							
							
							Port af54bf52c8 
							
						 
						
							2023-07-12 15:48:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c699dc0908 
								
							 
						 
						
							
							
								
								[Glitch] Add forward_to_domains parameter to POST /api/v1/reports  
							
							... 
							
							
							
							Port c27b82a437 
							
						 
						
							2023-07-12 15:47:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								075887e1d6 
								
							 
						 
						
							
							
								
								Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-12 15:44:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								71f8c45c18 
								
							 
						 
						
							
							
								
								[Glitch] Change label and design of sensitive and unavailable media in web UI  
							
							... 
							
							
							
							Port 338a0e70cc 
							
						 
						
							2023-07-12 15:43:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								dd0002e1fe 
								
							 
						 
						
							
							
								
								Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes. 
							
						 
						
							2023-07-12 15:38:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c250b37f0a 
								
							 
						 
						
							
							
								
								[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI  
							
							... 
							
							
							
							Port ceeb2b8c41 
							
						 
						
							2023-07-12 15:34:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								82eebd0482 
								
							 
						 
						
							
							
								
								Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block. 
							
						 
						
							2023-07-12 15:27:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								9e311f95aa 
								
							 
						 
						
							
							
								
								[Glitch] simplify counters  
							
							... 
							
							
							
							Port e0d230fb37 
							
						 
						
							2023-07-12 15:18:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
							
							
								
							
							
								5b9e43187c 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <ShortNumber /> as FC and TS  
							
							... 
							
							
							
							Port 20e85c0e83 
							
						 
						
							2023-07-12 15:17:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								55ea79165a 
								
							 
						 
						
							
							
								
								[Glitch] Convert <DismissableBanner> to Typescript  
							
							... 
							
							
							
							Port 4534498a8e 
							
						 
						
							2023-07-12 15:09:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								0bfa4a990f 
								
							 
						 
						
							
							
								
								[Glitch] Fix translate button position  
							
							... 
							
							
							
							Port 9f078e238d 
							
						 
						
							2023-07-12 15:05:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7e54a30f06 
								
							 
						 
						
							
							
								
								Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-12 15:00:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67055b0343 
								
							 
						 
						
							
							
								
								Fix import order inconsistencies ( #2289 )  
							
							
							
						 
						
							2023-07-12 15:00:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ecd8e0d612 
								
							 
						 
						
							
							
								
								Update Stylelint ( #25819 )  
							
							
							
						 
						
							2023-07-12 12:31:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1392f31ed8 
								
							 
						 
						
							
							
								
								Fix sounds not being loaded from assets host ( #25931 )  
							
							
							
						 
						
							2023-07-12 03:02:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislas Signoud 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ca955ada0b 
								
							 
						 
						
							
							
								
								Use invariant colors on notification toasts ( #25919 )  
							
							
							
						 
						
							2023-07-11 23:30:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea10febd25 
								
							 
						 
						
							
							
								
								fix buttons showing inconsistent styles ( #25903 )  
							
							
							
						 
						
							2023-07-11 12:26:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af54bf52c8 
								
							 
						 
						
							
							
								
								Fix filters not applying to explore tab ( #25887 )  
							
							
							
						 
						
							2023-07-10 19:33:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c27b82a437 
								
							 
						 
						
							
							
								
								Add forward_to_domains parameter to POST /api/v1/reports ( #25866 )  
							
							
							
						 
						
							2023-07-10 18:26:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								338a0e70cc 
								
							 
						 
						
							
							
								
								Change label and design of sensitive and unavailable media in web UI ( #25712 )  
							
							
							
						 
						
							2023-07-08 20:05:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								41a505513f 
								
							 
						 
						
							
							
								
								Remove unused missed_update state ( #25832 )  
							
							
							
						 
						
							2023-07-08 20:02:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a7ca33ad96 
								
							 
						 
						
							
							
								
								Add toast with option to open post after publishing in web UI ( #25564 )  
							
							
							
						 
						
							2023-07-08 20:01:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8edbcf963 
								
							 
						 
						
							
							
								
								Fix dropdowns being disabled for logged out users in web UI ( #25714 )  
							
							
							
						 
						
							2023-07-08 20:00:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ceeb2b8c41 
								
							 
						 
						
							
							
								
								Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )  
							
							
							
						 
						
							2023-07-08 20:00:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4534498a8e 
								
							 
						 
						
							
							
								
								Convert <DismissableBanner> to Typescript ( #25582 )  
							
							
							
						 
						
							2023-07-08 11:12:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								20e85c0e83 
								
							 
						 
						
							
							
								
								Rewrite <ShortNumber /> as FC and TS ( #25492 )  
							
							
							
						 
						
							2023-07-08 11:11:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e0d230fb37 
								
							 
						 
						
							
							
								
								simplify counters ( #25541 )  
							
							
							
						 
						
							2023-07-08 11:11:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f078e238d 
								
							 
						 
						
							
							
								
								Fix translate button position ( #25807 )  
							
							
							
						 
						
							2023-07-08 00:12:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								513078de7a 
								
							 
						 
						
							
							
								
								Fix incorrect secondary button size ( #2276 )  
							
							
							
						 
						
							2023-07-07 09:50:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c0fa85b8dd 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression of icon button colors in web UI  
							
							... 
							
							
							
							Port 69e124e2ed 
							
						 
						
							2023-07-05 13:31:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
							
							
								
							
							
								4719d88117 
								
							 
						 
						
							
							
								
								[Glitch] Change button colors to increase hover/focus contrast and consistency  
							
							... 
							
							
							
							Port 54cb679c19 
							
						 
						
							2023-07-05 13:30:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a117c953d0 
								
							 
						 
						
							
							
								
								[Glitch] Add button to see results for polls in web UI  
							
							... 
							
							
							
							Port b7910bc751 
							
						 
						
							2023-07-05 12:42:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b3f209370b 
								
							 
						 
						
							
							
								
								[Glitch] Add canonical link tags in web UI  
							
							... 
							
							
							
							Port 000b835803 
							
						 
						
							2023-07-05 12:41:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
							
							
								
							
							
								c6246807f5 
								
							 
						 
						
							
							
								
								[Glitch] Fix local live feeds does not expand  
							
							... 
							
							
							
							Port 6268188543 
							
						 
						
							2023-07-05 12:39:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									forsamori 
								
							 
						 
						
							
							
							
							
								
							
							
								ac74374311 
								
							 
						 
						
							
							
								
								[Glitch] Add at-symbol prepended to mention span title  
							
							... 
							
							
							
							Port d9a5c1acfa 
							
						 
						
							2023-07-05 12:38:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0a5271629c 
								
							 
						 
						
							
							
								
								[Glitch] Change labels of live feeds tabs in web UI  
							
							... 
							
							
							
							Port 54a10523e2 
							
						 
						
							2023-07-05 12:37:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5de49e74d4 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-05 12:01:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								000b835803 
								
							 
						 
						
							
							
								
								Add canonical link tags in web UI ( #25715 )  
							
							
							
						 
						
							2023-07-05 11:25:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b7910bc751 
								
							 
						 
						
							
							
								
								Add button to see results for polls in web UI ( #25726 )  
							
							
							
						 
						
							2023-07-05 10:32:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								182fd93a07 
								
							 
						 
						
							
							
								
								fix read more button overlapping thread line bug ( #25706 )  
							
							
							
						 
						
							2023-07-04 14:57:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6268188543 
								
							 
						 
						
							
							
								
								Fix local live feeds does not expand ( #25694 )  
							
							
							
						 
						
							2023-07-04 00:37:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									forsamori 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9a5c1acfa 
								
							 
						 
						
							
							
								
								Add at-symbol prepended to mention span title ( #25684 )  
							
							... 
							
							
							
							Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com> 
							
						 
						
							2023-07-03 22:58:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54a10523e2 
								
							 
						 
						
							
							
								
								Change labels of live feeds tabs in web UI ( #25683 )  
							
							
							
						 
						
							2023-07-03 22:57:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								69e124e2ed 
								
							 
						 
						
							
							
								
								Fix regression of icon button colors in web UI ( #25679 )  
							
							
							
						 
						
							2023-07-03 16:51:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed15893eed 
								
							 
						 
						
							
							
								
								Add regex filter back to firehose ( #2266 )  
							
							... 
							
							
							
							* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-03 15:41:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Trevor Wolf 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								54cb679c19 
								
							 
						 
						
							
							
								
								Change button colors to increase hover/focus contrast and consistency ( #25677 )  
							
							
							
						 
						
							2023-07-03 11:32:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b422b5eebd 
								
							 
						 
						
							
							
								
								Fix showing local only toots in "All" ( #2265 )  
							
							... 
							
							
							
							* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-03 07:00:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								9f3c3f5209 
								
							 
						 
						
							
							
								
								Show local-only posts in “All” by default, and add back option to toggle it  
							
							
							
						 
						
							2023-07-02 20:28:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
							
							
								
							
							
								587ddc2c7f 
								
							 
						 
						
							
							
								
								[Glitch] Prevent duplicate concurrent calls of /api/*/instance in web UI  
							
							... 
							
							
							
							Port 5b46345459 
							
						 
						
							2023-07-02 12:00:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c49e339c89 
								
							 
						 
						
							
							
								
								[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI  
							
							... 
							
							
							
							Port 0512537eb6 
							
						 
						
							2023-07-02 11:59:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7cc2c1be29 
								
							 
						 
						
							
							
								
								[Glitch] Change local and federated timelines to be in a single firehose column  
							
							... 
							
							
							
							Port cea9db5a0b 
							
						 
						
							2023-07-02 11:58:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								eb1cb8224a 
								
							 
						 
						
							
							
								
								[Glitch] Use an Immutable Record as the root state  
							
							... 
							
							
							
							Port 78ba12f0bf 
							
						 
						
							2023-07-02 11:55:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2ba4773ebe 
								
							 
						 
						
							
							
								
								[Glitch] Fix onboarding prompt being displayed because of disconnection gaps  
							
							... 
							
							
							
							Port 9934949fc4 
							
						 
						
							2023-07-02 11:55:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b75aa6b819 
								
							 
						 
						
							
							
								
								[Glitch] Remove the search button from UI header when logged out  
							
							... 
							
							
							
							Port 285a691936 
							
						 
						
							2023-07-02 11:54:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								44e98a2740 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-02 11:49:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5b46345459 
								
							 
						 
						
							
							
								
								Prevent duplicate concurrent calls of /api/*/instance in web UI ( #25663 )  
							
							
							
						 
						
							2023-07-02 11:12:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0512537eb6 
								
							 
						 
						
							
							
								
								Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )  
							
							
							
						 
						
							2023-07-02 10:39:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cea9db5a0b 
								
							 
						 
						
							
							
								
								Change local and federated timelines to be in a single firehose column ( #25641 )  
							
							
							
						 
						
							2023-07-02 00:05:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								78ba12f0bf 
								
							 
						 
						
							
							
								
								Use an Immutable Record as the root state ( #25584 )  
							
							
							
						 
						
							2023-06-30 17:03:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9934949fc4 
								
							 
						 
						
							
							
								
								Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )  
							
							
							
						 
						
							2023-06-30 16:32:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								285a691936 
								
							 
						 
						
							
							
								
								Remove the search button from UI header when logged out ( #25631 )  
							
							
							
						 
						
							2023-06-28 14:57:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								c43cfd2406 
								
							 
						 
						
							
							
								
								[Glitch] Improve dismissable banner buttons when they dont fit on 1 line  
							
							... 
							
							
							
							Port ae30a60b1f 
							
						 
						
							2023-06-27 13:25:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4faa4eb3c4 
								
							 
						 
						
							
							
								
								[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI  
							
							... 
							
							
							
							Port 65aa04647a 
							
						 
						
							2023-06-27 13:21:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2f996375e5 
								
							 
						 
						
							
							
								
								[Glitch] Fix search not being easily findable on smaller screens in web UI  
							
							... 
							
							
							
							Port 2b78c07ef1 
							
						 
						
							2023-06-27 13:21:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								80a5c16ae1 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-27 13:15:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ae30a60b1f 
								
							 
						 
						
							
							
								
								Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-06-26 12:31:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed96e28c9e 
								
							 
						 
						
							
							
								
								Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )  
							
							
							
						 
						
							2023-06-26 12:30:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7b024baf50 
								
							 
						 
						
							
							
								
								Change header backgrounds to use fewer different colors in web UI ( #25577 )  
							
							
							
						 
						
							2023-06-26 05:27:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								65aa04647a 
								
							 
						 
						
							
							
								
								Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )  
							
							
							
						 
						
							2023-06-26 05:26:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2b78c07ef1 
								
							 
						 
						
							
							
								
								Fix search not being easily findable on smaller screens in web UI ( #25576 )  
							
							
							
						 
						
							2023-06-26 05:26:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5def74a436 
								
							 
						 
						
							
							
								
								[Glitch] Remove unique accounts condition from Home onboarding prompt  
							
							... 
							
							
							
							Port 0842a68532 
							
						 
						
							2023-06-25 17:40:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6fb34258a4 
								
							 
						 
						
							
							
								
								[Glitch] Add onboarding prompt when home feed too slow in web UI  
							
							... 
							
							
							
							Port 00ec43914a 
							
						 
						
							2023-06-25 17:40:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7d160d2272 
								
							 
						 
						
							
							
								
								[Glitch] Fix j/k keyboard shortcuts on some status lists  
							
							... 
							
							
							
							Port a8c1c8bd37 
							
						 
						
							2023-06-25 17:40:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
							
							
								
							
							
								222713a768 
								
							 
						 
						
							
							
								
								[Glitch] Fix custom signup URL may not loaded  
							
							... 
							
							
							
							Port 8d2c26834f 
							
						 
						
							2023-06-25 14:27:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ian 
								
							 
						 
						
							
							
							
							
								
							
							
								6fe345c383 
								
							 
						 
						
							
							
								
								[Glitch] Change emoji picker icon  
							
							... 
							
							
							
							Port 69db507924 
							
						 
						
							2023-06-25 14:27:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								c71fc42f4e 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <AutosuggestHashtag /> as FC and TS  
							
							... 
							
							
							
							Port 804488d38e 
							
						 
						
							2023-06-25 14:27:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								178e151019 
								
							 
						 
						
							
							
								
								Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars. 
							
						 
						
							2023-06-25 14:27:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								55e7c08a83 
								
							 
						 
						
							
							
								
								Fix verified badge in account lists potentially including rel="me" links ( #25561 )  
							
							
							
						 
						
							2023-06-24 17:24:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a985d587e1 
								
							 
						 
						
							
							
								
								Change labels and styles on the onboarding screen in web UI ( #25559 )  
							
							
							
						 
						
							2023-06-23 16:34:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0842a68532 
								
							 
						 
						
							
							
								
								Remove unique accounts condition from Home onboarding prompt ( #25556 )  
							
							
							
						 
						
							2023-06-23 14:44:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								00ec43914a 
								
							 
						 
						
							
							
								
								Add onboarding prompt when home feed too slow in web UI ( #25267 )  
							
							
							
						 
						
							2023-06-22 23:48:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8c1c8bd37 
								
							 
						 
						
							
							
								
								Fix j/k keyboard shortcuts on some status lists ( #25554 )  
							
							
							
						 
						
							2023-06-22 17:54:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogaminsk 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d2c26834f 
								
							 
						 
						
							
							
								
								Fix custom signup URL may not loaded ( #25531 )  
							
							
							
						 
						
							2023-06-22 12:10:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ian 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								69db507924 
								
							 
						 
						
							
							
								
								Change emoji picker icon ( #25479 )  
							
							
							
						 
						
							2023-06-21 17:58:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								804488d38e 
								
							 
						 
						
							
							
								
								Rewrite <AutosuggestHashtag /> as FC and TS ( #25481 )  
							
							
							
						 
						
							2023-06-19 14:11:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3b04e39534 
								
							 
						 
						
							
							
								
								[Glitch] Fix non-interactive upload container being given a button role and tabIndex  
							
							... 
							
							
							
							Port c9d06d10d4 
							
						 
						
							2023-06-18 14:10:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6c99479ef4 
								
							 
						 
						
							
							
								
								Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well. 
							
						 
						
							2023-06-18 13:41:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d795c2c70c 
								
							 
						 
						
							
							
								
								[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow  
							
							... 
							
							
							
							Port 39110d1d0a 
							
						 
						
							2023-06-18 12:11:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								b1b95ddd1f 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite emoji_mart_data_light as TS  
							
							... 
							
							
							
							Port 3b5e302f7f 
							
						 
						
							2023-06-18 12:11:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
							
							
								
							
							
								9bf63257fb 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <LoadingIndicator/> as FC and TS ( #25364 )  
							
							... 
							
							
							
							Port a86886b1fd 
							
						 
						
							2023-06-18 12:10:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								0a212cfa7f 
								
							 
						 
						
							
							
								
								[Glitch] Add missing report category translation  
							
							... 
							
							
							
							Port 1cb4514d0e 
							
						 
						
							2023-06-18 10:43:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
							
							
								
							
							
								cdec45eca9 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <LoadPending /> as FC and TS  
							
							... 
							
							
							
							Port dfaf59d99a 
							
						 
						
							2023-06-18 10:42:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f815bd5fd9 
								
							 
						 
						
							
							
								
								[Glitch] Change "bot" label to "automated"  
							
							... 
							
							
							
							Port 432a5d2d4b 
							
						 
						
							2023-06-18 10:40:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								65cbcce997 
								
							 
						 
						
							
							
								
								Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-18 10:36:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9d06d10d4 
								
							 
						 
						
							
							
								
								Fix non-interactive upload container being given a button role and tabIndex ( #25462 )  
							
							
							
						 
						
							2023-06-16 12:03:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f20698000f 
								
							 
						 
						
							
							
								
								Fix always redirecting to onboarding in web UI ( #25396 )  
							
							
							
						 
						
							2023-06-14 09:05:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39110d1d0a 
								
							 
						 
						
							
							
								
								Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )  
							
							
							
						 
						
							2023-06-13 22:30:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3b5e302f7f 
								
							 
						 
						
							
							
								
								Rewrite emoji_mart_data_light as TS ( #25138 )  
							
							
							
						 
						
							2023-06-13 19:28:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a86886b1fd 
								
							 
						 
						
							
							
								
								Rewrite <LoadingIndicator/> as FC and TS  ( #25364 )  
							
							
							
						 
						
							2023-06-13 19:26:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1cb4514d0e 
								
							 
						 
						
							
							
								
								Add missing report category translation ( #25400 )  
							
							
							
						 
						
							2023-06-13 15:05:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fefdc3244c 
								
							 
						 
						
							
							
								
								[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )  
							
							... 
							
							
							
							Port 68a192e718 
							
						 
						
							2023-06-11 13:33:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dfaf59d99a 
								
							 
						 
						
							
							
								
								Rewrite <LoadPending /> as FC and TS ( #25363 )  
							
							
							
						 
						
							2023-06-11 04:47:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								432a5d2d4b 
								
							 
						 
						
							
							
								
								Change "bot" label to "automated" ( #25356 )  
							
							
							
						 
						
							2023-06-11 04:47:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								20718a8b59 
								
							 
						 
						
							
							
								
								Fix some translation strings inconsistencies  
							
							
							
						 
						
							2023-06-10 19:21:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								34efd1a24c 
								
							 
						 
						
							
							
								
								Switch to using a common runtime chunk rather than locales  
							
							
							
						 
						
							2023-06-10 17:43:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								fb0d2de8fe 
								
							 
						 
						
							
							
								
								[Glitch] Change design of dropdowns in web UI  
							
							... 
							
							
							
							Port e4fd9503ec 
							
						 
						
							2023-06-10 17:10:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
							
							
								
							
							
								83ae40e192 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <LoadMore /> as FC and TS  
							
							... 
							
							
							
							Port fb5bf5cbf8 
							
						 
						
							2023-06-10 16:59:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c48ec9cb8c 
								
							 
						 
						
							
							
								
								Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug. 
							
						 
						
							2023-06-10 16:48:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								88c5ad3136 
								
							 
						 
						
							
							
								
								[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /  
							
							... 
							
							
							
							Port 1483a3ddfe 
							
						 
						
							2023-06-10 16:38:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									S.H 
								
							 
						 
						
							
							
							
							
								
							
							
								5a961f84cf 
								
							 
						 
						
							
							
								
								[Glitch] Fix not shown announcements in hometimeline.  
							
							... 
							
							
							
							Port a6c898f501 
							
						 
						
							2023-06-10 16:37:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								475185a2ee 
								
							 
						 
						
							
							
								
								[Glitch] Fix design issues with recent react-intl upgrade  
							
							... 
							
							
							
							Port c2c396157f 
							
						 
						
							2023-06-10 16:36:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Darius Kazemi 
								
							 
						 
						
							
							
							
							
								
							
							
								a8a30f1298 
								
							 
						 
						
							
							
								
								[Glitch] Add exclusive lists  
							
							... 
							
							
							
							Port bacb674921 
							
						 
						
							2023-06-10 16:36:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								bf23afa059 
								
							 
						 
						
							
							
								
								[Glitch] Add card with who invited you to join when displaying rules on sign-up  
							
							... 
							
							
							
							Port SCSS from 0766c9a631 
							
						 
						
							2023-06-10 16:30:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jed Fox 
								
							 
						 
						
							
							
							
							
								
							
							
								753385d3e0 
								
							 
						 
						
							
							
								
								[Glitch] Fix spacing of middle dots in the detailed status meta section  
							
							... 
							
							
							
							Port acc419b81b 
							
						 
						
							2023-06-10 16:29:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d8b0a732aa 
								
							 
						 
						
							
							
								
								Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components. 
							
						 
						
							2023-06-10 16:22:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								9e66c07be7 
								
							 
						 
						
							
							
								
								[Glitch] Fix /share and cleanup and reorganize frontend locale loading  
							
							... 
							
							
							
							Port b0780cfeed 
							
						 
						
							2023-06-10 16:18:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								734e186717 
								
							 
						 
						
							
							
								
								Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/mastodon/load_locale.js`:
  The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
  Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
  The file moved to `app/javascript/mastodon/locales/index.ts`.
  Did *not* port the changes as I want to try something a bit different. 
							
						 
						
							2023-06-10 15:32:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									S.H 
								
							 
						 
						
							
							
							
							
								
							
							
								a4d7a17089 
								
							 
						 
						
							
							
								
								[Glitch] Fix using Date.now() instead of intl.now()  
							
							... 
							
							
							
							Port b3f9a0da52 
							
						 
						
							2023-06-10 15:21:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								aa57f7e3e2 
								
							 
						 
						
							
							
								
								Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-10 15:17:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								9af04d5a46 
								
							 
						 
						
							
							
								
								[Glitch] Add a confirmation screen when suspending a domain  
							
							... 
							
							
							
							Port e9385e93e9 
							
						 
						
							2023-06-10 15:10:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b27a9a5903 
								
							 
						 
						
							
							
								
								Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-10 15:09:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								8188522bde 
								
							 
						 
						
							
							
								
								[Glitch] Fix prev/next buttons color in media viewer  
							
							... 
							
							
							
							Port 675672feb6 
							
						 
						
							2023-06-10 14:48:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								7e25fd9b0c 
								
							 
						 
						
							
							
								
								[Glitch] Translate CW, poll options and media descriptions  
							
							... 
							
							
							
							Port 69057467cb 
							
						 
						
							2023-06-10 14:48:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								93c714417f 
								
							 
						 
						
							
							
								
								Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`. 
							
						 
						
							2023-06-10 14:38:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								9e133e2527 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade react-intl  
							
							... 
							
							
							
							Port 44cd88adc4 
							
						 
						
							2023-06-10 14:37:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								85722a918d 
								
							 
						 
						
							
							
								
								Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, but we've deleted it.
  Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
  Reworked upstream, but the code was mostly in
  `app/javascript/locales/index.js` in glitch-soc.
  Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
  Deleted upstream, as upstream now directly loads the
  JSON at runtime.
  Deleted as well, will switch to runtime loading in
  an upcoming commit.
- `config/webpack/shared.js`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
  Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
  instead.
  Moved the glitch-soc logic there and deleted the file. 
							
						 
						
							2023-06-10 12:38:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								67d17ce194 
								
							 
						 
						
							
							
								
								Add legal as report category ( #23941 )  
							
							
							
						 
						
							2023-06-06 23:41:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4fd9503ec 
								
							 
						 
						
							
							
								
								Change design of dropdowns in web UI ( #25107 )  
							
							
							
						 
						
							2023-06-06 21:49:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alfe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fb5bf5cbf8 
								
							 
						 
						
							
							
								
								Rewrite <LoadMore /> as FC and TS  ( #25259 )  
							
							
							
						 
						
							2023-06-06 11:28:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6833732852 
								
							 
						 
						
							
							
								
								Fix autocomplete suggestions being cut off in compose form ( #25275 )  
							
							
							
						 
						
							2023-06-06 11:05:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ddc895282 
								
							 
						 
						
							
							
								
								Change follow button in account row to be more obvious in web UI ( #24956 )  
							
							
							
						 
						
							2023-06-06 04:14:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1483a3ddfe 
								
							 
						 
						
							
							
								
								Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )  
							
							
							
						 
						
							2023-06-05 17:32:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									S.H 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6c898f501 
								
							 
						 
						
							
							
								
								Fix not shown announcements in hometimeline. ( #25251 )  
							
							
							
						 
						
							2023-06-05 14:49:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
							
							
								
							
							
								7fc1297c3e 
								
							 
						 
						
							
							
								
								[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0  
							
							... 
							
							
							
							Port 89d6341c80 
							
						 
						
							2023-06-05 13:31:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5e876c2901 
								
							 
						 
						
							
							
								
								[Glitch] Fix null signUp URL in various places  
							
							... 
							
							
							
							Port 14bb6bb29a 
							
						 
						
							2023-06-05 13:28:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									y.takahashi 
								
							 
						 
						
							
							
							
							
								
							
							
								4993b6e800 
								
							 
						 
						
							
							
								
								[Glitch] Handle Surrogate Pairs in truncate()  
							
							... 
							
							
							
							Port 64b960b6b3 
							
						 
						
							2023-06-05 13:28:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c22fc2fa80 
								
							 
						 
						
							
							
								
								Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes. 
							
						 
						
							2023-06-05 13:25:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c2c396157f 
								
							 
						 
						
							
							
								
								Fix design issues with recent react-intl upgrade ( #25272 )  
							
							
							
						 
						
							2023-06-05 09:52:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Darius Kazemi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bacb674921 
								
							 
						 
						
							
							
								
								Add exclusive lists ( #22048 )  
							
							... 
							
							
							
							Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-06-05 09:37:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a5464f360 
								
							 
						 
						
							
							
								
								Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )  
							
							
							
						 
						
							2023-06-05 01:42:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ee771f5bad 
								
							 
						 
						
							
							
								
								Fix closeModal invocation ( #2239 )  
							
							... 
							
							
							
							Fixes  #2238 
Some call sites where missed in 382b2a506a 
						
							2023-06-04 22:05:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0766c9a631 
								
							 
						 
						
							
							
								
								Add card with who invited you to join when displaying rules on sign-up ( #23475 )  
							
							
							
						 
						
							2023-06-02 18:35:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jed Fox 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								acc419b81b 
								
							 
						 
						
							
							
								
								Fix spacing of middle dots in the detailed status meta section ( #25247 )  
							
							
							
						 
						
							2023-06-02 15:40:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b0780cfeed 
								
							 
						 
						
							
							
								
								Fix /share and cleanup and reorganize frontend locale loading ( #25240 )  
							
							
							
						 
						
							2023-06-02 15:00:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5fae2de454 
								
							 
						 
						
							
							
								
								Fix overflow behavior of account rows ( #25131 )  
							
							
							
						 
						
							2023-06-01 14:47:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									S.H 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b3f9a0da52 
								
							 
						 
						
							
							
								
								Fix using Date.now() instead of intl.now() ( #25234 )  
							
							
							
						 
						
							2023-06-01 13:46:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e9385e93e9 
								
							 
						 
						
							
							
								
								Add a confirmation screen when suspending a domain ( #25144 )  
							
							
							
						 
						
							2023-06-01 09:37:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								675672feb6 
								
							 
						 
						
							
							
								
								Fix prev/next buttons color in media viewer ( #25231 )  
							
							
							
						 
						
							2023-06-01 02:25:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								69057467cb 
								
							 
						 
						
							
							
								
								Translate CW, poll options and media descriptions ( #24175 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-06-01 00:10:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								44cd88adc4 
								
							 
						 
						
							
							
								
								Upgrade react-intl ( #24906 )  
							
							
							
						 
						
							2023-05-31 23:43:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dependabot[bot] 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								89d6341c80 
								
							 
						 
						
							
							
								
								Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 ( #25172 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2023-05-31 09:27:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								14bb6bb29a 
								
							 
						 
						
							
							
								
								Fix null signUp URL in various places ( #25190 )  
							
							
							
						 
						
							2023-05-30 19:01:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									y.takahashi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								64b960b6b3 
								
							 
						 
						
							
							
								
								Handle Surrogate Pairs in truncate() ( #25148 )  
							
							
							
						 
						
							2023-05-29 11:55:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5ed48e6878 
								
							 
						 
						
							
							
								
								Fix extraneous newlines  
							
							
							
						 
						
							2023-05-28 18:06:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								382b2a506a 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite actions/modal and reducers/modal with typescript  
							
							... 
							
							
							
							Port 38c6216082 
							
						 
						
							2023-05-28 17:49:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								6a592083f1 
								
							 
						 
						
							
							
								
								[Glitch] Fix export style of <LoadGap /> based on <Domain />  
							
							... 
							
							
							
							Port 4197b5e4c8 
							
						 
						
							2023-05-28 17:15:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								0009b4b574 
								
							 
						 
						
							
							
								
								[Glitch] Update inconsistent defaultMessage  
							
							... 
							
							
							
							Port e58c36d308 
							
						 
						
							2023-05-28 17:14:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0669783da8 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-28 17:01:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e7dc375aab 
								
							 
						 
						
							
							
								
								[Glitch] Change share action from being in action bar to being in dropdown in web UI  
							
							... 
							
							
							
							Port 1caa5ff39e 
							
						 
						
							2023-05-28 16:59:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								7bec63e6e2 
								
							 
						 
						
							
							
								
								[Glitch] Fix null signUp URL handling from  #25014  
							
							... 
							
							
							
							Port 40b948a1fb 
							
						 
						
							2023-05-28 16:52:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								017fbc7a74 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <LoadGap /> as FC and TS  
							
							... 
							
							
							
							Port 7336f3648b 
							
						 
						
							2023-05-28 16:48:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0e7466717f 
								
							 
						 
						
							
							
								
								Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  We removed it from glitch-soc.
  Keep it deleted. 
							
						 
						
							2023-05-28 16:41:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7d7db8977b 
								
							 
						 
						
							
							
								
								Fix import order with ESLint  
							
							... 
							
							
							
							Port d27216dc46 
							
						 
						
							2023-05-28 16:38:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								1cd7f5ff17 
								
							 
						 
						
							
							
								
								Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.eslintrc.js`:
  Upstream moved a configuration block in which we had added a glitch-only
  path.
  Moved the configuration block as upstream did.
- other files:
  Upstream reordered imports, and those files had different ones.
  Kept our version and reordered imports using the same rules. 
							
						 
						
							2023-05-28 15:54:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								9e5278ea7b 
								
							 
						 
						
							
							
								
								[Glitch] Add support for custom sign-up URLs  
							
							... 
							
							
							
							Port ca66e61b93 
							
						 
						
							2023-05-28 15:09:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								8f380a33fc 
								
							 
						 
						
							
							
								
								[Glitch] Fix video player offering to expand in a lightbox when it's in an iframe  
							
							... 
							
							
							
							Port 100840c06e 
							
						 
						
							2023-05-28 15:06:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6dbd44faea 
								
							 
						 
						
							
							
								
								Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-28 15:01:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a0bc0619ca 
								
							 
						 
						
							
							
								
								[Glitch] Use JSX syntax for Fragments  
							
							... 
							
							
							
							Port 5a16bd7bf4 
							
						 
						
							2023-05-28 14:56:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								8278907ff7 
								
							 
						 
						
							
							
								
								Merge commit '5a16bd7bf4591feb852364da9b84407438c9b7d6' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-28 14:32:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								6001f5ff36 
								
							 
						 
						
							
							
								
								[Glitch] Use the new JSX transform everywhere  
							
							... 
							
							
							
							Port 8f66126b10 
							
						 
						
							2023-05-28 14:18:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								9381f78166 
								
							 
						 
						
							
							
								
								Merge commit '8f66126b1010e0aaaa8b5f2a2f4ea8a28824e2b7' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-28 13:55:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								1347ca6eb0 
								
							 
						 
						
							
							
								
								fixup! [Glitch] Upgrade to React 18  
							
							
							
						 
						
							2023-05-26 18:44:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								60c7e559d8 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <TimelineHint /> as FC and TS  
							
							... 
							
							
							
							Port 9a472efe7c 
							
						 
						
							2023-05-25 23:58:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								6746e5d430 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <Skeleton/> as FC and TS  
							
							... 
							
							
							
							Port 8066118d1f 
							
						 
						
							2023-05-25 23:55:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								892b3c16f5 
								
							 
						 
						
							
							
								
								[Glitch] Allow scripts in post embed previews  
							
							... 
							
							
							
							Port 711a037660 
							
						 
						
							2023-05-25 23:52:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								e2ab9d4dad 
								
							 
						 
						
							
							
								
								Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 23:47:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								3b375ee395 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to React 18  
							
							... 
							
							
							
							Port 8d6aea3326 
							
						 
						
							2023-05-25 23:45:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								45d7358100 
								
							 
						 
						
							
							
								
								Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 23:18:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2e02d03524 
								
							 
						 
						
							
							
								
								Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 22:59:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								ad1098970b 
								
							 
						 
						
							
							
								
								Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
Additional changes:
- `Gemfile`:
  Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
  Upstream added the `captcha_enabled` setting in another place in the file. 
							
						 
						
							2023-05-25 22:49:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								ba73f0ea3a 
								
							 
						 
						
							
							
								
								[Glitch] Add polling and automatic redirection to /start on email confirmation  
							
							... 
							
							
							
							Port e60414792d 
							
						 
						
							2023-05-25 22:37:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f959f6cdbb 
								
							 
						 
						
							
							
								
								Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-25 22:18:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b0ec3bfcf9 
								
							 
						 
						
							
							
								
								[Glitch] Fix being unable to load past a full page of filtered posts in Home timeline  
							
							... 
							
							
							
							Port 7b54e47d03 
							
						 
						
							2023-05-25 22:00:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								4a1f4cb6a2 
								
							 
						 
						
							
							
								
								[Glitch] Fix UI crash in moderation interface when opening the media modal  
							
							... 
							
							
							
							Port 5241f7b2fd 
							
						 
						
							2023-05-25 21:57:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d728222121 
								
							 
						 
						
							
							
								
								[Glitch] Change "Sign in" to "Login"  
							
							... 
							
							
							
							Port 3869e8c210 
							
						 
						
							2023-05-25 21:52:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								602ae7f2f6 
								
							 
						 
						
							
							
								
								[Glitch] Fix videos being improperly positioned on safari  
							
							... 
							
							
							
							Port 0eed06073f 
							
						 
						
							2023-05-25 21:47:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								e6a7cfd12e 
								
							 
						 
						
							
							
								
								[Glitch] Add stricter ESLint rules for Typescript files  
							
							... 
							
							
							
							Port 5eeb40bdbe 
							
						 
						
							2023-05-25 21:43:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								e8fc445e14 
								
							 
						 
						
							
							
								
								[Glitch] Enable ESLint react/no-deprecated  
							
							... 
							
							
							
							Port b878e3d8df 
							
						 
						
							2023-05-25 21:07:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								79c43b61a6 
								
							 
						 
						
							
							
								
								[Glitch] Disable RTK safety middlewares  
							
							... 
							
							
							
							Port 6f8db56a01 
							
						 
						
							2023-05-25 20:57:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								7d9b7f28b8 
								
							 
						 
						
							
							
								
								[Glitch] Add type annotation for DisplayName component  
							
							... 
							
							
							
							Port 349cae0b57 
							
						 
						
							2023-05-25 20:57:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								ea1f9b4223 
								
							 
						 
						
							
							
								
								[Glitch] Rename Image component to ServerHeroImage  
							
							... 
							
							
							
							Port ab7716cff4 
							
						 
						
							2023-05-25 20:44:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b735954971 
								
							 
						 
						
							
							
								
								Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc. 
							
						 
						
							2023-05-25 20:43:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								69903b5830 
								
							 
						 
						
							
							
								
								Fix margins around small avatars (reply indicators, autocompletion suggestion) ( #2231 )  
							
							... 
							
							
							
							Fix regression from #2156  
							
						 
						
							2023-05-25 19:40:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb6f445b90 
								
							 
						 
						
							
							
								
								Greatly simplify history management code ( #2230 )  
							
							... 
							
							
							
							Fixes  #2220 
This drops the ability to shift+click on “Back” to get back to a pinned
column, but that was inconsistent, broken, and undocumented.
This also brings us slightly closer to upstream. 
						
							2023-05-25 19:14:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2f2f74efd8 
								
							 
						 
						
							
							
								
								[Glitch] Update style of captcha confirmation page to match sign-up form ( #2226 )  
							
							
							
						 
						
							2023-05-25 19:14:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								38c6216082 
								
							 
						 
						
							
							
								
								Rewrite actions/modal and reducers/modal with typescript ( #24833 )  
							
							
							
						 
						
							2023-05-25 15:42:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4197b5e4c8 
								
							 
						 
						
							
							
								
								Fix export style of <LoadGap /> based on <Domain /> ( #25128 )  
							
							
							
						 
						
							2023-05-25 13:03:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e58c36d308 
								
							 
						 
						
							
							
								
								Update inconsistent defaultMessage ( #25114 )  
							
							
							
						 
						
							2023-05-24 12:38:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1caa5ff39e 
								
							 
						 
						
							
							
								
								Change share action from being in action bar to being in dropdown in web UI ( #25105 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-05-24 11:04:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								40b948a1fb 
								
							 
						 
						
							
							
								
								Fix null signUp URL handling from  #25014  ( #25108 )  
							
							
							
						 
						
							2023-05-24 09:49:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7336f3648b 
								
							 
						 
						
							
							
								
								Rewrite <LoadGap /> as FC and TS ( #25042 )  
							
							
							
						 
						
							2023-05-24 09:20:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d27216dc46 
								
							 
						 
						
							
							
								
								Enforce import order with ESLint ( #25096 )  
							
							
							
						 
						
							2023-05-23 17:15:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ca66e61b93 
								
							 
						 
						
							
							
								
								Add support for custom sign-up URLs ( #25014 )  
							
							
							
						 
						
							2023-05-23 15:17:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								100840c06e 
								
							 
						 
						
							
							
								
								Fix video player offering to expand in a lightbox when it's in an iframe ( #25067 )  
							
							
							
						 
						
							2023-05-23 14:28:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a16bd7bf4 
								
							 
						 
						
							
							
								
								Use JSX syntax for Fragments ( #25093 )  
							
							
							
						 
						
							2023-05-23 11:47:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f66126b10 
								
							 
						 
						
							
							
								
								Use the new JSX transform ( #25064 )  
							
							
							
						 
						
							2023-05-23 10:52:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a472efe7c 
								
							 
						 
						
							
							
								
								Rewrite <TimelineHint /> as FC and TS ( #25091 )  
							
							
							
						 
						
							2023-05-23 10:04:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8066118d1f 
								
							 
						 
						
							
							
								
								Rewrite <Skeleton/> as FC and TS ( #25055 )  
							
							
							
						 
						
							2023-05-23 08:58:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								711a037660 
								
							 
						 
						
							
							
								
								Allow scripts in post embed previews ( #25071 )  
							
							
							
						 
						
							2023-05-22 21:18:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8d6aea3326 
								
							 
						 
						
							
							
								
								Upgrade to React 18 ( #24916 )  
							
							
							
						 
						
							2023-05-22 15:48:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								23a4ecf444 
								
							 
						 
						
							
							
								
								Remove duplicate  JPG type ( #25054 )  
							
							
							
						 
						
							2023-05-22 12:46:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								99e2e9b81f 
								
							 
						 
						
							
							
								
								Fix minor typos in comments and spec names ( #21831 )  
							
							
							
						 
						
							2023-05-19 17:13:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								058898802a 
								
							 
						 
						
							
							
								
								Fix AvatarComposite and DisplayName referencing undefined props ( #2222 )  
							
							
							
						 
						
							2023-05-17 23:24:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bec6a1cad4 
								
							 
						 
						
							
							
								
								Add hCaptcha support ( #25019 )  
							
							
							
						 
						
							2023-05-16 23:27:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e60414792d 
								
							 
						 
						
							
							
								
								Add polling and automatic redirection to /start on email confirmation ( #25013 )  
							
							
							
						 
						
							2023-05-16 18:03:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7b54e47d03 
								
							 
						 
						
							
							
								
								Fix being unable to load past a full page of filtered posts in Home timeline ( #24930 )  
							
							
							
						 
						
							2023-05-16 15:36:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa4c9730f6 
								
							 
						 
						
							
							
								
								Change composer highlight border size to be more noticeable ( #25010 )  
							
							
							
						 
						
							2023-05-16 14:59:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Steven Munn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52d36f0f98 
								
							 
						 
						
							
							
								
								Fix spelling of "Lets" on the onboarding page after clicking the confirmation email ( #24959 )  
							
							... 
							
							
							
							Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-05-15 22:42:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5241f7b2fd 
								
							 
						 
						
							
							
								
								Fix UI crash in moderation interface when opening the media modal ( #24816 )  
							
							
							
						 
						
							2023-05-11 12:41:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b8a2430642 
								
							 
						 
						
							
							
								
								Fix Onboarding Errors ( #24883 )  
							
							
							
						 
						
							2023-05-11 07:55:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3869e8c210 
								
							 
						 
						
							
							
								
								Change "Sign in" to "Login" ( #24942 )  
							
							
							
						 
						
							2023-05-10 20:17:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0eed06073f 
								
							 
						 
						
							
							
								
								Fix videos being improperly positioned on safari ( #24943 )  
							
							
							
						 
						
							2023-05-10 17:22:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5eeb40bdbe 
								
							 
						 
						
							
							
								
								Add stricter ESLint rules for Typescript files ( #24926 )  
							
							
							
						 
						
							2023-05-10 12:59:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b878e3d8df 
								
							 
						 
						
							
							
								
								Enable ESLint react/no-deprecated ( #24471 )  
							
							
							
						 
						
							2023-05-10 09:05:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2d5e257938 
								
							 
						 
						
							
							
								
								Rewrite logo.tsx as FC ( #24909 )  
							
							
							
						 
						
							2023-05-10 08:58:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f8db56a01 
								
							 
						 
						
							
							
								
								Disable RTK safety middlewares ( #24936 )  
							
							
							
						 
						
							2023-05-10 08:38:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f371464639 
								
							 
						 
						
							
							
								
								Remove our copy of image.d.ts as tsconfig already uses upstream's  
							
							
							
						 
						
							2023-05-10 00:00:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								96e99e2170 
								
							 
						 
						
							
							
								
								Run prettier on Typescript files  
							
							... 
							
							
							
							Port 51b83ed195 
							
						 
						
							2023-05-09 23:41:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								facc7ab03c 
								
							 
						 
						
							
							
								
								Merge commit '51b83ed19536b06ce3f57b260400ecec2d1dd187' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-05-09 23:37:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								5aa08826cf 
								
							 
						 
						
							
							
								
								[Glitch] Type Redux store and middleware  
							
							... 
							
							
							
							Port 6aeb162927 
							
						 
						
							2023-05-09 23:28:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								a56c71faba 
								
							 
						 
						
							
							
								
								[Glitch] Remove unused iOS agent sniffing function  
							
							... 
							
							
							
							Port 224d458f7e 
							
						 
						
							2023-05-09 23:20:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								526fe33e2f 
								
							 
						 
						
							
							
								
								[Glitch] Rework polyfills loading  
							
							... 
							
							
							
							Port a3a2414f0e 
							
						 
						
							2023-05-09 23:20:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								e22a88b512 
								
							 
						 
						
							
							
								
								[Glitch] Add more detailed type annotation for Account  
							
							... 
							
							
							
							Port 6579e3af7d 
							
						 
						
							2023-05-09 23:16:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								1a664560cc 
								
							 
						 
						
							
							
								
								Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  We deleted it.
  Kept it removed.
- `app/javascript/packs/public.jsx`:
  Upstream changed an import, we have slightly different ones.
  Ported upstream changes. 
							
						 
						
							2023-05-09 23:12:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								349cae0b57 
								
							 
						 
						
							
							
								
								Add type annotation for DisplayName component ( #24752 )  
							
							
							
						 
						
							2023-05-09 23:08:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab7716cff4 
								
							 
						 
						
							
							
								
								Rename Image component to ServerHeroImage ( #24894 )  
							
							
							
						 
						
							2023-05-09 23:08:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0fff2b67de 
								
							 
						 
						
							
							
								
								Disable broken onboarding code  
							
							
							
						 
						
							2023-05-09 23:03:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								5f2071d055 
								
							 
						 
						
							
							
								
								[Glitch] Enforce stricter rules for Typescript files  
							
							... 
							
							
							
							Port c8181eb0a4 
							
						 
						
							2023-05-09 22:56:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								b509b96504 
								
							 
						 
						
							
							
								
								[Glitch] Enforce React Rules of Hooks with eslint  
							
							... 
							
							
							
							Port d9b93bd15e 
							
						 
						
							2023-05-09 22:28:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								108720d7b0 
								
							 
						 
						
							
							
								
								[Glitch] Dont use CommonJS (require, module.exports) anywhere  
							
							... 
							
							
							
							Port 955179fc55 
							
						 
						
							2023-05-09 22:28:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c81d1b0d38 
								
							 
						 
						
							
							
								
								Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did. 
							
						 
						
							2023-05-09 22:12:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								887112a065 
								
							 
						 
						
							
							
								
								[Glitch] Add TypeScript support for mastodon alias and image imports  
							
							... 
							
							
							
							Port 7c1305b3a4 
							
						 
						
							2023-05-09 21:50:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								42bdc2add9 
								
							 
						 
						
							
							
								
								Copy hooks/useHovering.ts to glitch-soc  
							
							
							
						 
						
							2023-05-09 21:30:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								8e806b6e88 
								
							 
						 
						
							
							
								
								Fix IconButton prop types in glitch-soc  
							
							
							
						 
						
							2023-05-09 21:11:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								6415981056 
								
							 
						 
						
							
							
								
								[Glitch] Mark wheel events on scrollable list as passive  
							
							... 
							
							
							
							Port 89269e4b71 
							
						 
						
							2023-05-09 20:42:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								f94eb65cf9 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite Domain component as function component  
							
							... 
							
							
							
							Port 9818f34273 
							
						 
						
							2023-05-09 20:33:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								468dfffd26 
								
							 
						 
						
							
							
								
								[Glitch] Use LayoutType from is_mobile in actions/app  
							
							... 
							
							
							
							Port 5bc8e2d1fd 
							
						 
						
							2023-05-09 20:32:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								87a704f70b 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite RadioButton component as FC  
							
							... 
							
							
							
							Port 76264e3fe8 
							
						 
						
							2023-05-09 20:25:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								bd851d3b58 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite Image component as function component  
							
							... 
							
							
							
							Port a65d2d1045 
							
						 
						
							2023-05-09 20:24:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
							
							
								
							
							
								1edaf58fb9 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite <NotSignedInIndicator /> as FC  
							
							... 
							
							
							
							Port 490ccbf40b 
							
						 
						
							2023-05-09 20:24:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								8b568755ad 
								
							 
						 
						
							
							
								
								Merge commit '89269e4b713e3291a5c8c29b8d2e7b950b60eb35' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `tsconfig.json`:
  Upstream changed the config to properly process imports.
  Glitch-soc had previously already done so.
  Changed the config to better match upstream. 
							
						 
						
							2023-05-09 20:12:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51b83ed195 
								
							 
						 
						
							
							
								
								Use Prettier for ESLint formatting TypeScript ( #23631 )  
							
							
							
						 
						
							2023-05-09 19:02:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6aeb162927 
								
							 
						 
						
							
							
								
								Type Redux store and middleware ( #24843 )  
							
							
							
						 
						
							2023-05-09 16:56:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1f466fbbe 
								
							 
						 
						
							
							
								
								Fix javascript on moderation interface ( #24933 )  
							
							
							
						 
						
							2023-05-09 16:42:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								224d458f7e 
								
							 
						 
						
							
							
								
								Remove unused iOS agent sniffing function ( #24931 )  
							
							
							
						 
						
							2023-05-09 15:48:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a2414f0e 
								
							 
						 
						
							
							
								
								Rework polyfills loading ( #24907 )  
							
							
							
						 
						
							2023-05-09 14:55:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6579e3af7d 
								
							 
						 
						
							
							
								
								Add more detailed type annotation for Account ( #24815 )  
							
							
							
						 
						
							2023-05-09 12:09:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c8181eb0a4 
								
							 
						 
						
							
							
								
								Enforce stricter rules for Typescript files ( #24910 )  
							
							
							
						 
						
							2023-05-09 03:11:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d9b93bd15e 
								
							 
						 
						
							
							
								
								Enforce React Rules of Hooks with eslint ( #24911 )  
							
							
							
						 
						
							2023-05-09 03:09:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								955179fc55 
								
							 
						 
						
							
							
								
								Dont use CommonJS (require, module.exports) anywhere ( #24913 )  
							
							
							
						 
						
							2023-05-09 03:08:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								89269e4b71 
								
							 
						 
						
							
							
								
								Mark wheel events on scrollable list as passive ( #24914 )  
							
							
							
						 
						
							2023-05-09 03:07:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								ea04f33f50 
								
							 
						 
						
							
							
								
								[Glitch] Fixes build errors from some previous TS-related commits  
							
							... 
							
							
							
							Port 45579a26cf 
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								3d9e35375c 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite actions/app.ts and reducers/missed_updates.ts with createAction  
							
							... 
							
							
							
							Port 0999cb4601 
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								a33d6c946a 
								
							 
						 
						
							
							
								
								[Glitch] Remove MastodonMap TS type  
							
							... 
							
							
							
							Port 9a52a7f7a0 
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								e8243d5bbd 
								
							 
						 
						
							
							
								
								[Glitch] Add type annotation for some js files  
							
							... 
							
							
							
							Port e38b391940 
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5f0d2b6e3b 
								
							 
						 
						
							
							
								
								Copy Typescript type definitions to glitch-soc  
							
							
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f3af434c25 
								
							 
						 
						
							
							
								
								[Glitch] Fix incorrect import of redux store  
							
							... 
							
							
							
							Port 9c1929efad 
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								f4e3e309b1 
								
							 
						 
						
							
							
								
								[Glitch] use configureStore of redux-toolkit instead of createStore of redux  
							
							... 
							
							
							
							Port 8227af8dcc 
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bbd0e9caa6 
								
							 
						 
						
							
							
								
								[Glitch] Add ALT badges to media that has alternative text in web UI  
							
							... 
							
							
							
							Port 8131a5b330 
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a8939e9098 
								
							 
						 
						
							
							
								
								[Glitch] Change media elements to use aspect-ratio rather than compute height themselves  
							
							... 
							
							
							
							Port 598e63dad2 
							
						 
						
							2023-05-08 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								10f5329ddf 
								
							 
						 
						
							
							
								
								[Glitch] Fix incorrect box shadow on avatar in thread view  
							
							... 
							
							
							
							Port d37c0a1060 
							
						 
						
							2023-05-08 21:09:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								9ab89bb832 
								
							 
						 
						
							
							
								
								[Glitch] Add type annotation for Blurhash component  
							
							... 
							
							
							
							Port f50105779b 
							
						 
						
							2023-05-08 21:09:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								20f1f3aa7d 
								
							 
						 
						
							
							
								
								[Glitch] Add type annotation for IconButton component  
							
							... 
							
							
							
							Port 5a5975d7f7 
							
						 
						
							2023-05-08 21:09:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d77fbbed73 
								
							 
						 
						
							
							
								
								Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests. 
							
						 
						
							2023-05-08 19:28:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f89f3a8566 
								
							 
						 
						
							
							
								
								Fix glitch-soc's thread line styling ( #2214 )  
							
							... 
							
							
							
							Thread lines were misaligned in glitch-soc because we have less padding and
larger avatar sizes. 
							
						 
						
							2023-05-08 18:21:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								aff2d55b80 
								
							 
						 
						
							
							
								
								[Glitch] Add type annotation for RelativeTimestamp component  
							
							... 
							
							
							
							Port 15fd712464 
							
						 
						
							2023-05-08 16:02:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								a49707dacb 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite Icon and IconWithBadge with typescript  
							
							... 
							
							
							
							Port 81f75b1e0e 
							
						 
						
							2023-05-08 15:59:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7835f8fd22 
								
							 
						 
						
							
							
								
								[Glitch] Fix icons having an image role  
							
							... 
							
							
							
							Port 24b2c60beb 
							
						 
						
							2023-05-08 15:57:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								e9eab013e7 
								
							 
						 
						
							
							
								
								[Glitch] Fix audio player width in thread view  
							
							... 
							
							
							
							Port cf1bc4bb93 
							
						 
						
							2023-05-08 15:50:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								51479f5c28 
								
							 
						 
						
							
							
								
								[Glitch] Add eslint-plugin-jsdoc  
							
							... 
							
							
							
							Port f22b4e556c 
							
						 
						
							2023-05-08 15:48:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								09054f5485 
								
							 
						 
						
							
							
								
								[Glitch] Fix media description not being cleared  
							
							... 
							
							
							
							Port bfeccf6748 
							
						 
						
							2023-05-08 15:41:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								2d029dedd9 
								
							 
						 
						
							
							
								
								Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes. 
							
						 
						
							2023-05-08 15:28:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5d18840ab9 
								
							 
						 
						
							
							
								
								Fix more JS linting issues ( #2212 )  
							
							... 
							
							
							
							* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button 
							
						 
						
							2023-05-08 15:16:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9818f34273 
								
							 
						 
						
							
							
								
								Rewrite Domain component as function component ( #24896 )  
							
							
							
						 
						
							2023-05-08 15:12:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5bc8e2d1fd 
								
							 
						 
						
							
							
								
								Use LayoutType from is_mobile in actions/app ( #24863 )  
							
							
							
						 
						
							2023-05-08 15:10:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16c5354b8c 
								
							 
						 
						
							
							
								
								Fix some more JS linting issues ( #2211 )  
							
							... 
							
							
							
							* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js 
							
						 
						
							2023-05-08 14:02:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7c1305b3a4 
								
							 
						 
						
							
							
								
								Add TypeScript support for mastodon alias and image imports ( #24895 )  
							
							
							
						 
						
							2023-05-08 11:28:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								76264e3fe8 
								
							 
						 
						
							
							
								
								Rewrite RadioButton component as FC ( #24897 )  
							
							
							
						 
						
							2023-05-08 11:12:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a65d2d1045 
								
							 
						 
						
							
							
								
								Rewrite Image component as function component  ( #24893 )  
							
							
							
						 
						
							2023-05-08 11:12:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								490ccbf40b 
								
							 
						 
						
							
							
								
								Rewrite <NotSignedInIndicator /> as FC ( #24903 )  
							
							
							
						 
						
							2023-05-08 11:12:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									たいち ひ 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6fdbee240c 
								
							 
						 
						
							
							
								
								Rewrite <Check /> as FC ( #24901 )  
							
							
							
						 
						
							2023-05-08 08:26:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								de74acbe0c 
								
							 
						 
						
							
							
								
								Fix some more Javascript linting issues and discrepancies with upstream ( #2209 )  
							
							... 
							
							
							
							* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream 
							
						 
						
							2023-05-07 21:43:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ed0a407888 
								
							 
						 
						
							
							
								
								Fix thread lines not being properly updated when new posts are received ( #2210 )  
							
							
							
						 
						
							2023-05-07 20:06:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								179e38cf15 
								
							 
						 
						
							
							
								
								Reset language to default when cancelling a reply ( #2114 )  
							
							... 
							
							
							
							When cancelling a reply, the language was still set to the language of the replied to toot.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-05-07 18:45:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3fb7fe14c6 
								
							 
						 
						
							
							
								
								Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream ( #2208 )  
							
							... 
							
							
							
							* Run eslint --fix
* Fix linting issues in video player and reduce divergences with upstream
This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.
* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`
Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.
* Fix linting issue and bug in streaming/index.js
* Fix linting issues in config/webpack/shared.js
* Fix unused import in flavours/glitch/features/ui/index.js
* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx
* Fix linting issues in flavours/glitch/reducers
* Fix linting issues in glitch-soc onboarding modal
* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx
* Remove dead code for unused local setting navbar_under
* Fix various linting issues
* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream 
							
						 
						
							2023-05-07 18:22:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6f64c79ca4 
								
							 
						 
						
							
							
								
								Fix SCSS linting issues ( #2207 )  
							
							... 
							
							
							
							* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons
* Run stylelint --fix
* Avoid `@extend` directives with doodle modal CSS
* Drop use of `@extend` for notification cleanup buttons SCSS
* Run prettier on SCSS 
							
						 
						
							2023-05-07 15:04:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6207d243b 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2202 )  
							
							... 
							
							
							
							* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip] 
							
						 
						
							2023-05-07 13:37:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								140aa6b054 
								
							 
						 
						
							
							
								
								Rewrite VerifiedBadge component as function component ( #24892 )  
							
							
							
						 
						
							2023-05-07 09:10:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								746979f75d 
								
							 
						 
						
							
							
								
								Fix compose textarea scroll behavior ( #24872 )  
							
							
							
						 
						
							2023-05-05 18:58:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									S.H 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5811ccc611 
								
							 
						 
						
							
							
								
								Fix column back button error ( #24867 )  
							
							
							
						 
						
							2023-05-05 15:13:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f95125bd04 
								
							 
						 
						
							
							
								
								Fail ESLint for Warnings in CI ( #24836 )  
							
							
							
						 
						
							2023-05-04 09:48:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Florin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								27bafabb64 
								
							 
						 
						
							
							
								
								Fix Back button going outside the app ( #24835 )  
							
							
							
						 
						
							2023-05-04 08:14:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								45579a26cf 
								
							 
						 
						
							
							
								
								Fixes build errors from some previous TS-related commits ( #24811 )  
							
							
							
						 
						
							2023-05-03 16:28:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0999cb4601 
								
							 
						 
						
							
							
								
								Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )  
							
							
							
						 
						
							2023-05-03 15:28:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9a52a7f7a0 
								
							 
						 
						
							
							
								
								Remove MastodonMap TS type ( #24807 )  
							
							
							
						 
						
							2023-05-03 13:32:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e38b391940 
								
							 
						 
						
							
							
								
								Add type annotation for some js files ( #24787 )  
							
							
							
						 
						
							2023-05-03 11:43:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9c1929efad 
								
							 
						 
						
							
							
								
								Fix incorrect import of redux store ( #24805 )  
							
							
							
						 
						
							2023-05-03 10:29:45 +02:00