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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d37c0a1060 
								
							 
						 
						
							
							
								
								Fix incorrect box shadow on avatar in thread view  ( #24800 )  
							
							
							
						 
						
							2023-05-03 09:11:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8227af8dcc 
								
							 
						 
						
							
							
								
								use configureStore of redux-toolkit instead of createStore of redux ( #24790 )  
							
							
							
						 
						
							2023-05-02 20:39:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8131a5b330 
								
							 
						 
						
							
							
								
								Add ALT badges to media that has alternative text in web UI ( #24782 )  
							
							
							
						 
						
							2023-05-02 14:47:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								598e63dad2 
								
							 
						 
						
							
							
								
								Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )  
							
							
							
						 
						
							2023-05-02 13:58:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f50105779b 
								
							 
						 
						
							
							
								
								Add type annotation for Blurhash component ( #24750 )  
							
							
							
						 
						
							2023-05-02 12:54:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a5975d7f7 
								
							 
						 
						
							
							
								
								Add type annotation for IconButton component ( #24753 )  
							
							
							
						 
						
							2023-05-02 12:53:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fc56eda94b 
								
							 
						 
						
							
							
								
								Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 ( #24755 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-05-01 18:23:57 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								15fd712464 
								
							 
						 
						
							
							
								
								Add type annotation for RelativeTimestamp component ( #24749 )  
							
							
							
						 
						
							2023-05-01 00:51:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								81f75b1e0e 
								
							 
						 
						
							
							
								
								Rewrite Icon and IconWithBadge with typescript ( #24747 )  
							
							
							
						 
						
							2023-05-01 00:51:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0a08e9d3d3 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24678 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-30 17:02:11 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								678d836c7d 
								
							 
						 
						
							
							
								
								Fix pop-in player placeholder layout in thread view ( #24715 )  
							
							
							
						 
						
							2023-04-30 06:42:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf1bc4bb93 
								
							 
						 
						
							
							
								
								Fix audio player width in thread view ( #24713 )  
							
							
							
						 
						
							2023-04-30 06:42:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f22b4e556c 
								
							 
						 
						
							
							
								
								Add eslint-plugin-jsdoc ( #24719 )  
							
							
							
						 
						
							2023-04-30 02:29:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bfeccf6748 
								
							 
						 
						
							
							
								
								Fix media description not being cleared ( #24720 )  
							
							
							
						 
						
							2023-04-30 02:29:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								e79998a11a 
								
							 
						 
						
							
							
								
								Restore translations from not-yet-ported onboarding changes as glitch-soc translations  
							
							
							
						 
						
							2023-04-29 19:38:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								38eeed6cbf 
								
							 
						 
						
							
							
								
								[Glitch] Change logo version in header based on screen size in web UI  
							
							... 
							
							
							
							Port 6028d047b9 
							
						 
						
							2023-04-29 18:54:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								1033598416 
								
							 
						 
						
							
							
								
								[Glitch] Enable formatjs/prefer-pound-in-plural  
							
							... 
							
							
							
							Port 2daa5a1549 
							
						 
						
							2023-04-29 18:38:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								edec08b970 
								
							 
						 
						
							
							
								
								Disable full-width media in thread view  
							
							
							
						 
						
							2023-04-29 12:43:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								cb97a92954 
								
							 
						 
						
							
							
								
								[Glitch] Fix thread lines in right-to-left locales ( #24714 )  
							
							... 
							
							
							
							Port 105f8687e4 
							
						 
						
							2023-04-29 12:21:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								103b6de8b2 
								
							 
						 
						
							
							
								
								[Glitch] Fix sass warning about deprecated slash as division ( #24653 )  
							
							... 
							
							
							
							Port 1527b02c6d 
							
						 
						
							2023-04-29 12:17:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7b01b7c3bf 
								
							 
						 
						
							
							
								
								[Glitch] Add lines to threads in web UI  
							
							... 
							
							
							
							Port 290e4aba31 
							
						 
						
							2023-04-29 12:08:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8015297f9e 
								
							 
						 
						
							
							
								
								[Glitch] Change label from "For you" to "People" on explore screen in web UI  
							
							... 
							
							
							
							Port 7cf963eec2 
							
						 
						
							2023-04-29 11:34:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chike Nwaenie 
								
							 
						 
						
							
							
							
							
								
							
							
								374a109546 
								
							 
						 
						
							
							
								
								[Glitch] Change styling of the recommended accounts to allow bio to be more visible  
							
							... 
							
							
							
							Port e1b4eeb636 
							
						 
						
							2023-04-29 11:28:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								0091b28ffe 
								
							 
						 
						
							
							
								
								[Glitch] Use CSS to trim long card descriptions  
							
							... 
							
							
							
							Port e713c545b8 
							
						 
						
							2023-04-29 11:26:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								11b34a903a 
								
							 
						 
						
							
							
								
								[Glitch] Fix infinite loop in emoji replacement code  
							
							... 
							
							
							
							Port fbb4de3dbc 
							
						 
						
							2023-04-29 11:14:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								0a813d96db 
								
							 
						 
						
							
							
								
								[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)  
							
							... 
							
							
							
							Port 37886c28da 
							
						 
						
							2023-04-29 11:12:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								66bda4713e 
								
							 
						 
						
							
							
								
								[Glitch] Allow == when null checking  
							
							... 
							
							
							
							Port c1a7e38d2b 
							
						 
						
							2023-04-29 11:09:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								12b935fadf 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream. 
							
						 
						
							2023-04-29 10:44:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								105f8687e4 
								
							 
						 
						
							
							
								
								Fix thread lines in right-to-left locales ( #24714 )  
							
							
							
						 
						
							2023-04-28 13:12:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2a3a110f00 
								
							 
						 
						
							
							
								
								Fix wrong classes audio and video instead of audio-player and video-player in CSS ( #24711 )  
							
							
							
						 
						
							2023-04-28 11:15:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8979b70975 
								
							 
						 
						
							
							
								
								Add default post text to onboarding flow in web UI ( #24705 )  
							
							
							
						 
						
							2023-04-28 10:05:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6028d047b9 
								
							 
						 
						
							
							
								
								Change logo version in header based on screen size in web UI ( #24707 )  
							
							
							
						 
						
							2023-04-28 10:00:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7cf963eec2 
								
							 
						 
						
							
							
								
								Change label from "For you" to "People" on explore screen in web UI ( #24706 )  
							
							
							
						 
						
							2023-04-28 08:54:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a5bc4ea550 
								
							 
						 
						
							
							
								
								Fix refering to unused preview-card CSS class instead of status-card ( #24696 )  
							
							
							
						 
						
							2023-04-28 07:50:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d8a06c1375 
								
							 
						 
						
							
							
								
								Fix preview cards layout in thread view ( #24677 )  
							
							
							
						 
						
							2023-04-27 01:45:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d4511f2a76 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24617 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-27 04:55:06 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1565af1caf 
								
							 
						 
						
							
							
								
								[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )  
							
							... 
							
							
							
							Port 4520e6473a 
							
						 
						
							2023-04-26 21:30:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1527b02c6d 
								
							 
						 
						
							
							
								
								Fix sass warning about deprecated slash as division ( #24653 )  
							
							... 
							
							
							
							Co-authored-by: Nick Schonning <nschonni@gmail.com> 
							
						 
						
							2023-04-25 22:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								678480d4d3 
								
							 
						 
						
							
							
								
								Fix small mistakes in RTL layout ( #2182 )  
							
							... 
							
							
							
							Borders in blockquotes in reply-indicator weren't colored properly.
avatar margin when viewing edited toots dropdown was applied to wrong side.
Conversations had padding applied to the wrong side.
Padding for notifcation cleaner checkboxes was applied to wrong side.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-04-25 20:33:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aea7866161 
								
							 
						 
						
							
							
								
								Change drawer--header to drawer__header ( #2189 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-04-25 20:29:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c35e3cb6ac 
								
							 
						 
						
							
							
								
								Add more tips to onboarding flow in web UI ( #24646 )  
							
							
							
						 
						
							2023-04-25 11:12:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8099ba04be 
								
							 
						 
						
							
							
								
								Change hashtags and mentions in bios to open in-app in web UI ( #24643 )  
							
							
							
						 
						
							2023-04-25 06:33:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								804aa8d501 
								
							 
						 
						
							
							
								
								Fix cutting off first letter of hashtag links sometimes in web UI ( #24623 )  
							
							
							
						 
						
							2023-04-24 09:53:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2daa5a1549 
								
							 
						 
						
							
							
								
								Enable formatjs/prefer-pound-in-plural ( #24622 )  
							
							
							
						 
						
							2023-04-24 08:07:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								290e4aba31 
								
							 
						 
						
							
							
								
								Add lines to threads in web UI ( #24549 )  
							
							
							
						 
						
							2023-04-24 08:07:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef3675d688 
								
							 
						 
						
							
							
								
								Remove empty Kushubian (csb) local files ( #24151 )  
							
							
							
						 
						
							2023-04-23 22:43:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chike Nwaenie 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e1b4eeb636 
								
							 
						 
						
							
							
								
								Change styling of the recommended accounts to allow bio to be more visible  ( #24480 )  
							
							
							
						 
						
							2023-04-23 22:33:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e713c545b8 
								
							 
						 
						
							
							
								
								Use CSS to trim long card descriptions ( #24265 )  
							
							
							
						 
						
							2023-04-23 22:32:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0461f83320 
								
							 
						 
						
							
							
								
								Add new onboarding flow to web UI ( #24619 )  
							
							
							
						 
						
							2023-04-23 22:24:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5b58ebb04f 
								
							 
						 
						
							
							
								
								Fix JS crashing if initial-state is not set ( #2193 )  
							
							... 
							
							
							
							Fixes issues with the JS for at least sign-up pages not working 
							
						 
						
							2023-04-22 19:13:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9d75b03ba4 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24517 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-22 19:37:41 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								9ef32ea570 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite AnimatedNumber component with React hooks  
							
							... 
							
							
							
							Port ab740f464a 
							
						 
						
							2023-04-22 11:28:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								799e9917e4 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite GIFV component with React hooks  
							
							... 
							
							
							
							Port cf3fa1e814 
							
						 
						
							2023-04-22 11:22:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6ea9137233 
								
							 
						 
						
							
							
								
								[Glitch] Add client-side validation for taken username in sign-up form  
							
							... 
							
							
							
							Port 955ec252a4 
							
						 
						
							2023-04-22 10:47:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								bc7b3399fb 
								
							 
						 
						
							
							
								
								[Glitch] Fix crash when trying to open the filter modal  
							
							... 
							
							
							
							Port bc4745f482 
							
						 
						
							2023-04-22 10:20:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2f3dffb057 
								
							 
						 
						
							
							
								
								[Glitch] Add progress indicator to sign-up flow  
							
							... 
							
							
							
							Port e5c0b16735 
							
						 
						
							2023-04-22 10:18:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Rodriguez 
								
							 
						 
						
							
							
							
							
								
							
							
								a21a875dba 
								
							 
						 
						
							
							
								
								[Glitch] Fix status title for statuses without text  
							
							... 
							
							
							
							Port f05fb51ecb 
							
						 
						
							2023-04-22 10:16:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								f2797276b2 
								
							 
						 
						
							
							
								
								[Glitch] typo: collapsable -> collapsible  
							
							... 
							
							
							
							Port d02aa274be 
							
						 
						
							2023-04-22 10:13:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								abfdafef1e 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did. 
							
						 
						
							2023-04-22 10:06:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fbb4de3dbc 
								
							 
						 
						
							
							
								
								Fix infinite loop in emoji replacement code ( #24615 )  
							
							
							
						 
						
							2023-04-21 18:08:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								37886c28da 
								
							 
						 
						
							
							
								
								Fix characters being emojified even when using Variation Selector 15 (text) ( #20949 )  
							
							
							
						 
						
							2023-04-20 16:43:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c1a7e38d2b 
								
							 
						 
						
							
							
								
								Allow == when null checking ( #24593 )  
							
							
							
						 
						
							2023-04-19 17:46:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab740f464a 
								
							 
						 
						
							
							
								
								Rewrite AnimatedNumber component with React hooks ( #24559 )  
							
							
							
						 
						
							2023-04-17 13:25:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bc4745f482 
								
							 
						 
						
							
							
								
								Fix crash when trying to open the filter modal ( #24556 )  
							
							
							
						 
						
							2023-04-17 10:15:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9f8d34620b 
								
							 
						 
						
							
							
								
								Rewrite AvatarOverlay component with React hooks ( #24543 )  
							
							
							
						 
						
							2023-04-17 07:07:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								34f8e696e2 
								
							 
						 
						
							
							
								
								[Glitch] Change all components to use the same error page in web UI  
							
							... 
							
							
							
							Port cee357d538 
							
						 
						
							2023-04-16 18:20:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								a3c05640f7 
								
							 
						 
						
							
							
								
								[Glitch] Add “In Memoriam” banner back to profiles  
							
							... 
							
							
							
							Port 86ad43173f 
							
						 
						
							2023-04-16 18:02:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								cb0562f32c 
								
							 
						 
						
							
							
								
								[Glitch] Fix tab arrows on RTL layouts  
							
							... 
							
							
							
							Port af49d93fd6 
							
						 
						
							2023-04-16 17:58:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								f9a9f9344b 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-04-16 17:52:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f28942cef9 
								
							 
						 
						
							
							
								
								[Glitch] Refactor styles to use logical properties for positioning ( #2156 )  
							
							... 
							
							
							
							Port babd86e59445848d6547 
							
						 
						
							2023-04-16 17:45:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0cbd579ef0 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2172 )  
							
							... 
							
							
							
							* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Belarusian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Frisian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Italian)
[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 (Dutch)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Burmese)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Faroese)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Breton)
[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 (Sinhala)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Aragonese)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Kurmanji (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Scots)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip] 
							
						 
						
							2023-04-16 17:25:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf3fa1e814 
								
							 
						 
						
							
							
								
								Rewrite GIFV component with React hooks ( #24552 )  
							
							
							
						 
						
							2023-04-16 16:09:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e5c0b16735 
								
							 
						 
						
							
							
								
								Add progress indicator to sign-up flow ( #24545 )  
							
							
							
						 
						
							2023-04-16 07:01:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								955ec252a4 
								
							 
						 
						
							
							
								
								Add client-side validation for taken username in sign-up form ( #24546 )  
							
							
							
						 
						
							2023-04-16 02:10:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Rodriguez 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f05fb51ecb 
								
							 
						 
						
							
							
								
								Fix status title for statuses without text ( #24359 )  
							
							
							
						 
						
							2023-04-14 17:29:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d02aa274be 
								
							 
						 
						
							
							
								
								typo: collapsable -> collapsible ( #24521 )  
							
							
							
						 
						
							2023-04-14 11:01:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af49d93fd6 
								
							 
						 
						
							
							
								
								Fix tab arrows on RTL layouts ( #24520 )  
							
							
							
						 
						
							2023-04-12 16:01:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f0b0435ab 
								
							 
						 
						
							
							
								
								Fix missing translation strings in en.json and defaultMessages.json ( #24518 )  
							
							
							
						 
						
							2023-04-12 15:24:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								86ad43173f 
								
							 
						 
						
							
							
								
								Add “In Memoriam” banner back to profiles ( #23614 )  
							
							
							
						 
						
							2023-04-12 14:50:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c5eba06d8c 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24447 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-12 20:21:32 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cee357d538 
								
							 
						 
						
							
							
								
								Change all components to use the same error page in web UI ( #24512 )  
							
							
							
						 
						
							2023-04-12 12:44:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								63a39ae2fa 
								
							 
						 
						
							
							
								
								Run yarn manage:translations  
							
							
							
						 
						
							2023-04-09 15:56:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								c11e69f33a 
								
							 
						 
						
							
							
								
								Move glitch-soc-only translation strings out of app/javascript/mastodono/locales  
							
							
							
						 
						
							2023-04-09 15:53:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								bfe46d08f9 
								
							 
						 
						
							
							
								
								[Glitch] Ensure tabIndex is number instead of string  
							
							... 
							
							
							
							Port ec0c104bf2 
							
						 
						
							2023-04-09 14:47:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								53cdcce3d1 
								
							 
						 
						
							
							
								
								[Glitch] Fix loading spinner + infinite scroll for private mentions  
							
							... 
							
							
							
							Port 9ef9974ff2 
							
						 
						
							2023-04-09 12:10:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								b756e49cf1 
								
							 
						 
						
							
							
								
								[Glitch] Enable Stylelint property-no-unknown  
							
							... 
							
							
							
							Port cd14f712ad 
							
						 
						
							2023-04-09 12:05:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								7b04c2fb71 
								
							 
						 
						
							
							
								
								[Glitch] Fix tooltip for dates without time  
							
							... 
							
							
							
							Port aa136cf2fa 
							
						 
						
							2023-04-09 12:04:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								5b88b7e81a 
								
							 
						 
						
							
							
								
								[Glitch] Remove Array.prototype.includes polyfill  
							
							... 
							
							
							
							Port c0886dee14 
							
						 
						
							2023-04-09 12:03:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								df6602ede1 
								
							 
						 
						
							
							
								
								[Glitch] Fix account header image missing in low-res  
							
							... 
							
							
							
							Port d7b8c6db7e 
							
						 
						
							2023-04-09 12:01:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								74c61b05ae 
								
							 
						 
						
							
							
								
								[Glitch] Fix height of announcements not being updated when using reduced animations  
							
							... 
							
							
							
							Port ffd5b2eea4 
							
						 
						
							2023-04-09 12:01:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								791e712a80 
								
							 
						 
						
							
							
								
								[Glitch] Update display_media typing to string  
							
							... 
							
							
							
							Port 17b2fd2177 
							
						 
						
							2023-04-09 12:00:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								f3f7ef2d13 
								
							 
						 
						
							
							
								
								[Glitch] Set marginRight as string  
							
							... 
							
							
							
							Port 927b2fd138 
							
						 
						
							2023-04-09 11:59:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								358e4067bb 
								
							 
						 
						
							
							
								
								[Glitch] SUBMIT doesn't exist on XMLHttpRequest  
							
							... 
							
							
							
							Port ab3f23da91 
							
						 
						
							2023-04-09 11:58:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								0f62451424 
								
							 
						 
						
							
							
								
								[Glitch] HTML string attributes set as booleans  
							
							... 
							
							
							
							Port a425915ce7 
							
						 
						
							2023-04-09 11:56:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								aa136cf2fa 
								
							 
						 
						
							
							
								
								Fix tooltip for dates without time ( #24244 )  
							
							
							
						 
						
							2023-04-07 16:19:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9ef9974ff2 
								
							 
						 
						
							
							
								
								Fix loading spinner + infinite scroll for private mentions ( #24446 )  
							
							
							
						 
						
							2023-04-07 15:44:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c0886dee14 
								
							 
						 
						
							
							
								
								Remove Array.prototype.includes polyfill ( #24234 )  
							
							
							
						 
						
							2023-04-07 13:03:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d7b8c6db7e 
								
							 
						 
						
							
							
								
								Fix account header image missing in low-res ( #24433 )  
							
							
							
						 
						
							2023-04-07 11:57:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9f3438efe 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24378 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-06 23:24:31 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ffd5b2eea4 
								
							 
						 
						
							
							
								
								Fix height of announcements not being updated when using reduced animations ( #24354 )  
							
							
							
						 
						
							2023-04-05 14:58:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								17b2fd2177 
								
							 
						 
						
							
							
								
								Update display_media typing to string ( #24416 )  
							
							
							
						 
						
							2023-04-05 13:20:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								927b2fd138 
								
							 
						 
						
							
							
								
								Set marginRight as string ( #24422 )  
							
							
							
						 
						
							2023-04-05 10:57:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab3f23da91 
								
							 
						 
						
							
							
								
								SUBMIT doesn't exist on XMLHttpRequest ( #24423 )  
							
							
							
						 
						
							2023-04-05 10:56:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cd14f712ad 
								
							 
						 
						
							
							
								
								Enable Stylelint property-no-unknown ( #24404 )  
							
							
							
						 
						
							2023-04-05 09:04:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								45848d6547 
								
							 
						 
						
							
							
								
								Fix styling regressions from RTL layout refactor ( #24415 )  
							
							
							
						 
						
							2023-04-04 16:48:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ec0c104bf2 
								
							 
						 
						
							
							
								
								Ensure tabIndex is number instead of string ( #24409 )  
							
							
							
						 
						
							2023-04-04 16:33:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a425915ce7 
								
							 
						 
						
							
							
								
								HTML string attributes set as booleans ( #24408 )  
							
							
							
						 
						
							2023-04-04 16:33:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rubicon Rowe 
								
							 
						 
						
							
							
							
							
								
							
							
								69ca6316ec 
								
							 
						 
						
							
							
								
								[Glitch] Fix inconsistent radius in drawer  
							
							... 
							
							
							
							Port fa98363a27 
							
						 
						
							2023-04-04 12:51:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								d13ef49b15 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-04-04 12:45:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rubicon Rowe 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fa98363a27 
								
							 
						 
						
							
							
								
								Fix inconsistent radius in drawer ( #24407 )  
							
							
							
						 
						
							2023-04-04 11:41:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8e19c44b2c 
								
							 
						 
						
							
							
								
								Align typings with installed versions ( #24410 )  
							
							
							
						 
						
							2023-04-04 10:48:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								d29cf8a044 
								
							 
						 
						
							
							
								
								[Glitch] Add colour to follow button when hashtag is being followed  
							
							... 
							
							
							
							Port 77bd32a26a 
							
						 
						
							2023-04-03 18:07:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								4d5b4dacd6 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-04-03 17:40:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77bd32a26a 
								
							 
						 
						
							
							
								
								Add colour to follow button when hashtag is being followed ( #24361 )  
							
							
							
						 
						
							2023-04-03 16:25:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4909c2e718 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24276 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-03 14:44:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								373e4a8ff0 
								
							 
						 
						
							
							
								
								Move ESLint configs to overrides ( #24370 )  
							
							
							
						 
						
							2023-04-03 12:41:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									fusagiko / takayamaki 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4520e6473a 
								
							 
						 
						
							
							
								
								[Proposal] Make able to write React in Typescript ( #16210 )  
							
							... 
							
							
							
							Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com> 
							
						 
						
							2023-04-03 03:31:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7b15f4006a 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-04-01 14:31:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2b11376411 
								
							 
						 
						
							
							
								
								Change search pop-out in web UI ( #24305 )  
							
							
							
						 
						
							2023-04-01 09:59:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								46483ae849 
								
							 
						 
						
							
							
								
								Fix regressions from change in account row design in web UI ( #24343 )  
							
							
							
						 
						
							2023-04-01 09:27:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tdxdxoz 
								
							 
						 
						
							
							
							
							
								
							
							
								d874a7a10f 
								
							 
						 
						
							
							
								
								[Glitch] Fix: set multiColumn value for /explore Statuses  
							
							... 
							
							
							
							Port 74f56c64fc 
							
						 
						
							2023-03-31 22:50:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								a8f0592b72 
								
							 
						 
						
							
							
								
								[Glitch] Move marky to devDependency  
							
							... 
							
							
							
							Port ddb769f0b8 
							
						 
						
							2023-03-31 22:50:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								01d6f7529f 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream added a link to the roadmap, but we have a completely different README.
  Kept ours.
- `app/models/media_attachment.rb`:
  Upstream upped media attachment limits.
  Updated the default according to upstream's.
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream changed the migration compatibility level.
  Did so too.
- `config/initializers/content_security_policy.rb`:
  Upstream refactored this file but we have a different version.
  Kept our version.
- `app/controllers/settings/preferences_controller.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file does not directly references individual settings anymore.
  Applied upstream changes.
- `app/lib/user_settings_decorator.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  The file got removed entirely.
  Removed it as well.
- `app/models/user.rb`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  References to individual settings have been removed from the file.
  Removed them as well.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  Applied upstream's changes and ported ours back.
- `config/settings.yml`:
  Upstream completely refactored user settings storage, and glitch-soc has a
  different set of settings.
  In particular, upstream removed user-specific and unused settings.
  Did the same in glitch-soc.
- `spec/controllers/application_controller_spec.rb`:
  Conflicts due to glitch-soc's theming system.
  Mostly kept our version, as upstream messed up the tests. 
							
						 
						
							2023-03-31 21:30:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								68a192e718 
								
							 
						 
						
							
							
								
								Change "direct message" nomenclature to "private mention" in web UI ( #24248 )  
							
							
							
						 
						
							2023-03-30 15:16:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tdxdxoz 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								74f56c64fc 
								
							 
						 
						
							
							
								
								Fix: set multiColumn value for /explore Statuses ( #24314 )  
							
							
							
						 
						
							2023-03-30 10:14:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ddb769f0b8 
								
							 
						 
						
							
							
								
								Move marky to devDependency ( #24258 )  
							
							
							
						 
						
							2023-03-27 16:11:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf12621e37 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24130 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-03-27 20:01:47 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								babd86e594 
								
							 
						 
						
							
							
								
								Refactor styles to use logical properties for positioning ( #23944 )  
							
							
							
						 
						
							2023-03-27 10:56:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									neatchee 
								
							 
						 
						
							
							
							
							
								
							
							
								8215df76c0 
								
							 
						 
						
							
							
								
								[Glitch] Remove legacy decorators syntax  
							
							... 
							
							
							
							Port d1b057a0ac 
							
						 
						
							2023-03-27 08:51:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
							
							
								
							
							
								00c839b9a9 
								
							 
						 
						
							
							
								
								[Glitch] Remove isNaN polyfill  
							
							... 
							
							
							
							Port b46125224c 
							
						 
						
							2023-03-26 15:49:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								14b0311029 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/main  
							
							
							
						 
						
							2023-03-26 15:47:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9bda933740 
								
							 
						 
						
							
							
								
								Change media upload limits and remove client-side resizing ( #23726 )  
							
							
							
						 
						
							2023-03-25 10:00:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef127c964a 
								
							 
						 
						
							
							
								
								Change design of account rows in web UI ( #24247 )  
							
							
							
						 
						
							2023-03-25 08:46:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6e8711ff91 
								
							 
						 
						
							
							
								
								Add missing parenthesis ( #24238 )  
							
							
							
						 
						
							2023-03-24 04:35:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1b057a0ac 
								
							 
						 
						
							
							
								
								Remove legacy decorators syntax ( #18357 )  
							
							
							
						 
						
							2023-03-24 03:17:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nick Schonning 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b46125224c 
								
							 
						 
						
							
							
								
								Remove isNaN polyfill ( #24224 )  
							
							
							
						 
						
							2023-03-23 09:47:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								16da4a09e8 
								
							 
						 
						
							
							
								
								Fix broken links in account gallery ( #24218 )  
							
							
							
						 
						
							2023-03-23 05:17:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogamin 
								
							 
						 
						
							
							
							
							
								
							
							
								b4f60bc6de 
								
							 
						 
						
							
							
								
								[Glitch] Fit the max-width of media in .prose to parent box  
							
							... 
							
							
							
							Port 0a9def5498 
							
						 
						
							2023-03-22 20:00:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								5ac380c122 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/status.rb`:
  Upstream added lines close to a glitch-soc only line, not a real conflict.
  Applied upstream's changes (added hooks) while keeping glitch-soc's changes
  (`local_only` scope).
- `config/environments/production.rb`:
  Upstream removed a header, while we have glitch-soc specific ones.
  Removed the header removed upstream. 
							
						 
						
							2023-03-22 19:50:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mogamin 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0a9def5498 
								
							 
						 
						
							
							
								
								Fit the max-width of media in .prose to parent box ( #24180 )  
							
							
							
						 
						
							2023-03-20 20:04:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Plastikmensch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								02ac94490a 
								
							 
						 
						
							
							
								
								Add getting-started-misc to route ( #2141 )  
							
							... 
							
							
							
							* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-03-19 17:26:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								8f97ffe91e 
								
							 
						 
						
							
							
								
								[Glitch] Replace Status#translatable? with language matrix in separate endpoint  
							
							... 
							
							
							
							Port bd047acc35 
							
						 
						
							2023-03-16 23:21:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								193250556c 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream changed their README, we have our own.
  Kept ours.
- `app/helpers/application_helper.rb`:
  Minor code style fix upstream, on a line that is different in glitch-soc
  due to the different theming system.
  Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Code style fix on a line next to lines exclusive to glitch-soc.
  Applied upstream changes.
- `yarn.lock`:
  Upstream updated a dependency textually close to a glitch-soc-only
  dependency.
  Updated the dependency like upstream did. 
							
						 
						
							2023-03-16 23:12:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a085901108 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23904 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-03-16 21:02:00 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bd047acc35 
								
							 
						 
						
							
							
								
								Replace Status#translatable? with language matrix in separate endpoint ( #24037 )  
							
							
							
						 
						
							2023-03-16 11:07:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rodion Borisov 
								
							 
						 
						
							
							
							
							
								
							
							
								32418f0ff3 
								
							 
						 
						
							
							
								
								[Glitch] Center the text itself in upload area  
							
							... 
							
							
							
							Port a52ccd7ad9 
							
						 
						
							2023-03-15 09:33:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PauloVilarinho 
								
							 
						 
						
							
							
							
							
								
							
							
								17fb58bff3 
								
							 
						 
						
							
							
								
								[Glitch] add modal message when editing toot  
							
							... 
							
							
							
							Port 8770473dbb 
							
						 
						
							2023-03-15 09:33:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								3ef5f62abf 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did. 
							
						 
						
							2023-03-15 09:16:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rodion Borisov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a52ccd7ad9 
								
							 
						 
						
							
							
								
								Center the text itself in upload area ( #24029 )  
							
							
							
						 
						
							2023-03-09 14:35:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PauloVilarinho 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8770473dbb 
								
							 
						 
						
							
							
								
								add modal message when editing toot ( #23936 )  
							
							... 
							
							
							
							Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com> 
							
						 
						
							2023-03-06 17:33:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7f3b0dedeb 
								
							 
						 
						
							
							
								
								Refactor glitch-soc rich text SCSS  
							
							
							
						 
						
							2023-03-05 21:31:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								1317553f3a 
								
							 
						 
						
							
							
								
								[Glitch] Only offer translation for supported languages  
							
							... 
							
							
							
							Port 5a8c651e8f 
							
						 
						
							2023-03-05 21:19:04 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Terry Garcia 
								
							 
						 
						
							
							
							
							
								
							
							
								9a1bd1c3e9 
								
							 
						 
						
							
							
								
								[Glitch] Switched bookmark and favourites around  
							
							... 
							
							
							
							Port a1347f456e 
							
						 
						
							2023-03-05 21:07:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								03ac84b0f4 
								
							 
						 
						
							
							
								
								[Glitch] Fix duplicate “Publish” button on mobile  
							
							... 
							
							
							
							Port b55fc883b6 
							
						 
						
							2023-03-05 21:07:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								7623e18124 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream README has been changed, but we have a completely different one.
  Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Change the code style to match upstream's but otherwise do not change our
  code.
- `spec/lib/sanitize_config_spec.rb`:
  Upstream added support for more incoming HTML tags (a large subset of what
  glitch-soc accepts).
  Kept our version, since the tests are mostly glitch-soc's, except for cases
  which are purposefuly different. 
							
						 
						
							2023-03-05 20:46:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bb4e211c86 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2118 )  
							
							... 
							
							
							
							* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip] 
							
						 
						
							2023-03-05 20:38:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								0e476f3c4f 
								
							 
						 
						
							
							
								
								[Glitch] Add lang attribute to media and poll options  
							
							... 
							
							
							
							Port d3eefead30 
							
						 
						
							2023-03-05 17:52:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb868228bd 
								
							 
						 
						
							
							
								
								Do not leave Mastodon when clicking “Back” ( #23953 )  
							
							
							
						 
						
							2023-03-04 23:18:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5a8c651e8f 
								
							 
						 
						
							
							
								
								Only offer translation for supported languages ( #23879 )  
							
							
							
						 
						
							2023-03-03 21:06:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Terry Garcia 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a1347f456e 
								
							 
						 
						
							
							
								
								Switched bookmark and favourites around ( #23701 )  
							
							
							
						 
						
							2023-03-03 20:37:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b55fc883b6 
								
							 
						 
						
							
							
								
								Fix duplicate “Publish” button on mobile ( #23804 )  
							
							
							
						 
						
							2023-03-03 20:25:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3a6451c867 
								
							 
						 
						
							
							
								
								Add support for incoming rich text ( #23913 )  
							
							
							
						 
						
							2023-03-03 20:19:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								276c1d32d6 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-03-02 17:32:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cb97ba7a2f 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23802 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-28 23:01:05 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d3eefead30 
								
							 
						 
						
							
							
								
								Add lang attribute to media and poll options ( #23891 )  
							
							
							
						 
						
							2023-02-26 20:13:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								b91756fd4d 
								
							 
						 
						
							
							
								
								Move misc rules from components/index.scss to components/misc.scss  
							
							
							
						 
						
							2023-02-25 23:47:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								cc94cc86ae 
								
							 
						 
						
							
							
								
								Fix glitch-soc SCSS code style and refactor closer to upstream  
							
							
							
						 
						
							2023-02-25 23:46:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
							
							
								
							
							
								b632c5a55a 
								
							 
						 
						
							
							
								
								[Glitch] Add lang attribute to preview card  
							
							... 
							
							
							
							Port 8000a8f230 
							
						 
						
							2023-02-25 14:43:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Lucas 
								
							 
						 
						
							
							
							
							
								
							
							
								28cb77bd07 
								
							 
						 
						
							
							
								
								[Glitch] Increase contrast of upload progress background  
							
							... 
							
							
							
							Port f4f91bc295 
							
						 
						
							2023-02-25 14:43:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Botao Wang 
								
							 
						 
						
							
							
							
							
								
							
							
								56bec60f25 
								
							 
						 
						
							
							
								
								[Glitch] Fix sidebar cut-off on small screens in admin UI  
							
							... 
							
							
							
							Port 7adde24a95 
							
						 
						
							2023-02-25 14:40:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								31455f05fb 
								
							 
						 
						
							
							
								
								[Glitch] Add lang tag to native language names in language picker  
							
							... 
							
							
							
							Port 7207a98d39 
							
						 
						
							2023-02-25 14:37:05 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
							
							
								
							
							
								81ef21a0c8 
								
							 
						 
						
							
							
								
								[Glitch] Rename JSX files with proper .jsx extension  
							
							... 
							
							
							
							Port 44a7d87cb1 
							
						 
						
							2023-02-25 14:35:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								859eb01aac 
								
							 
						 
						
							
							
								
								Fix building vanilla flavor after JSX change  
							
							
							
						 
						
							2023-02-25 14:28:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
							
							
								
							
							
								4ed09276d5 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.prettierignore`:
  Upstream added a line at the end of the file, while glitch-soc had its own
  extra lines.
  Took upstream's change.
- `CONTRIBUTING.md`:
  We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
  Ported upstream changes.
- `app/controllers/application_controller.rb`:
  Upstream made code style changes in a method that is entirely replaced
  in glitch-soc.
  Ignored the change.
- `app/models/account.rb`:
  Code style changes textually close to glitch-soc-specific changes.
  Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream code style changes.
  Ignored them. 
							
						 
						
							2023-02-25 14:00:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8000a8f230 
								
							 
						 
						
							
							
								
								Add lang attribute to preview card ( #23869 )  
							
							
							
						 
						
							2023-02-24 20:04:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Tim Lucas 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f4f91bc295 
								
							 
						 
						
							
							
								
								Increase contrast of upload progress background ( #23836 )  
							
							
							
						 
						
							2023-02-23 12:58:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2564117131 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23625 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-22 21:16:02 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Botao Wang 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7adde24a95 
								
							 
						 
						
							
							
								
								Fix sidebar cut-off on small screens in admin UI ( #23764 )  
							
							
							
						 
						
							2023-02-21 10:06:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7207a98d39 
								
							 
						 
						
							
							
								
								Add lang tag to native language names in language picker ( #23749 )  
							
							
							
						 
						
							2023-02-21 09:23:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Claire 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d3b4d4d4f3 
								
							 
						 
						
							
							
								
								Change compose form checkbox to native input with appearance: none ( #22949 )  
							
							
							
						 
						
							2023-02-20 11:32:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Christian Schmidt 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62c4aecf8f 
								
							 
						 
						
							
							
								
								Make larger part of status clickable ( #23621 )  
							
							
							
						 
						
							2023-02-20 08:11:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renaud Chaput 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								44a7d87cb1 
								
							 
						 
						
							
							
								
								Rename JSX files with proper .jsx extension ( #23733 )  
							
							
							
						 
						
							2023-02-20 03:20:59 +01:00