df6602ede1 
								
							 
						 
						
							
							
								
								[Glitch] Fix account header image missing in low-res  
							
							... 
							
							
							
							Port d7b8c6db7e 
							
						 
						
							2023-04-09 12:01:55 +02:00  
				
					
						
							
							
								 
						
							
								74c61b05ae 
								
							 
						 
						
							
							
								
								[Glitch] Fix height of announcements not being updated when using reduced animations  
							
							... 
							
							
							
							Port ffd5b2eea4 
							
						 
						
							2023-04-09 12:01:11 +02:00  
				
					
						
							
							
								 
						
							
								791e712a80 
								
							 
						 
						
							
							
								
								[Glitch] Update display_media typing to string  
							
							... 
							
							
							
							Port 17b2fd2177 
							
						 
						
							2023-04-09 12:00:26 +02:00  
				
					
						
							
							
								 
						
							
								f3f7ef2d13 
								
							 
						 
						
							
							
								
								[Glitch] Set marginRight as string  
							
							... 
							
							
							
							Port 927b2fd138 
							
						 
						
							2023-04-09 11:59:42 +02:00  
				
					
						
							
							
								 
						
							
								358e4067bb 
								
							 
						 
						
							
							
								
								[Glitch] SUBMIT doesn't exist on XMLHttpRequest  
							
							... 
							
							
							
							Port ab3f23da91 
							
						 
						
							2023-04-09 11:58:45 +02:00  
				
					
						
							
							
								 
						
							
								0f62451424 
								
							 
						 
						
							
							
								
								[Glitch] HTML string attributes set as booleans  
							
							... 
							
							
							
							Port a425915ce7 
							
						 
						
							2023-04-09 11:56:02 +02:00  
				
					
						
							
							
								 
						
							
								ce12934f5b 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency. 
							
						 
						
							2023-04-09 11:45:08 +02:00  
				
					
						
							
							
								 
						
							
								ff168ef202 
								
							 
						 
						
							
							
								
								Fix most rubocop issues ( #2165 )  
							
							... 
							
							
							
							* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues
* Run rubocop --autocorrect-all on db/
* Run rubocop --autocorrect-all on `spec/` and fix remaining issues 
							
						 
						
							2023-04-09 11:25:30 +02:00  
				
					
						
							
							
								 
						
							
								29a91b871e 
								
							 
						 
						
							
							
								
								Fix glitch-soc Markdown linting issues ( #2168 )  
							
							
							
						 
						
							2023-04-08 17:23:24 +02:00  
				
					
						
							
							
								 
						
							
								10469a0b85 
								
							 
						 
						
							
							
								
								Move locale-data back to `app/javascript/mastodon/locales/locale-data` ( #2169 )  
							
							... 
							
							
							
							This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten. 
							
						 
						
							2023-04-08 14:11:40 +02:00  
				
					
						
							
							
								 
						
							
								99e3e152cd 
								
							 
						 
						
							
							
								
								Fix crash in NotifyService when trying to send an email notification for post edits ( #24460 )  
							
							
							
						 
						
							2023-04-08 12:51:14 +02:00  
				
					
						
							
							
								 
						
							
								dc6befe1a4 
								
							 
						 
						
							
							
								
								Fix migrating from upstream to glitch-soc messing with hide_notifications mute settings ( #2164 )  
							
							
							
						 
						
							2023-04-07 20:56:11 +02:00  
				
					
						
							
							
								 
						
							
								c3a8f6a0a3 
								
							 
						 
						
							
							
								
								Fix glitch-soc HAML linting issues ( #2166 )  
							
							
							
						 
						
							2023-04-07 20:55:28 +02:00  
				
					
						
							
							
								 
						
							
								aa136cf2fa 
								
							 
						 
						
							
							
								
								Fix tooltip for dates without time ( #24244 )  
							
							
							
						 
						
							2023-04-07 16:19:43 +02:00  
				
					
						
							
							
								 
						
							
								9ef9974ff2 
								
							 
						 
						
							
							
								
								Fix loading spinner + infinite scroll for private mentions ( #24446 )  
							
							
							
						 
						
							2023-04-07 15:44:31 +02:00  
				
					
						
							
							
								 
						
							
								9d39b111f1 
								
							 
						 
						
							
							
								
								Expand coverage for "system checks" ( #24216 )  
							
							
							
						 
						
							2023-04-07 14:39:34 +02:00  
				
					
						
							
							
								 
						
							
								862861069d 
								
							 
						 
						
							
							
								
								Update Node.js to 16.20.0 ( #24316 )  
							
							
							
						 
						
							2023-04-07 14:26:11 +02:00  
				
					
						
							
							
								 
						
							
								d193bc8c5c 
								
							 
						 
						
							
							
								
								Remove unused methods in 2FA OTP Auth Controller ( #24220 )  
							
							
							
						 
						
							2023-04-07 14:13:53 +02:00  
				
					
						
							
							
								 
						
							
								26682d4c22 
								
							 
						 
						
							
							
								
								Remove duplicate ca-certificates Docker install ( #24231 )  
							
							
							
						 
						
							2023-04-07 14:10:12 +02:00  
				
					
						
							
							
								 
						
							
								c0886dee14 
								
							 
						 
						
							
							
								
								Remove Array.prototype.includes polyfill ( #24234 )  
							
							
							
						 
						
							2023-04-07 13:03:42 +02:00  
				
					
						
							
							
								 
						
							
								d7b8c6db7e 
								
							 
						 
						
							
							
								
								Fix account header image missing in low-res ( #24433 )  
							
							
							
						 
						
							2023-04-07 11:57:43 +02:00  
				
					
						
							
							
								 
						
							
								369f239f7b 
								
							 
						 
						
							
							
								
								Fix user settings migration script failing in some cases ( #24453 )  
							
							
							
						 
						
							2023-04-07 11:55:15 +02:00  
				
					
						
							
							
								 
						
							
								3d8bd093b9 
								
							 
						 
						
							
							
								
								Bump version to v4.1.2 ( #24427 )  
							
							
							
						 
						
							2023-04-07 09:01:57 +02:00  
				
					
						
							
							
								 
						
							
								c9f3438efe 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24378 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-06 23:24:31 +09:00  
				
					
						
							
							
								 
						
							
								b8ff498781 
								
							 
						 
						
							
							
								
								Fix DevContainer post-create warnings ( #23977 )  
							
							
							
						 
						
							2023-04-05 23:58:44 +02:00  
				
					
						
							
							
								 
						
							
								02d5c69404 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2126 )  
							
							... 
							
							
							
							* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization 
							
						 
						
							2023-04-05 20:28:34 +02:00  
				
					
						
							
							
								 
						
							
								9d08b81193 
								
							 
						 
						
							
							
								
								Fix user archive takeouts when using OpenStack Swift ( #24431 )  
							
							
							
						 
						
							2023-04-05 19:31:49 +02:00  
				
					
						
							
							
								 
						
							
								c76d19e00b 
								
							 
						 
						
							
							
								
								Check for missing JSON translations ( #24338 )  
							
							
							
						 
						
							2023-04-05 16:33:55 +02:00  
				
					
						
							
							
								 
						
							
								ffd5b2eea4 
								
							 
						 
						
							
							
								
								Fix height of announcements not being updated when using reduced animations ( #24354 )  
							
							
							
						 
						
							2023-04-05 14:58:10 +02:00  
				
					
						
							
							
								 
						
							
								966d7cff2a 
								
							 
						 
						
							
							
								
								Bump rubocop from 1.48.1 to 1.49.0 ( #24387 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-05 14:01:23 +02:00  
				
					
						
							
							
								 
						
							
								4fcfeaba36 
								
							 
						 
						
							
							
								
								Bump puma from 6.1.1 to 6.2.1 ( #24402 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-05 13:57:21 +02:00  
				
					
						
							
							
								 
						
							
								e2f58c8c82 
								
							 
						 
						
							
							
								
								Bump capybara from 3.38.0 to 3.39.0 ( #24395 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-05 13:29:14 +02:00  
				
					
						
							
							
								 
						
							
								60602fd846 
								
							 
						 
						
							
							
								
								Bump aws-sdk-s3 from 1.119.2 to 1.120.0 ( #24401 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-05 13:26:33 +02:00  
				
					
						
							
							
								 
						
							
								17b2fd2177 
								
							 
						 
						
							
							
								
								Update display_media typing to string ( #24416 )  
							
							
							
						 
						
							2023-04-05 13:20:21 +02:00  
				
					
						
							
							
								 
						
							
								927b2fd138 
								
							 
						 
						
							
							
								
								Set marginRight as string ( #24422 )  
							
							
							
						 
						
							2023-04-05 10:57:36 +02:00  
				
					
						
							
							
								 
						
							
								ab3f23da91 
								
							 
						 
						
							
							
								
								SUBMIT doesn't exist on XMLHttpRequest ( #24423 )  
							
							
							
						 
						
							2023-04-05 10:56:55 +02:00  
				
					
						
							
							
								 
						
							
								cd14f712ad 
								
							 
						 
						
							
							
								
								Enable Stylelint property-no-unknown ( #24404 )  
							
							
							
						 
						
							2023-04-05 09:04:08 +02:00  
				
					
						
							
							
								 
						
							
								45848d6547 
								
							 
						 
						
							
							
								
								Fix styling regressions from RTL layout refactor ( #24415 )  
							
							
							
						 
						
							2023-04-04 16:48:34 +02:00  
				
					
						
							
							
								 
						
							
								ec0c104bf2 
								
							 
						 
						
							
							
								
								Ensure tabIndex is number instead of string ( #24409 )  
							
							
							
						 
						
							2023-04-04 16:33:44 +02:00  
				
					
						
							
							
								 
						
							
								a425915ce7 
								
							 
						 
						
							
							
								
								HTML string attributes set as booleans ( #24408 )  
							
							
							
						 
						
							2023-04-04 16:33:33 +02:00  
				
					
						
							
							
								 
						
							
								b80a7b031b 
								
							 
						 
						
							
							
								
								Add typechecking in CI ( #24405 )  
							
							
							
						 
						
							2023-04-04 16:32:08 +02:00  
				
					
						
							
							
								 
						
							
								0358abe73a 
								
							 
						 
						
							
							
								
								Bump typescript from 4.9.5 to 5.0.3 ( #24398 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-04 15:05:12 +02:00  
				
					
						
							
							
								 
						
							
								538914def2 
								
							 
						 
						
							
							
								
								Bump addressable from 2.8.1 to 2.8.2 ( #24392 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-04 14:25:08 +02:00  
				
					
						
							
							
								 
						
							
								aa08a72654 
								
							 
						 
						
							
							
								
								Merge pull request  #2161  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-04-04 13:17:45 +02:00  
				
					
						
							
							
								 
						
							
								69ca6316ec 
								
							 
						 
						
							
							
								
								[Glitch] Fix inconsistent radius in drawer  
							
							... 
							
							
							
							Port fa98363a27 
							
						 
						
							2023-04-04 12:51:24 +02:00  
				
					
						
							
							
								 
						
							
								d13ef49b15 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-04-04 12:45:12 +02:00  
				
					
						
							
							
								 
						
							
								0e919397db 
								
							 
						 
						
							
							
								
								Fix unescaped user input in LDAP query ( #24379 )  
							
							
							
						 
						
							2023-04-04 12:42:38 +02:00  
				
					
						
							
							
								 
						
							
								af01ab7efe 
								
							 
						 
						
							
							
								
								Merge pull request  #2159  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-04-04 12:01:52 +02:00  
				
					
						
							
							
								 
						
							
								fa98363a27 
								
							 
						 
						
							
							
								
								Fix inconsistent radius in drawer ( #24407 )  
							
							
							
						 
						
							2023-04-04 11:41:05 +02:00  
				
					
						
							
							
								 
						
							
								a8cd1b1238 
								
							 
						 
						
							
							
								
								Bump glob from 9.3.2 to 9.3.4 ( #24383 )  
							
							... 
							
							
							
							Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 
							
						 
						
							2023-04-04 11:25:25 +02:00