5c7df20c13 
								
							 
						 
						
							
							
								
								[Glitch] Add admin notifications for new Mastodon versions  
							
							... 
							
							
							
							Port front-end changes from 16681e0f20 
							
						 
						
							2023-09-02 15:20:06 +02:00  
				
					
						
							
							
								 
						
							
								c107512fa6 
								
							 
						 
						
							
							
								
								Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 15:02:29 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								728eb6a153 
								
							 
						 
						
							
							
								
								Fix wrong color on active icons with counters in web UI ( #26767 )  
							
							
							
						 
						
							2023-09-02 14:46:26 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								4adb12ca91 
								
							 
						 
						
							
							
								
								Fix test failures due to different default settings in glitch-soc  
							
							
							
						 
						
							2023-09-02 14:24:47 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								64e661b930 
								
							 
						 
						
							
							
								
								[Glitch] Allow filter form in profiles directory to wrap  
							
							... 
							
							
							
							Port f1d250135c 
							
						 
						
							2023-09-02 13:55:53 +02:00  
				
					
						
							
							
								 
						
							
								6c05ac4068 
								
							 
						 
						
							
							
								
								[Glitch] Add an explanation banner on switching to single column mode  
							
							... 
							
							
							
							Port 40b69cc1cd 
							
						 
						
							2023-09-02 13:54:33 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f5bd2014e2 
								
							 
						 
						
							
							
								
								[Glitch] Fix sign up steps progress layout in right-to-left locales  
							
							... 
							
							
							
							Port 21ec596dab 
							
						 
						
							2023-09-02 13:42:50 +02:00  
				
					
						
							
							
								 
						
							
								beb5fcd0dc 
								
							 
						 
						
							
							
								
								[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts  
							
							... 
							
							
							
							Port 74eb7dbf2d 
							
						 
						
							2023-09-02 13:42:15 +02:00  
				
					
						
							
							
								 
						
							
								871ab84854 
								
							 
						 
						
							
							
								
								[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts  
							
							... 
							
							
							
							Port ae6cf33321 
							
						 
						
							2023-09-02 13:39:02 +02:00  
				
					
						
							
							
								 
						
							
								ffb486648c 
								
							 
						 
						
							
							
								
								Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 13:34:54 +02:00  
				
					
						
							
							
								 
						
							
								afc3b12217 
								
							 
						 
						
							
							
								
								Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version. 
							
						 
						
							2023-09-02 13:31:15 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								fbbe9f1c12 
								
							 
						 
						
							
							
								
								Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 12:20:33 +02:00  
				
					
						
							
							
								 
						
							
								cb50d95c06 
								
							 
						 
						
							
							
								
								[Glitch] Add search options to search popout in web UI  
							
							... 
							
							
							
							Port bceb893159 
							
						 
						
							2023-09-02 12:09:07 +02:00  
				
					
						
							
							
								 
						
							
								c8aa3d6d06 
								
							 
						 
						
							
							
								
								Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 12:02:23 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								023673c0d9 
								
							 
						 
						
							
							
								
								[Glitch] Add `data-nosnippet` attribute to remote posts and local posts with `noindex`  
							
							... 
							
							
							
							Port c3a42e1280 
							
						 
						
							2023-09-02 11:49:35 +02:00  
				
					
						
							
							
								 
						
							
								6b7c47311d 
								
							 
						 
						
							
							
								
								Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-09-02 11:41:40 +02:00  
				
					
						
							
							
								 
						
							
								05093266e6 
								
							 
						 
						
							
							
								
								Fix some video encoding failing due to uneven dimensions ( #26766 )  
							
							
							
						 
						
							2023-09-02 09:02:44 +02:00  
				
					
						
							
							
								 
						
							
								16681e0f20 
								
							 
						 
						
							
							
								
								Add admin notifications for new Mastodon versions ( #26582 )  
							
							
							
						 
						
							2023-09-01 17:47:07 +02:00  
				
					
						
							
							
								 
						
							
								be991f1d18 
								
							 
						 
						
							
							
								
								Move to ioredis for streaming ( #26581 )  
							
							... 
							
							
							
							Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com> 
							
						 
						
							2023-09-01 17:44:28 +02:00  
				
					
						
							
							
								 
						
							
								9e26cd5503 
								
							 
						 
						
							
							
								
								Add `authorized_fetch` server setting in addition to env var ( #25798 )  
							
							
							
						 
						
							2023-09-01 15:41:10 +02:00  
				
					
						
							
							
								 
						
							
								6c4c72497a 
								
							 
						 
						
							
							
								
								Fix search popout including full-text search instructions when full-text search is disabled ( #26755 )  
							
							
							
						 
						
							2023-09-01 15:13:27 +02:00  
				
					
						
							
							
								 
						
							
								5c0a9aac3b 
								
							 
						 
						
							
							
								
								Revert to using primary database in IndexingScheduler ( #26754 )  
							
							
							
						 
						
							2023-09-01 15:09:44 +02:00  
				
					
						
							
							
								 
						
							
								bb0edb178f 
								
							 
						 
						
							
							
								
								Update dependency pg to v1.5.4 ( #26750 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-09-01 10:48:49 +02:00  
				
					
						
							
							
								 
						
							
								630e558677 
								
							 
						 
						
							
							
								
								Update dependency oj to v3.16.1 ( #26749 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-09-01 10:17:08 +02:00  
				
					
						
							
							
								 
						
							
								e754083e8a 
								
							 
						 
						
							
							
								
								Fix unmatched quotes and prefixes causing search to fail ( #26701 )  
							
							
							
						 
						
							2023-09-01 09:43:12 +02:00  
				
					
						
							
							
								 
						
							
								872145d1c2 
								
							 
						 
						
							
							
								
								Fix not being able to invoke phrase search using unicode quotation marks ( #26687 )  
							
							
							
						 
						
							2023-09-01 09:27:03 +02:00  
				
					
						
							
							
								 
						
							
								0008458128 
								
							 
						 
						
							
							
								
								Fix search queries with slash causing or-condition ( #26699 )  
							
							
							
						 
						
							2023-08-31 19:04:44 +02:00  
				
					
						
							
							
								 
						
							
								9bb2fb6b14 
								
							 
						 
						
							
							
								
								Change importers to avoid a few inefficiencies ( #26721 )  
							
							
							
						 
						
							2023-08-31 19:04:27 +02:00  
				
					
						
							
							
								 
						
							
								ecd76fa413 
								
							 
						 
						
							
							
								
								Fix videos not playing in some browsers due to unsupported color space ( #26745 )  
							
							
							
						 
						
							2023-08-31 17:21:06 +02:00  
				
					
						
							
							
								 
						
							
								1471be8225 
								
							 
						 
						
							
							
								
								Fix `AddUniqueIndexOnPreviewCardsStatuses` migration requiring PostgreSQL 12+ in some cases ( #26737 )  
							
							
							
						 
						
							2023-08-31 15:47:30 +02:00  
				
					
						
							
							
								 
						
							
								6b58cfd8dd 
								
							 
						 
						
							
							
								
								Fix searching by username by reverting account verbatim tokenizer to `standard` ( #26739 )  
							
							
							
						 
						
							2023-08-31 15:35:58 +02:00  
				
					
						
							
							
								 
						
							
								cffc5d2b01 
								
							 
						 
						
							
							
								
								Fix comment in build image workflow ( #26740 )  
							
							
							
						 
						
							2023-08-31 14:59:50 +02:00  
				
					
						
							
							
								 
						
							
								f1d250135c 
								
							 
						 
						
							
							
								
								Allow filter form in profiles directory to wrap ( #26682 )  
							
							
							
						 
						
							2023-08-31 14:15:58 +02:00  
				
					
						
							
							
								 
						
							
								ccca542db1 
								
							 
						 
						
							
							
								
								Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated access when public preview is disabled ( #26237 )  
							
							
							
						 
						
							2023-08-31 13:53:24 +02:00  
				
					
						
							
							
								 
						
							
								336ec503c2 
								
							 
						 
						
							
							
								
								Add avatar image to webfinger responses ( #26558 )  
							
							
							
						 
						
							2023-08-31 13:46:27 +02:00  
				
					
						
							
							
								 
						
							
								40b69cc1cd 
								
							 
						 
						
							
							
								
								Add an explanation banner on switching to single column mode ( #26019 )  
							
							
							
						 
						
							2023-08-31 12:18:46 +02:00  
				
					
						
							
							
								 
						
							
								cb9f96036c 
								
							 
						 
						
							
							
								
								Add suggestion for secure cyphers to nginx.conf ( #26349 )  
							
							
							
						 
						
							2023-08-31 12:17:10 +02:00  
				
					
						
							
							
								 
						
							
								430eac3eb1 
								
							 
						 
						
							
							
								
								Update dependency @babel/preset-env to v7.22.14 ( #26732 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-08-31 10:23:24 +02:00  
				
					
						
							
							
								 
						
							
								ef9a85a2d8 
								
							 
						 
						
							
							
								
								Update dependency webpack-bundle-analyzer to v4.9.1 ( #26733 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-08-31 09:52:23 +02:00  
				
					
						
							
							
								 
						
							
								15949e42c2 
								
							 
						 
						
							
							
								
								Update dependency glob to v10.3.4 ( #26734 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-08-31 09:49:34 +02:00  
				
					
						
							
							
								 
						
							
								5c38c3a9a1 
								
							 
						 
						
							
							
								
								Change text extraction in `PlainTextFormatter` to be faster ( #26727 )  
							
							
							
						 
						
							2023-08-30 17:36:16 +02:00  
				
					
						
							
							
								 
						
							
								21ec596dab 
								
							 
						 
						
							
							
								
								Fix sign up steps progress layout in right-to-left locales ( #26728 )  
							
							
							
						 
						
							2023-08-30 16:29:52 +02:00  
				
					
						
							
							
								 
						
							
								bba76e7267 
								
							 
						 
						
							
							
								
								Change `language:` to attempt to match to a known value in search ( #26663 )  
							
							
							
						 
						
							2023-08-30 16:07:26 +02:00  
				
					
						
							
							
								 
						
							
								0e1bff178e 
								
							 
						 
						
							
							
								
								Update dependency chewy to v7.3.4 ( #26717 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> 
							
						 
						
							2023-08-30 09:45:13 +02:00