7b15f4006a 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-04-01 14:31:05 +02:00  
				
					
						
							
							
								 
						
							
								2b11376411 
								
							 
						 
						
							
							
								
								Change search pop-out in web UI ( #24305 )  
							
							
							
						 
						
							2023-04-01 09:59:10 +02:00  
				
					
						
							
							
								 
						
							
								46483ae849 
								
							 
						 
						
							
							
								
								Fix regressions from change in account row design in web UI ( #24343 )  
							
							
							
						 
						
							2023-04-01 09:27:23 +02:00  
				
					
						
							
							
								 
						
							
								d874a7a10f 
								
							 
						 
						
							
							
								
								[Glitch] Fix: set multiColumn value for /explore Statuses  
							
							... 
							
							
							
							Port 74f56c64fc 
							
						 
						
							2023-03-31 22:50:57 +02:00  
				
					
						
							
							
								 
						
							
								a8f0592b72 
								
							 
						 
						
							
							
								
								[Glitch] Move marky to devDependency  
							
							... 
							
							
							
							Port ddb769f0b8 
							
						 
						
							2023-03-31 22:50:57 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								68a192e718 
								
							 
						 
						
							
							
								
								Change "direct message" nomenclature to "private mention" in web UI ( #24248 )  
							
							
							
						 
						
							2023-03-30 15:16:20 +02:00  
				
					
						
							
							
								 
						
							
								74f56c64fc 
								
							 
						 
						
							
							
								
								Fix: set multiColumn value for /explore Statuses ( #24314 )  
							
							
							
						 
						
							2023-03-30 10:14:49 +02:00  
				
					
						
							
							
								 
						
							
								ddb769f0b8 
								
							 
						 
						
							
							
								
								Move marky to devDependency ( #24258 )  
							
							
							
						 
						
							2023-03-27 16:11:45 +02:00  
				
					
						
							
							
								 
						
							
								cf12621e37 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24130 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-03-27 20:01:47 +09:00  
				
					
						
							
							
								 
						
							
								babd86e594 
								
							 
						 
						
							
							
								
								Refactor styles to use logical properties for positioning ( #23944 )  
							
							
							
						 
						
							2023-03-27 10:56:25 +02:00  
				
					
						
							
							
								 
						
							
								8215df76c0 
								
							 
						 
						
							
							
								
								[Glitch] Remove legacy decorators syntax  
							
							... 
							
							
							
							Port d1b057a0ac 
							
						 
						
							2023-03-27 08:51:57 +02:00  
				
					
						
							
							
								 
						
							
								00c839b9a9 
								
							 
						 
						
							
							
								
								[Glitch] Remove isNaN polyfill  
							
							... 
							
							
							
							Port b46125224c 
							
						 
						
							2023-03-26 15:49:49 +02:00  
				
					
						
							
							
								 
						
							
								14b0311029 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/main  
							
							
							
						 
						
							2023-03-26 15:47:12 +02:00  
				
					
						
							
							
								 
						
							
								9bda933740 
								
							 
						 
						
							
							
								
								Change media upload limits and remove client-side resizing ( #23726 )  
							
							
							
						 
						
							2023-03-25 10:00:03 +01:00  
				
					
						
							
							
								 
						
							
								ef127c964a 
								
							 
						 
						
							
							
								
								Change design of account rows in web UI ( #24247 )  
							
							
							
						 
						
							2023-03-25 08:46:32 +01:00  
				
					
						
							
							
								 
						
							
								6e8711ff91 
								
							 
						 
						
							
							
								
								Add missing parenthesis ( #24238 )  
							
							
							
						 
						
							2023-03-24 04:35:43 +01:00  
				
					
						
							
							
								 
						
							
								d1b057a0ac 
								
							 
						 
						
							
							
								
								Remove legacy decorators syntax ( #18357 )  
							
							
							
						 
						
							2023-03-24 03:17:53 +01:00  
				
					
						
							
							
								 
						
							
								b46125224c 
								
							 
						 
						
							
							
								
								Remove isNaN polyfill ( #24224 )  
							
							
							
						 
						
							2023-03-23 09:47:13 +01:00  
				
					
						
							
							
								 
						
							
								16da4a09e8 
								
							 
						 
						
							
							
								
								Fix broken links in account gallery ( #24218 )  
							
							
							
						 
						
							2023-03-23 05:17:29 +01:00  
				
					
						
							
							
								 
						
							
								b4f60bc6de 
								
							 
						 
						
							
							
								
								[Glitch] Fit the max-width of media in .prose to parent box  
							
							... 
							
							
							
							Port 0a9def5498 
							
						 
						
							2023-03-22 20:00:33 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								0a9def5498 
								
							 
						 
						
							
							
								
								Fit the max-width of media in .prose to parent box ( #24180 )  
							
							
							
						 
						
							2023-03-20 20:04:25 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								8f97ffe91e 
								
							 
						 
						
							
							
								
								[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint  
							
							... 
							
							
							
							Port bd047acc35 
							
						 
						
							2023-03-16 23:21:08 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								a085901108 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23904 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-03-16 21:02:00 +09:00  
				
					
						
							
							
								 
						
							
								bd047acc35 
								
							 
						 
						
							
							
								
								Replace `Status#translatable?` with language matrix in separate endpoint ( #24037 )  
							
							
							
						 
						
							2023-03-16 11:07:24 +01:00  
				
					
						
							
							
								 
						
							
								32418f0ff3 
								
							 
						 
						
							
							
								
								[Glitch] Center the text itself in upload area  
							
							... 
							
							
							
							Port a52ccd7ad9 
							
						 
						
							2023-03-15 09:33:48 +01:00  
				
					
						
							
							
								 
						
							
								17fb58bff3 
								
							 
						 
						
							
							
								
								[Glitch] add modal message when editing toot  
							
							... 
							
							
							
							Port 8770473dbb 
							
						 
						
							2023-03-15 09:33:14 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								a52ccd7ad9 
								
							 
						 
						
							
							
								
								Center the text itself in upload area ( #24029 )  
							
							
							
						 
						
							2023-03-09 14:35:44 +01:00  
				
					
						
							
							
								 
						
							
								8770473dbb 
								
							 
						 
						
							
							
								
								add modal message when editing toot ( #23936 )  
							
							... 
							
							
							
							Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com> 
							
						 
						
							2023-03-06 17:33:09 +01:00  
				
					
						
							
							
								 
						
							
								7f3b0dedeb 
								
							 
						 
						
							
							
								
								Refactor glitch-soc rich text SCSS  
							
							
							
						 
						
							2023-03-05 21:31:45 +01:00  
				
					
						
							
							
								 
						
							
								1317553f3a 
								
							 
						 
						
							
							
								
								[Glitch] Only offer translation for supported languages  
							
							... 
							
							
							
							Port 5a8c651e8f 
							
						 
						
							2023-03-05 21:19:04 +01:00  
				
					
						
							
							
								 
						
							
								9a1bd1c3e9 
								
							 
						 
						
							
							
								
								[Glitch] Switched bookmark and favourites around  
							
							... 
							
							
							
							Port a1347f456e 
							
						 
						
							2023-03-05 21:07:55 +01:00  
				
					
						
							
							
								 
						
							
								03ac84b0f4 
								
							 
						 
						
							
							
								
								[Glitch] Fix duplicate “Publish” button on mobile  
							
							... 
							
							
							
							Port b55fc883b6 
							
						 
						
							2023-03-05 21:07:10 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								0e476f3c4f 
								
							 
						 
						
							
							
								
								[Glitch] Add `lang` attribute to media and poll options  
							
							... 
							
							
							
							Port d3eefead30 
							
						 
						
							2023-03-05 17:52:53 +01:00  
				
					
						
							
							
								 
						
							
								cb868228bd 
								
							 
						 
						
							
							
								
								Do not leave Mastodon when clicking “Back” ( #23953 )  
							
							
							
						 
						
							2023-03-04 23:18:19 +01:00  
				
					
						
							
							
								 
						
							
								5a8c651e8f 
								
							 
						 
						
							
							
								
								Only offer translation for supported languages ( #23879 )  
							
							
							
						 
						
							2023-03-03 21:06:31 +01:00  
				
					
						
							
							
								 
						
							
								a1347f456e 
								
							 
						 
						
							
							
								
								Switched bookmark and favourites around ( #23701 )  
							
							
							
						 
						
							2023-03-03 20:37:49 +01:00  
				
					
						
							
							
								 
						
							
								b55fc883b6 
								
							 
						 
						
							
							
								
								Fix duplicate “Publish” button on mobile ( #23804 )  
							
							
							
						 
						
							2023-03-03 20:25:36 +01:00  
				
					
						
							
							
								 
						
							
								3a6451c867 
								
							 
						 
						
							
							
								
								Add support for incoming rich text ( #23913 )  
							
							
							
						 
						
							2023-03-03 20:19:29 +01:00  
				
					
						
							
							
								 
						
							
								276c1d32d6 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-03-02 17:32:38 +01:00  
				
					
						
							
							
								 
						
							
								cb97ba7a2f 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23802 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-28 23:01:05 +09:00  
				
					
						
							
							
								 
						
							
								d3eefead30 
								
							 
						 
						
							
							
								
								Add `lang` attribute to media and poll options ( #23891 )  
							
							
							
						 
						
							2023-02-26 20:13:27 +01:00  
				
					
						
							
							
								 
						
							
								b91756fd4d 
								
							 
						 
						
							
							
								
								Move misc rules from components/index.scss to components/misc.scss  
							
							
							
						 
						
							2023-02-25 23:47:21 +01:00  
				
					
						
							
							
								 
						
							
								cc94cc86ae 
								
							 
						 
						
							
							
								
								Fix glitch-soc SCSS code style and refactor closer to upstream  
							
							
							
						 
						
							2023-02-25 23:46:23 +01:00  
				
					
						
							
							
								 
						
							
								b632c5a55a 
								
							 
						 
						
							
							
								
								[Glitch] Add `lang` attribute to preview card  
							
							... 
							
							
							
							Port 8000a8f230 
							
						 
						
							2023-02-25 14:43:57 +01:00  
				
					
						
							
							
								 
						
							
								28cb77bd07 
								
							 
						 
						
							
							
								
								[Glitch] Increase contrast of upload progress background  
							
							... 
							
							
							
							Port f4f91bc295 
							
						 
						
							2023-02-25 14:43:24 +01:00  
				
					
						
							
							
								 
						
							
								56bec60f25 
								
							 
						 
						
							
							
								
								[Glitch] Fix sidebar cut-off on small screens in admin UI  
							
							... 
							
							
							
							Port 7adde24a95 
							
						 
						
							2023-02-25 14:40:29 +01:00  
				
					
						
							
							
								 
						
							
								31455f05fb 
								
							 
						 
						
							
							
								
								[Glitch] Add `lang` tag to native language names in language picker  
							
							... 
							
							
							
							Port 7207a98d39 
							
						 
						
							2023-02-25 14:37:05 +01:00  
				
					
						
							
							
								 
						
							
								81ef21a0c8 
								
							 
						 
						
							
							
								
								[Glitch] Rename JSX files with proper `.jsx` extension  
							
							... 
							
							
							
							Port 44a7d87cb1 
							
						 
						
							2023-02-25 14:35:31 +01:00  
				
					
						
							
							
								 
						
							
								859eb01aac 
								
							 
						 
						
							
							
								
								Fix building vanilla flavor after JSX change  
							
							
							
						 
						
							2023-02-25 14:28:59 +01:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								8000a8f230 
								
							 
						 
						
							
							
								
								Add `lang` attribute to preview card ( #23869 )  
							
							
							
						 
						
							2023-02-24 20:04:38 +01:00  
				
					
						
							
							
								 
						
							
								f4f91bc295 
								
							 
						 
						
							
							
								
								Increase contrast of upload progress background ( #23836 )  
							
							
							
						 
						
							2023-02-23 12:58:42 +01:00  
				
					
						
							
							
								 
						
							
								2564117131 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23625 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-22 21:16:02 +09:00  
				
					
						
							
							
								 
						
							
								7adde24a95 
								
							 
						 
						
							
							
								
								Fix sidebar cut-off on small screens in admin UI ( #23764 )  
							
							
							
						 
						
							2023-02-21 10:06:13 +01:00  
				
					
						
							
							
								 
						
							
								7207a98d39 
								
							 
						 
						
							
							
								
								Add `lang` tag to native language names in language picker ( #23749 )  
							
							
							
						 
						
							2023-02-21 09:23:39 +01:00  
				
					
						
							
							
								 
						
							
								d3b4d4d4f3 
								
							 
						 
						
							
							
								
								Change compose form checkbox to native input with `appearance: none` ( #22949 )  
							
							
							
						 
						
							2023-02-20 11:32:27 +01:00  
				
					
						
							
							
								 
						
							
								62c4aecf8f 
								
							 
						 
						
							
							
								
								Make larger part of status clickable ( #23621 )  
							
							
							
						 
						
							2023-02-20 08:11:23 +01:00  
				
					
						
							
							
								 
						
							
								44a7d87cb1 
								
							 
						 
						
							
							
								
								Rename JSX files with proper `.jsx` extension ( #23733 )  
							
							
							
						 
						
							2023-02-20 03:20:59 +01:00  
				
					
						
							
							
								 
						
							
								8c8358b3cf 
								
							 
						 
						
							
							
								
								[Glitch] Fix focus point of already-attached media not saving after edit  
							
							... 
							
							
							
							Port b2283b6838 
							
						 
						
							2023-02-19 10:54:04 +01:00  
				
					
						
							
							
								 
						
							
								229ab559dc 
								
							 
						 
						
							
							
								
								[Glitch] Fix bad type for spellCheck attribute  
							
							... 
							
							
							
							Port cde13349cb 
							
						 
						
							2023-02-19 10:53:44 +01:00  
				
					
						
							
							
								 
						
							
								6fdd596cc8 
								
							 
						 
						
							
							
								
								[Glitch] Enable ESLint Promise plugin defaults  
							
							... 
							
							
							
							Port 5e1c0c3d94 
							
						 
						
							2023-02-19 10:53:18 +01:00  
				
					
						
							
							
								 
						
							
								7452a95998 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes while we have dropped this file.
  Keep the file deleted.
- `.prettierignore`:
  Upstream made changes at the end of the file, where we
  had our extra lines.
  Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
  Upstream code style changes.
  Applied them.
- `app/services/backup_service.rb`:
  Upstream code style changes.
  Applied them. 
							
						 
						
							2023-02-19 10:42:55 +01:00  
				
					
						
							
							
								 
						
							
								b2283b6838 
								
							 
						 
						
							
							
								
								Fix focus point of already-attached media not saving after edit ( #23566 )  
							
							
							
						 
						
							2023-02-19 07:11:18 +01:00  
				
					
						
							
							
								 
						
							
								4c68189d2b 
								
							 
						 
						
							
							
								
								Merge pull request  #2112  from ClearlyClaire/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2023-02-18 22:05:11 +01:00  
				
					
						
							
							
								 
						
							
								ea9a1d79df 
								
							 
						 
						
							
							
								
								[Glitch] Upgrade to Stylelint 15 with Prettier  
							
							... 
							
							
							
							Port 0c9d455ea5 
							
						 
						
							2023-02-18 16:02:12 +01:00  
				
					
						
							
							
								 
						
							
								7e64eef73b 
								
							 
						 
						
							
							
								
								[Glitch] Enable ESLint no-useless-escape  
							
							... 
							
							
							
							Port db2c58d47a 
							
						 
						
							2023-02-18 16:02:12 +01:00  
				
					
						
							
							
								 
						
							
								587f6b3b06 
								
							 
						 
						
							
							
								
								[Glitch] Enable ESLint import recommended rules  
							
							... 
							
							
							
							Port eddfb33dfe 
							
						 
						
							2023-02-18 16:02:12 +01:00  
				
					
						
							
							
								 
						
							
								2be88d1930 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2111 )  
							
							... 
							
							
							
							* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* Fix root key name in pt-PT translation file
* Fix normalization issue with ES translation
* Fix issue with `no` locale in glitch-soc 
							
						 
						
							2023-02-18 11:16:30 +01:00  
				
					
						
							
							
								 
						
							
								cde13349cb 
								
							 
						 
						
							
							
								
								Fix bad type for spellCheck attribute ( #23638 )  
							
							
							
						 
						
							2023-02-17 09:51:27 +01:00  
				
					
						
							
							
								 
						
							
								5e1c0c3d94 
								
							 
						 
						
							
							
								
								Enable ESLint Promise plugin defaults ( #22229 )  
							
							
							
						 
						
							2023-02-16 15:30:56 +09:00  
				
					
						
							
							
								 
						
							
								630975bf41 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23527 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-16 10:23:03 +09:00  
				
					
						
							
							
								 
						
							
								40fc917a86 
								
							 
						 
						
							
							
								
								[Glitch] Fix case-sensitive check for previously used hashtags  
							
							... 
							
							
							
							Port 4da5f77d92 
							
						 
						
							2023-02-13 20:05:36 +01:00  
				
					
						
							
							
								 
						
							
								58291b31fa 
								
							 
						 
						
							
							
								
								[Glitch] Fix attached media uploads not being cleared when replying to a post  
							
							... 
							
							
							
							Port bae17ebe5e 
							
						 
						
							2023-02-13 20:04:45 +01:00  
				
					
						
							
							
								 
						
							
								ce84d163cc 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.prettierignore`:
  Upstream added a line at the end, glitch-soc had extra entries at the end.
  Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
  Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
  Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
  Not a real conflict, upstream added a parameter (`allowed_mentions`) where
  glitch-soc already had an extra one (`content_type`).
  Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes. 
							
						 
						
							2023-02-13 19:35:35 +01:00  
				
					
						
							
							
								 
						
							
								eddfb33dfe 
								
							 
						 
						
							
							
								
								Enable ESLint import recommended rules ( #23315 )  
							
							
							
						 
						
							2023-02-13 15:12:31 +01:00  
				
					
						
							
							
								 
						
							
								db2c58d47a 
								
							 
						 
						
							
							
								
								Enable ESLint no-useless-escape ( #23311 )  
							
							
							
						 
						
							2023-02-13 15:12:14 +01:00  
				
					
						
							
							
								 
						
							
								4da5f77d92 
								
							 
						 
						
							
							
								
								Fix case-sensitive check for previously used hashtags ( #23526 )  
							
							
							
						 
						
							2023-02-13 14:54:08 +01:00  
				
					
						
							
							
								 
						
							
								0c9d455ea5 
								
							 
						 
						
							
							
								
								Upgrade to Stylelint 15 with Prettier ( #23558 )  
							
							
							
						 
						
							2023-02-13 04:57:03 +01:00  
				
					
						
							
							
								 
						
							
								ee42505452 
								
							 
						 
						
							
							
								
								fix hashtag ordering ( #2107 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2023-02-12 18:58:02 +01:00  
				
					
						
							
							
								 
						
							
								8eb74c88ec 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2100 )  
							
							... 
							
							
							
							* New translations en.json (Korean)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip] 
							
						 
						
							2023-02-12 18:16:08 +01:00  
				
					
						
							
							
								 
						
							
								87419f9307 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-02-10 22:49:59 +01:00  
				
					
						
							
							
								 
						
							
								bae17ebe5e 
								
							 
						 
						
							
							
								
								Fix attached media uploads not being cleared when replying to a post ( #23504 )  
							
							
							
						 
						
							2023-02-10 22:03:35 +01:00  
				
					
						
							
							
								 
						
							
								71ae17e8f5 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23413 )  
							
							... 
							
							
							
							* New translations en.json (Esperanto)
* New translations en.yml (Slovak)
* New translations en.json (Burmese)
* New translations en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.json (Burmese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations activerecord.en.yml (Burmese)
* New translations en.json (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Catalan)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.json (Russian)
* New translations en.json (Belarusian)
* New translations en.json (Belarusian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Korean)
* New translations en.json (Burmese)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations doorkeeper.en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.yml (Burmese)
* New translations en.json (Silesian)
* New translations en.yml (Occitan)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.json (Occitan)
* New translations activerecord.en.yml (Turkish)
* New translations doorkeeper.en.yml (Turkish)
* Normalize
* Remove unused locales
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-11 05:42:08 +09:00  
				
					
						
							
							
								 
						
							
								5e37906083 
								
							 
						 
						
							
							
								
								[Glitch] Add scrolling to Compare history modal  
							
							... 
							
							
							
							Port e8cb3ee827 
							
						 
						
							2023-02-09 13:03:41 +01:00  
				
					
						
							
							
								 
						
							
								2dfbdc3f9d 
								
							 
						 
						
							
							
								
								[Glitch] Show spinner while loading follow requests  
							
							... 
							
							
							
							Port c1f32c9c14 
							
						 
						
							2023-02-09 13:02:32 +01:00  
				
					
						
							
							
								 
						
							
								8fd6c36243 
								
							 
						 
						
							
							
								
								[Glitch] Spell check input fields  
							
							... 
							
							
							
							Port 67744ee779 
							
						 
						
							2023-02-09 12:59:48 +01:00  
				
					
						
							
							
								 
						
							
								95e2cab22e 
								
							 
						 
						
							
							
								
								[Glitch] Add setting for status page URL  
							
							... 
							
							
							
							Port 8f590b0a21 
							
						 
						
							2023-02-09 12:58:11 +01:00  
				
					
						
							
							
								 
						
							
								85558a5e18 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes. 
							
						 
						
							2023-02-09 12:46:12 +01:00  
				
					
						
							
							
								 
						
							
								e2207af3d7 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23393 )  
							
							... 
							
							
							
							* New translations en.yml (Portuguese)
* New translations en.yml (Romanian)
* New translations en.yml (Spanish)
* New translations en.yml (Afrikaans)
* New translations en.yml (Arabic)
* New translations en.yml (Belarusian)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations en.yml (Greek)
* New translations en.yml (Basque)
* New translations en.yml (Hungarian)
* New translations en.yml (Armenian)
* New translations en.yml (Italian)
* New translations en.yml (Galician)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Georgian)
* New translations en.yml (Korean)
* New translations en.yml (Lithuanian)
* New translations en.yml (Macedonian)
* New translations en.yml (Punjabi)
* New translations en.yml (Slovenian)
* New translations en.yml (Albanian)
* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Thai)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Burmese)
* New translations en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Uyghur)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Hebrew)
* New translations en.json (Japanese)
* New translations en.json (Romanian)
* New translations en.json (Afrikaans)
* New translations en.json (Danish)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Latin)
* New translations en.yml (Bosnian)
* New translations en.yml (French, Quebec)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Aragonese)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Scots)
* New translations en.yml (Igbo)
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations en.json (Kashubian)
* New translations en.yml (Kashubian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.json (Georgian)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Galician)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Burmese)
* New translations en.json (Faroese)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Korean)
* New translations en.json (Portuguese)
* New translations en.json (Thai)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Hungarian)
* New translations en.json (Spanish, Argentina)
* New translations en.json (German)
* New translations en.json (Dutch)
* New translations en.yml (German)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (German)
* New translations en.json (German)
* New translations en.json (Italian)
* New translations en.json (Albanian)
* New translations en.yml (German)
* New translations en.yml (Russian)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Latvian)
* New translations en.json (Polish)
* New translations en.json (Russian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (French)
* New translations en.json (Czech)
* New translations simple_form.en.yml (French)
* New translations en.json (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.json (German)
* New translations en.json (English, United Kingdom)
* New translations en.json (Esperanto)
* New translations en.yml (German)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Esperanto)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (German)
* New translations en.json (Spanish)
* New translations en.yml (Asturian)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations en.json (Basque)
* New translations en.json (Belarusian)
* New translations en.json (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Faroese)
* New translations en.json (Faroese)
* New translations en.json (Korean)
* New translations en.json (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Galician)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Polish)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations activerecord.en.yml (French)
* New translations devise.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Icelandic)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Danish)
* New translations en.json (Danish)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Asturian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Frisian)
* New translations en.json (Frisian)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-07 02:41:31 +09:00  
				
					
						
							
							
								 
						
							
								e8cb3ee827 
								
							 
						 
						
							
							
								
								Add scrolling to Compare history modal ( #23396 )  
							
							... 
							
							
							
							* Compare history modal: allow vertical scrolling
* Update app/javascript/styles/mastodon/components.scss
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-02-06 16:53:31 +01:00  
				
					
						
							
							
								 
						
							
								c1f32c9c14 
								
							 
						 
						
							
							
								
								Show spinner while loading follow requests ( #23386 )  
							
							
							
						 
						
							2023-02-06 16:50:08 +01:00  
				
					
						
							
							
								 
						
							
								fa433ac5a6 
								
							 
						 
						
							
							
								
								Further JS code style changes  
							
							
							
						 
						
							2023-02-04 22:31:47 +01:00  
				
					
						
							
							
								 
						
							
								67744ee779 
								
							 
						 
						
							
							
								
								Spell check input fields ( #23395 )  
							
							
							
						 
						
							2023-02-04 16:34:21 +01:00  
				
					
						
							
							
								 
						
							
								8651ef751e 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23356 )  
							
							... 
							
							
							
							* New translations en.json (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Korean)
* New translations en.yml (Esperanto)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations activerecord.en.yml (Esperanto)
* New translations devise.en.yml (Esperanto)
* New translations en.json (Korean)
* New translations en.json (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations en.yml (Danish)
* New translations en.yml (Slovak)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Faroese)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (French, Quebec)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Aragonese)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Scots)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Spanish, Mexico)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-04 15:46:08 +09:00  
				
					
						
							
							
								 
						
							
								8f590b0a21 
								
							 
						 
						
							
							
								
								Add setting for status page URL ( #23390 )  
							
							
							
						 
						
							2023-02-04 04:56:06 +01:00  
				
					
						
							
							
								 
						
							
								3c451cf88f 
								
							 
						 
						
							
							
								
								[Glitch] Fix useless regular-expression character escape detected by CodeQL  
							
							
							
						 
						
							2023-02-03 21:14:41 +01:00  
				
					
						
							
							
								 
						
							
								8ce02aa6e8 
								
							 
						 
						
							
							
								
								[Glitch] autofocus the compose form again on /share  
							
							... 
							
							
							
							Port e73b55184b 
							
						 
						
							2023-02-03 20:58:15 +01:00  
				
					
						
							
							
								 
						
							
								372fa3fe36 
								
							 
						 
						
							
							
								
								[Glitch] Update hasOwnProperty calls for ESLint  
							
							... 
							
							
							
							Port 131e6403cc 
							
						 
						
							2023-02-03 20:57:47 +01:00  
				
					
						
							
							
								 
						
							
								155424e52f 
								
							 
						 
						
							
							
								
								[Glitch] Run eslint --fix  
							
							... 
							
							
							
							I don't like it changing files this way, but it's basically what
c49213f0ea 
							
						 
						
							2023-02-03 20:52:07 +01:00  
				
					
						
							
							
								 
						
							
								ed7cb79723 
								
							 
						 
						
							
							
								
								[Glitch] Remove extra semicolons with ESLint autofix  
							
							... 
							
							
							
							Port d9088ef327 
							
						 
						
							2023-02-03 19:58:44 +01:00  
				
					
						
							
							
								 
						
							
								1d5395498d 
								
							 
						 
						
							
							
								
								[Glitch] chore: remove intersection-observer for old Safari support  
							
							... 
							
							
							
							Port 9cdd643564 
							
						 
						
							2023-02-03 19:24:32 +01:00  
				
					
						
							
							
								 
						
							
								fb9c786baf 
								
							 
						 
						
							
							
								
								[Glitch] Add lang attribute to image description textarea and poll option field  
							
							... 
							
							
							
							Port 2a4f2216d6 
							
						 
						
							2023-02-03 19:23:36 +01:00  
				
					
						
							
							
								 
						
							
								aeacebb3d7 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream updated `docker/build-push-action`, and we a different config
  for `docker/metadata-action` so the lines directly above were different,
  but it's not a real conflict.
  Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
  Upstream changed the codestyle near a line we had modified to accommodate
  configurable character count.
  Kept our change. 
							
						 
						
							2023-02-03 19:23:27 +01:00  
				
					
						
							
							
								 
						
							
								7e04b15ad8 
								
							 
						 
						
							
							
								
								fix(web-push-notifications): fix favourite push notifications ( #23286 )  
							
							... 
							
							
							
							Fix a bug where clicking in a favourite push notification would result in a 404 (not found) error, since we were redirecting the user to the wrong URL (we were redirecting to /@<user who favourited>/<favourited status id>, when it should be /@<favourited status author>/<favourited status id>) 
							
						 
						
							2023-02-03 09:29:32 +01:00  
				
					
						
							
							
								 
						
							
								b8c31f8110 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23221 )  
							
							... 
							
							
							
							* New translations en.yml (Serbian (Cyrillic))
* New translations en.yml (Swedish)
* New translations en.yml (Turkish)
* New translations en.yml (Ukrainian)
* New translations en.yml (Urdu (Pakistan))
* New translations en.yml (Icelandic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Indonesian)
* New translations en.yml (Persian)
* New translations en.yml (Tamil)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Thai)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Telugu)
* New translations en.yml (Burmese)
* New translations en.yml (Welsh)
* New translations en.yml (Faroese)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (Breton)
* New translations en.yml (Latin)
* New translations en.yml (Bosnian)
* New translations en.yml (French, Quebec)
* New translations en.yml (Sinhala)
* New translations en.yml (Cornish)
* New translations en.yml (Kannada)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Asturian)
* New translations en.yml (Aragonese)
* New translations en.yml (Serbian (Latin))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Scots)
* New translations en.yml (Igbo)
* New translations en.yml (Corsican)
* New translations en.yml (Sardinian)
* New translations en.yml (Sanskrit)
* New translations en.yml (Kabyle)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.json (Finnish)
* New translations en.json (Albanian)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Finnish)
* New translations en.yml (Hebrew)
* New translations en.yml (Japanese)
* New translations en.yml (Estonian)
* New translations en.yml (Portuguese)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Spanish)
* New translations en.yml (Albanian)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations en.yml (Faroese)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.json (Finnish)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Finnish)
* New translations en.yml (Japanese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Spanish, Mexico)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Korean)
* New translations en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Latvian)
* New translations en.json (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Galician)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (Galician)
* New translations en.yml (German)
* New translations en.yml (Faroese)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations en.json (Italian)
* New translations en.yml (German)
* New translations en.yml (Italian)
* New translations en.yml (Finnish)
* New translations en.yml (Hebrew)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Frisian)
* New translations en.yml (Finnish)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Italian)
* New translations en.yml (Finnish)
* New translations en.yml (Turkish)
* New translations en.yml (Estonian)
* New translations en.yml (German)
* New translations en.yml (Estonian)
* New translations en.yml (Turkish)
* New translations en.yml (Thai)
* New translations en.json (Czech)
* New translations en.json (Armenian)
* New translations en.json (Thai)
* New translations doorkeeper.en.yml (Armenian)
* New translations en.yml (Basque)
* New translations en.yml (Armenian)
* New translations en.yml (Thai)
* New translations en.yml (Basque)
* New translations en.yml (Belarusian)
* New translations en.yml (Hungarian)
* New translations en.json (Kazakh)
* New translations en.yml (Slovenian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations simple_form.en.yml (Uzbek)
* New translations activerecord.en.yml (Uzbek)
* New translations devise.en.yml (Uzbek)
* New translations doorkeeper.en.yml (Uzbek)
* New translations en.json (Kashubian)
* New translations en.yml (Kashubian)
* New translations simple_form.en.yml (Kashubian)
* New translations activerecord.en.yml (Kashubian)
* New translations devise.en.yml (Kashubian)
* New translations doorkeeper.en.yml (Kashubian)
* New translations en.json (Uzbek)
* New translations en.json (Uzbek)
* New translations en.yml (Polish)
* New translations en.json (Uzbek)
* New translations activerecord.en.yml (Uzbek)
* New translations en.json (Catalan)
* New translations en.json (Uzbek)
* New translations en.yml (Uzbek)
* New translations en.json (Catalan)
* New translations activerecord.en.yml (Catalan)
* New translations en.json (Uzbek)
* New translations devise.en.yml (Uzbek)
* New translations en.json (Indonesian)
* New translations en.yml (Indonesian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.yml (Hungarian)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.yml (Czech)
* New translations en.yml (Slovak)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations en.yml (Slovenian)
* New translations en.yml (Polish)
* New translations en.yml (Polish)
* New translations en.json (English, United Kingdom)
* New translations en.json (Vietnamese)
* New translations en.yml (French)
* New translations en.yml (Italian)
* New translations en.yml (French)
* New translations en.json (Catalan)
* New translations en.json (Belarusian)
* New translations en.yml (Dutch)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Basque)
* New translations doorkeeper.en.yml (Basque)
* New translations en.yml (Basque)
* New translations en.yml (Slovak)
* New translations simple_form.en.yml (Slovak)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations activerecord.en.yml (Korean)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Korean)
* New translations en.yml (Galician)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Spanish)
* New translations en.yml (Basque)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Swedish)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Slovak)
* New translations en.json (Korean)
* New translations en.json (Indonesian)
* New translations en.yml (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Danish)
* New translations en.yml (German)
* New translations en.yml (Korean)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Dutch)
* New translations en.json (Dutch)
* New translations en.json (Uzbek)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations devise.en.yml (Dutch)
* New translations en.json (Dutch)
* New translations en.yml (Dutch)
* New translations simple_form.en.yml (Dutch)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (English, United Kingdom)
* New translations en.json (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Bulgarian)
* New translations en.json (Korean)
* New translations en.yml (Belarusian)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Bulgarian)
* New translations en.yml (Korean)
* New translations devise.en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-02-01 19:59:31 +09:00  
				
					
						
							
							
								 
						
							
								e73b55184b 
								
							 
						 
						
							
							
								
								autofocus the compose form again on /share ( #23094 )  
							
							
							
						 
						
							2023-01-30 14:49:10 +01:00  
				
					
						
							
							
								 
						
							
								131e6403cc 
								
							 
						 
						
							
							
								
								Update hasOwnProperty calls for ESLint ( #23307 )  
							
							
							
						 
						
							2023-01-30 03:07:51 +01:00  
				
					
						
							
							
								 
						
							
								e6192eab9b 
								
							 
						 
						
							
							
								
								Remove unused ESLint disable directives ( #22427 )  
							
							
							
						 
						
							2023-01-30 02:11:50 +01:00  
				
					
						
							
							
								 
						
							
								c49213f0ea 
								
							 
						 
						
							
							
								
								Upgrade ESlint to v8 ( #23305 )  
							
							
							
						 
						
							2023-01-30 01:45:35 +01:00  
				
					
						
							
							
								 
						
							
								d9088ef327 
								
							 
						 
						
							
							
								
								Separate ESLint CI from Superlinter ( #23029 )  
							
							... 
							
							
							
							* Separate ESLint CI from Superlinter
* Correct JS indenting level
* Remove extra semicolons with ESLint autofix 
							
						 
						
							2023-01-29 23:44:03 +01:00  
				
					
						
							
							
								 
						
							
								9cdd643564 
								
							 
						 
						
							
							
								
								chore: remove intersection-observer for old Safari support ( #23284 )  
							
							
							
						 
						
							2023-01-29 19:02:04 +01:00  
				
					
						
							
							
								 
						
							
								2a4f2216d6 
								
							 
						 
						
							
							
								
								Add lang attribute to image description textarea and poll option field ( #23293 )  
							
							
							
						 
						
							2023-01-29 19:00:19 +01:00  
				
					
						
							
							
								 
						
							
								ec26f7c1b1 
								
							 
						 
						
							
							
								
								New translations en.json (German) ( #2097 )  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2023-01-28 10:20:55 +01:00  
				
					
						
							
							
								 
						
							
								d9a078e6d3 
								
							 
						 
						
							
							
								
								Add role badges to WebUI ( #2096 )  
							
							... 
							
							
							
							* [Glitch] Add role badges to WebUI
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
* [Glitch] Ensure role name remains readable
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-01-26 23:35:23 +01:00  
				
					
						
							
							
								 
						
							
								20abef6590 
								
							 
						 
						
							
							
								
								Allow users to set the trigger height for lengthy toot auto-collapse ( #2070 )  
							
							... 
							
							
							
							* Allow users to set the trigger height for lengthy toot autocollapse
Add a field in the glitch-soc preferences to set the exact height in pixels of a "lengthy toot" where auto-collapse is triggered
Originally authored by Dean Bassett (github.com/deanveloper)
Squashed 3 commits from neatchee/mastodon and returned some values to project defaults:
* ef665c1df5821e684c8da3392049f33243fafa74
* 0fce108d210efe55027a3af061bfc57aaaa83843
* 998f701a2b2e37edbda7dffb11a61f67f5559b18
* Remove bad escape characters
* Apply feedback from glitch-soc code review
- move input width specification to CSS
- adjust language for clarity
* Update comments re: lengthy toot height
* Fix inconsistent indentation
* Use a calculated width that scales better with browser font instead of static 45px width 
							
						 
						
							2023-01-26 19:36:44 +01:00  
				
					
						
							
							
								 
						
							
								2093436349 
								
							 
						 
						
							
							
								
								[Glitch] Fix styling of featured tags in light theme  
							
							... 
							
							
							
							Port e5ae75bf6a 
							
						 
						
							2023-01-25 17:27:23 +01:00  
				
					
						
							
							
								 
						
							
								0f4637981b 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-01-25 17:26:38 +01:00  
				
					
						
							
							
								 
						
							
								e5ae75bf6a 
								
							 
						 
						
							
							
								
								Fix styling of featured tags in light theme ( #23252 )  
							
							... 
							
							
							
							* Fix styling of featured tags in light theme
Fixes  #23251 
* Remove broken highlighting on /settings/featured_tags 
							
						 
						
							2023-01-25 16:28:29 +01:00  
				
					
						
							
							
								 
						
							
								ffea668076 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing filtering on some notification types  
							
							... 
							
							
							
							Port 98779535fe 
							
						 
						
							2023-01-24 20:43:19 +01:00  
				
					
						
							
							
								 
						
							
								853d0f28c5 
								
							 
						 
						
							
							
								
								[Glitch] Add lang attribute to compose textarea and CW field  
							
							... 
							
							
							
							Port 83a8efa9ca 
							
						 
						
							2023-01-24 20:40:48 +01:00  
				
					
						
							
							
								 
						
							
								78b822c61d 
								
							 
						 
						
							
							
								
								[Glitch] Make <Audio> to handle volume change  
							
							... 
							
							
							
							Port 3cf60ba267 
							
						 
						
							2023-01-24 20:37:37 +01:00  
				
					
						
							
							
								 
						
							
								cf3ad10e75 
								
							 
						 
						
							
							
								
								[Glitch] Fix upload area display in single-column mode  
							
							... 
							
							
							
							Port 54e798a5a0 
							
						 
						
							2023-01-24 20:36:59 +01:00  
				
					
						
							
							
								 
						
							
								3074338d79 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-01-24 20:32:31 +01:00  
				
					
						
							
							
								 
						
							
								83a8efa9ca 
								
							 
						 
						
							
							
								
								Add lang attribute to compose textarea and CW field ( #23240 )  
							
							... 
							
							
							
							Fixes  #19858  
						
							2023-01-24 18:49:21 +01:00  
				
					
						
							
							
								 
						
							
								3cf60ba267 
								
							 
						 
						
							
							
								
								Make <Audio> to handle volume change ( #23187 )  
							
							
							
						 
						
							2023-01-24 16:24:46 +01:00  
				
					
						
							
							
								 
						
							
								54e798a5a0 
								
							 
						 
						
							
							
								
								Fix upload area display in single-column mode ( #23217 )  
							
							
							
						 
						
							2023-01-23 17:42:58 +01:00  
				
					
						
							
							
								 
						
							
								958955cda4 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23150 )  
							
							... 
							
							
							
							* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Burmese)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Welsh)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Welsh)
* New translations activerecord.en.yml (Welsh)
* New translations devise.en.yml (Welsh)
* New translations en.json (Spanish)
* New translations en.json (German)
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Italian)
* New translations en.json (Polish)
* New translations en.json (Slovak)
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Faroese)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations en.json (Slovenian)
* New translations en.yml (Slovak)
* New translations en.yml (Slovenian)
* New translations en.json (Danish)
* New translations en.json (Chinese Traditional)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Korean)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations en.json (Hindi)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Galician)
* New translations doorkeeper.en.yml (Galician)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.json (Estonian)
* New translations en.json (Hebrew)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Portuguese)
* New translations en.yml (Slovak)
* New translations en.json (Hungarian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (French)
* New translations en.json (Slovak)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Slovak)
* New translations en.yml (Esperanto)
* New translations en.yml (French)
* New translations simple_form.en.yml (French)
* New translations doorkeeper.en.yml (French)
* New translations en.json (Norwegian)
* New translations en.json (Thai)
* New translations en.json (Basque)
* New translations en.json (Tatar)
* New translations en.json (Estonian)
* New translations en.json (Finnish)
* New translations en.json (Estonian)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Basque)
* New translations en.json (Basque)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.yml (Basque)
* New translations en.json (Arabic)
* New translations en.json (Slovak)
* New translations en.json (Kabyle)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Kabyle)
* New translations en.json (German)
* New translations en.json (Japanese)
* New translations en.json (German)
* New translations en.json (Tatar)
* New translations en.json (Occitan)
* New translations en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations simple_form.en.yml (Occitan)
* New translations en.json (Tatar)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations en.json (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (English, United Kingdom)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Croatian)
* New translations en.json (Portuguese)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.yml (Galician)
* New translations en.json (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.yml (Japanese)
* New translations en.json (Bulgarian)
* New translations en.yml (Japanese)
* New translations devise.en.yml (Bulgarian)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-01-24 00:37:35 +09:00  
				
					
						
							
							
								 
						
							
								98779535fe 
								
							 
						 
						
							
							
								
								Fix missing filtering on some notification types ( #23211 )  
							
							... 
							
							
							
							* Fix missing warning-type filtering on some notification types
* Fix missing hide-type filtering on some notification types 
							
						 
						
							2023-01-23 13:21:50 +01:00  
				
					
						
							
							
								 
						
							
								a4090ab646 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong text color on some buttons in light theme in web UI  
							
							... 
							
							
							
							Port 13e9d91ba7 
							
						 
						
							2023-01-21 15:08:51 +01:00  
				
					
						
							
							
								 
						
							
								0d20b38da7 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong padding in RTL layout in web UI  
							
							... 
							
							
							
							Port part of 4894deca7e 
							
						 
						
							2023-01-21 15:07:52 +01:00  
				
					
						
							
							
								 
						
							
								3fd3e88b25 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-01-21 14:58:15 +01:00  
				
					
						
							
							
								 
						
							
								13e9d91ba7 
								
							 
						 
						
							
							
								
								Fix wrong text color on some buttons in light theme in web UI ( #23156 )  
							
							
							
						 
						
							2023-01-19 15:51:27 +01:00  
				
					
						
							
							
								 
						
							
								4894deca7e 
								
							 
						 
						
							
							
								
								Fix wrong padding in RTL layout in web UI ( #23157 )  
							
							
							
						 
						
							2023-01-19 15:51:14 +01:00  
				
					
						
							
							
								 
						
							
								26c2b401a5 
								
							 
						 
						
							
							
								
								Fix missing admin CSS in glitch-soc flavor ( #2088 )  
							
							... 
							
							
							
							Port SCSS changes from 43f56f1291 
							
						 
						
							2023-01-18 18:54:04 +01:00  
				
					
						
							
							
								 
						
							
								a3f176423f 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #23052 )  
							
							... 
							
							
							
							* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Italian)
* New translations en.json (German)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.json (Portuguese)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Esperanto)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.json (Thai)
* New translations doorkeeper.en.yml (Turkish)
* New translations doorkeeper.en.yml (Thai)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Czech)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Turkish)
* New translations en.yml (Thai)
* New translations simple_form.en.yml (Thai)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Galician)
* New translations en.yml (Galician)
* New translations en.json (Portuguese)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations en.yml (Finnish)
* New translations en.yml (Polish)
* New translations en.yml (Italian)
* New translations en.yml (Ukrainian)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Aragonese)
* New translations doorkeeper.en.yml (Aragonese)
* New translations en.yml (Aragonese)
* New translations simple_form.en.yml (Aragonese)
* New translations en.yml (German)
* New translations en.yml (Hebrew)
* New translations simple_form.en.yml (German)
* New translations en.yml (Slovak)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations devise.en.yml (German)
* New translations en.yml (German)
* New translations en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovak)
* New translations en.yml (Spanish)
* New translations en.yml (Czech)
* New translations simple_form.en.yml (Slovak)
* New translations en.yml (Slovenian)
* New translations en.yml (Albanian)
* New translations en.yml (Catalan)
* New translations en.yml (German)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Portuguese)
* New translations en.yml (Galician)
* New translations en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Russian)
* New translations simple_form.en.yml (Russian)
* New translations en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations en.yml (Faroese)
* New translations simple_form.en.yml (Faroese)
* New translations en.yml (Hungarian)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Danish)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Danish)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations doorkeeper.en.yml (Spanish, Mexico)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Thai)
* New translations en.yml (Finnish)
* New translations en.yml (Latvian)
* New translations en.yml (Portuguese)
* New translations en.yml (Turkish)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.json (Kazakh)
* New translations en.yml (Frisian)
* New translations simple_form.en.yml (Frisian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Polish)
* New translations simple_form.en.yml (Polish)
* New translations en.json (Irish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations en.yml (Irish)
* New translations en.json (Irish)
* New translations en.yml (Irish)
* New translations doorkeeper.en.yml (Irish)
* New translations simple_form.en.yml (Irish)
* New translations devise.en.yml (Irish)
* New translations en.json (Persian)
* New translations en.json (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Welsh)
* New translations doorkeeper.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Welsh)
* New translations en.json (Spanish, Argentina)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (German)
* New translations en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Icelandic)
* New translations en.yml (Icelandic)
* New translations simple_form.en.yml (Icelandic)
* New translations activerecord.en.yml (Icelandic)
* New translations devise.en.yml (Icelandic)
* New translations en.json (Latin)
* New translations en.yml (Slovak)
* New translations en.yml (Slovak)
* New translations en.yml (Belarusian)
* New translations en.json (Estonian)
* New translations en.yml (Belarusian)
* New translations en.json (Albanian)
* New translations doorkeeper.en.yml (Albanian)
* New translations en.yml (Belarusian)
* New translations en.yml (Albanian)
* New translations simple_form.en.yml (Albanian)
* New translations activerecord.en.yml (Albanian)
* New translations devise.en.yml (Albanian)
* New translations en.json (Asturian)
* New translations en.json (Hindi)
* New translations en.yml (Dutch)
* New translations en.yml (Swedish)
* New translations en.yml (Estonian)
* New translations en.yml (Estonian)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations en.yml (Slovak)
* Normalize
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Burmese)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-01-19 02:31:13 +09:00  
				
					
						
							
							
								 
						
							
								3f74235ac5 
								
							 
						 
						
							
							
								
								[Glitch] Fix confusing wording in the sign in banner  
							
							... 
							
							
							
							Port 3588fbc766 
							
						 
						
							2023-01-18 17:59:06 +01:00  
				
					
						
							
							
								 
						
							
								00cc1536f2 
								
							 
						 
						
							
							
								
								[Glitch] Add listing of followed hashtags  
							
							... 
							
							
							
							Port 30e895299c 
							
						 
						
							2023-01-18 17:58:18 +01:00  
				
					
						
							
							
								 
						
							
								55e368c02f 
								
							 
						 
						
							
							
								
								[Glitch] Add option to make the landing page be /about even when trends are enabled  
							
							... 
							
							
							
							Port 3970a6f433 
							
						 
						
							2023-01-18 17:54:37 +01:00  
				
					
						
							
							
								 
						
							
								b5c6a116a7 
								
							 
						 
						
							
							
								
								[Glitch] Add support for editing media description and focus point of already-posted statuses  
							
							... 
							
							
							
							Port 4b92e59f4f 
							
						 
						
							2023-01-18 17:52:45 +01:00  
				
					
						
							
							
								 
						
							
								9b4afb320a 
								
							 
						 
						
							
							
								
								[Glitch] Change account moderation notes to make links clickable  
							
							... 
							
							
							
							Port 9b3e22c40d 
							
						 
						
							2023-01-18 17:49:29 +01:00  
				
					
						
							
							
								 
						
							
								9205b4e32f 
								
							 
						 
						
							
							
								
								[Glitch] Add checkmark symbol to checkbox  
							
							... 
							
							
							
							Port 7e6ffa085f 
							
						 
						
							2023-01-18 17:48:48 +01:00  
				
					
						
							
							
								 
						
							
								c87b1a20c7 
								
							 
						 
						
							
							
								
								[Glitch] Make visible change for new post notification setting icon  
							
							... 
							
							
							
							Port 1b2ef60cec 
							
						 
						
							2023-01-18 17:45:27 +01:00  
				
					
						
							
							
								 
						
							
								473fed2cdf 
								
							 
						 
						
							
							
								
								[Glitch] Fix /api/v1/admin/trends/tags using wrong serializer  
							
							... 
							
							
							
							Port b034dc42be 
							
						 
						
							2023-01-18 17:44:45 +01:00  
				
					
						
							
							
								 
						
							
								60abcb3c4c 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/i18n-tasks.yml`:
  Upstream added new ignored strings, glitch-soc has extra ignored strings
  because of the theming system.
  Added upstream's changes. 
							
						 
						
							2023-01-18 17:38:11 +01:00  
				
					
						
							
							
								 
						
							
								3588fbc766 
								
							 
						 
						
							
							
								
								Fix confusing wording in the sign in banner ( #22490 )  
							
							... 
							
							
							
							* Fix confusing wording in the sign in banner
* Split into two sentences 
							
						 
						
							2023-01-18 17:15:23 +01:00  
				
					
						
							
							
								 
						
							
								30e895299c 
								
							 
						 
						
							
							
								
								Add listing of followed hashtags ( #21773 )  
							
							... 
							
							
							
							* Add followed_tags route.
This at least gets us to the point where the page can actually be
rendered, although it doesn't display any hashtags (yet?).
Attempting to implement #20763 .
* Fix minor issues.
* I've got the followed tags data partially working
But the Hashtag component errors for some reason. Something about the
value of the history attribute being invalid.
* Fix a mistake in the code
* Minor change.
* Get the followed hashtags list fully working.
Still need to add the Follow/Unfollow buttons, though.
* Resolve JS linter issues.
* Add pagination logic to followed tags list view.
However, it currently loads further pages immediately on page load, so
that's not ideal. Need to figure that one out.
* Appease the linter.
* Apply suggestions from code review
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
* Fixes and resolve some other feedback.
* Use set/update instead of setIn/updateIn.
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-01-18 16:44:33 +01:00  
				
					
						
							
							
								 
						
							
								3970a6f433 
								
							 
						 
						
							
							
								
								Add option to make the landing page be /about even when trends are enabled ( #20808 )  
							
							... 
							
							
							
							* Add option to make the landing page be /about even when trends are enabled
* Restablish /explore as landing page by default 
							
						 
						
							2023-01-18 16:43:58 +01:00  
				
					
						
							
							
								 
						
							
								4b92e59f4f 
								
							 
						 
						
							
							
								
								Add support for editing media description and focus point of already-posted statuses ( #20878 )  
							
							... 
							
							
							
							* Add backend support for editing media attachments of existing posts
* Allow editing media attachments of already-posted toots
* Add tests 
							
						 
						
							2023-01-18 16:33:55 +01:00  
				
					
						
							
							
								 
						
							
								9b3e22c40d 
								
							 
						 
						
							
							
								
								Change account moderation notes to make links clickable ( #22553 )  
							
							... 
							
							
							
							* Change account moderation notes to make links clickable
Fixes  #22539 
* Fix styling of account moderation note links 
							
						 
						
							2023-01-18 16:32:23 +01:00  
				
					
						
							
							
								 
						
							
								7e6ffa085f 
								
							 
						 
						
							
							
								
								Add checkmark symbol to checkbox ( #22795 )  
							
							
							
						 
						
							2023-01-18 16:30:46 +01:00  
				
					
						
							
							
								 
						
							
								1b2ef60cec 
								
							 
						 
						
							
							
								
								Make visible change for new post notification setting icon ( #22541 )  
							
							
							
						 
						
							2023-01-18 16:29:07 +01:00  
				
					
						
							
							
								 
						
							
								b034dc42be 
								
							 
						 
						
							
							
								
								Fix /api/v1/admin/trends/tags using wrong serializer ( #18943 )  
							
							... 
							
							
							
							* Fix /api/v1/admin/trends/tags using wrong serializer
Fix regression from #18641 
* Only use `REST::Admin::TagSerializer` when the user can `manage_taxonomies`
* Fix admin trending hashtag component to not link if `id` is unknown 
							
						 
						
							2023-01-18 16:28:18 +01:00  
				
					
						
							
							
								 
						
							
								598888a7c4 
								
							 
						 
						
							
							
								
								[Glitch] Remove hardcoded width from dropdown overlays  
							
							... 
							
							
							
							Port f4a6365f55 
							
						 
						
							2023-01-12 17:48:10 +01:00  
				
					
						
							
							
								 
						
							
								cef87ba86c 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-01-12 17:47:42 +01:00  
				
					
						
							
							
								 
						
							
								f4a6365f55 
								
							 
						 
						
							
							
								
								Remove hardcoded width from dropdown overlays ( #23062 )  
							
							... 
							
							
							
							* Remove hardcoded width from dropdown overlays
* Fix emoji picker position 
							
						 
						
							2023-01-12 16:43:02 +01:00  
				
					
						
							
							
								 
						
							
								a36dfbb2aa 
								
							 
						 
						
							
							
								
								[Glitch] Fix dropdown menu positions when scrolling  
							
							... 
							
							
							
							Port fd33bcb3b2 
							
						 
						
							2023-01-12 11:18:22 +01:00  
				
					
						
							
							
								 
						
							
								3e63fcd4f0 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/status.rb`:
  Minor upstream refactor moved hook definitions around,
  and glitch-soc has an extra `before_create`.
  Moved the `before_create` accordingly.
- `app/services/batched_remove_status_service.rb`:
  Minor upstream refactor changed a block in which glitch-soc
  had one extra call to handle direct timelines.
  Adapted changes to keep glitch-soc's extra call. 
							
						 
						
							2023-01-12 10:15:46 +01:00  
				
					
						
							
							
								 
						
							
								fd33bcb3b2 
								
							 
						 
						
							
							
								
								Fix dropdown menu positions when scrolling ( #22916 )  
							
							... 
							
							
							
							* Update react-overlays to latest version
* Fix breaking changes in dropdown menus
* Use react-overlays built-in arrow positioning feature
* Re-implemented `.dropdown-menu__arrow` to have a defined width and height to improve positioning
* Moved wrapping div (`.dropdown-menu` from `DropdownMenu` to `Dropdown`)
* Wrap button in a span to solve issue with ref
* Temporarily remove animations
* Fix breaking changes in emoji picker
* Wrap EmojiPickerMenu in a div where react-overlays’ ref is added
* Fix breaking changes in language dropdown
* Fix breaking changes in privacy dropdown
* Fix breaking changes in search form
* Add animations back using `@keyframes`
* Fix arrow color in light theme
* Fix linting issue
* Remove unused `mounted` state
* Remove `placement` state from components and redux
And remove the placement state from props of the menu components.
* Remove abolution position to fix flip issue
* Remove z-index to fix modals and overlay positions
* Fix lint issues
* Set placement in privacy and language components
Copy the placement state into the `PrivacyDropdown` and `LanguageDropdown` components, to apply correct styling to the buttons depending on which placement the Overlay has.
* Move `placement` state to correct component 
							
						 
						
							2023-01-11 21:58:46 +01:00  
				
					
						
							
							
								 
						
							
								f6e34ca134 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #22953 )  
							
							... 
							
							
							
							* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.json (Belarusian)
* New translations en.json (Vietnamese)
* New translations en.json (Asturian)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations activerecord.en.yml (Estonian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (German)
* New translations activerecord.en.yml (German)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (German)
* New translations en.json (Danish)
* New translations en.json (Arabic)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.json (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.json (Galician)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.json (Hungarian)
* New translations en.yml (Russian)
* New translations en.json (Turkish)
* New translations devise.en.yml (Estonian)
* New translations en.json (Catalan)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Occitan)
* New translations en.yml (Occitan)
* New translations en.json (Finnish)
* New translations en.json (Hindi)
* New translations en.json (Hindi)
* New translations en.json (Czech)
* New translations en.json (Thai)
* New translations en.json (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Estonian)
* New translations doorkeeper.en.yml (Spanish)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Finnish)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (English, United Kingdom)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* New translations en.json (Irish)
* New translations en.json (Korean)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Irish)
* New translations en.json (Latvian)
* New translations en.json (Spanish)
* New translations en.json (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Belarusian)
* New translations en.json (Catalan)
* New translations en.json (Finnish)
* New translations en.json (Faroese)
* New translations en.yml (Finnish)
* New translations simple_form.en.yml (Finnish)
* New translations en.json (Czech)
* New translations en.json (Frisian)
* New translations en.json (Finnish)
* New translations en.json (Dutch)
* New translations en.json (Polish)
* New translations en.json (Icelandic)
* New translations en.json (German)
* New translations en.json (Hungarian)
* New translations en.json (Italian)
* New translations en.json (Portuguese)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Thai)
* New translations en.json (Estonian)
* New translations en.json (Serbian (Latin))
* New translations en.json (Bulgarian)
* New translations en.json (Swedish)
* New translations en.json (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Portuguese)
* New translations en.json (Galician)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Esperanto)
* New translations en.json (Danish)
* New translations en.json (French)
* New translations en.json (Albanian)
* New translations en.yml (French)
* New translations en.yml (Portuguese)
* New translations en.json (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Portuguese)
* New translations en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations en.yml (Portuguese)
* New translations en.json (Belarusian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Vietnamese)
* New translations en.json (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.json (Norwegian)
* New translations en.json (Norwegian Nynorsk)
* New translations devise.en.yml (Bulgarian)
* New translations en.yml (Galician)
* New translations en.json (Slovak)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Welsh)
* New translations en.yml (Portuguese)
* New translations en.yml (Portuguese)
* New translations en.json (Croatian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations en.json (Bulgarian)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.yml (Portuguese)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Portuguese)
* New translations en.json (Portuguese)
* New translations en.yml (Portuguese)
* New translations simple_form.en.yml (Portuguese)
* New translations en.yml (Bulgarian)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-01-11 21:41:34 +09:00  
				
					
						
							
							
								 
						
							
								fdabfb9d0e 
								
							 
						 
						
							
							
								
								[Glitch] Fix footer link circle dividers' screen reader accessibility by adding aria-hidden  
							
							... 
							
							
							
							Port 2bcb081ce8 
							
						 
						
							2023-01-10 09:39:19 +01:00  
				
					
						
							
							
								 
						
							
								b6a928cd04 
								
							 
						 
						
							
							
								
								[Glitch] Add variable autoFocus to video  
							
							... 
							
							
							
							Port 2195f21524 
							
						 
						
							2023-01-10 09:39:19 +01:00  
				
					
						
							
							
								 
						
							
								9765d2b3f8 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/environments/production.rb`:
  Upstream changed headers, and we have different ones.
  Ported upstream's change. 
							
						 
						
							2023-01-10 09:39:15 +01:00  
				
					
						
							
							
								 
						
							
								2bcb081ce8 
								
							 
						 
						
							
							
								
								Fix footer link circle dividers' screen reader accessibility by adding aria-hidden ( #22576 )  
							
							... 
							
							
							
							* Fix footer link circle dividers' screen reader accessibility by adding aria-hidden
* Remove a circle erroneously added in prev commit, and make code more DRY 
							
						 
						
							2023-01-09 03:54:03 +01:00  
				
					
						
							
							
								 
						
							
								2195f21524 
								
							 
						 
						
							
							
								
								Add variable autoFocus to video ( #15281 ) ( #22778 )  
							
							... 
							
							
							
							* add variable autoFocus to video
* set autoFocus in video_modal.js 
							
						 
						
							2023-01-09 03:52:37 +01:00  
				
					
						
							
							
								 
						
							
								105e1f0ca6 
								
							 
						 
						
							
							
								
								Correct hashtag warning ( #22827 )  
							
							... 
							
							
							
							Posts with any visibility setting that is not 'Public' are prevented
from being listed under any hashtag. 
							
						 
						
							2023-01-09 03:18:20 +01:00  
				
					
						
							
							
								 
						
							
								d11d15748c 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #22901 )  
							
							... 
							
							
							
							* New translations en.json (Norwegian)
* New translations en.json (English, United Kingdom)
* New translations en.yml (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.yml (Norwegian)
* New translations simple_form.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Norwegian)
* New translations en.yml (Hebrew)
* New translations en.yml (German)
* New translations activerecord.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations en.yml (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.yml (Finnish)
* New translations en.json (Dutch)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Finnish)
* New translations en.yml (Finnish)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Dutch)
* New translations en.json (Bulgarian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Finnish)
* New translations en.json (Frisian)
* New translations en.json (Frisian)
* New translations en.yml (Frisian)
* New translations doorkeeper.en.yml (Frisian)
* New translations en.yml (Esperanto)
* New translations en.json (Estonian)
* New translations en.json (Romanian)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.json (Afrikaans)
* New translations en.json (Arabic)
* New translations en.json (Belarusian)
* New translations en.json (Bulgarian)
* New translations en.json (Catalan)
* New translations en.json (Czech)
* New translations en.json (Danish)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Basque)
* New translations en.json (Finnish)
* New translations en.json (Irish)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Armenian)
* New translations en.json (Italian)
* New translations en.json (Japanese)
* New translations en.json (Georgian)
* New translations en.json (Korean)
* New translations en.json (Lithuanian)
* New translations en.json (Macedonian)
* New translations en.json (Dutch)
* New translations en.json (Norwegian)
* New translations en.json (Punjabi)
* New translations en.json (Polish)
* New translations en.json (Portuguese)
* New translations en.json (Russian)
* New translations en.json (Slovak)
* New translations en.json (Slovenian)
* New translations en.json (Albanian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Turkish)
* New translations en.json (Ukrainian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Traditional)
* New translations en.json (Urdu (Pakistan))
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Indonesian)
* New translations en.json (Persian)
* New translations en.json (Tamil)
* New translations en.json (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.json (Bengali)
* New translations en.json (Marathi)
* New translations en.json (Thai)
* New translations en.json (Croatian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Kazakh)
* New translations en.json (Estonian)
* New translations en.json (Latvian)
* New translations en.json (Hindi)
* New translations en.json (Malay)
* New translations en.json (Telugu)
* New translations en.json (Burmese)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Uyghur)
* New translations en.json (Chinese Traditional, Hong Kong)
* New translations en.json (Tatar)
* New translations en.json (Malayalam)
* New translations en.json (Breton)
* New translations en.json (Latin)
* New translations en.json (Bosnian)
* New translations en.json (French, Quebec)
* New translations en.json (Sinhala)
* New translations en.json (Cornish)
* New translations en.json (Kannada)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (Aragonese)
* New translations en.json (Occitan)
* New translations en.json (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.json (Scots)
* New translations en.json (Igbo)
* New translations en.json (Corsican)
* New translations en.json (Sardinian)
* New translations en.json (Sanskrit)
* New translations en.json (Kabyle)
* New translations en.json (Ido)
* New translations en.json (Taigi)
* New translations en.json (Silesian)
* New translations en.json (Standard Moroccan Tamazight)
* Normalize
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Greek)
* New translations en.json (Frisian)
* New translations en.json (Hebrew)
* New translations en.json (Hungarian)
* New translations en.json (Italian)
* New translations en.json (Dutch)
* New translations en.json (Slovenian)
* New translations en.json (Serbian (Cyrillic))
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.json (Vietnamese)
* New translations en.json (Galician)
* New translations en.json (Icelandic)
* New translations en.json (Indonesian)
* New translations en.json (Latvian)
* New translations en.json (Welsh)
* New translations en.json (Faroese)
* New translations en.json (Esperanto)
* New translations en.json (Serbian (Latin))
* New translations simple_form.en.yml (Galician)
* New translations en.json (Danish)
* New translations en.json (Japanese)
* New translations en.json (Korean)
* New translations en.yml (Japanese)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-01-06 01:03:53 +09:00  
				
					
						
							
							
								 
						
							
								c4649ae9d4 
								
							 
						 
						
							
							
								
								[Glitch] Add dropdown menu item to open admin interface for remote domains  
							
							... 
							
							
							
							Port 18d00055f4 
							
						 
						
							2023-01-05 16:31:20 +01:00  
				
					
						
							
							
								 
						
							
								1219c57209 
								
							 
						 
						
							
							
								
								[Glitch] Replace hide toot with hide post  
							
							... 
							
							
							
							Port 8cff96d94d 
							
						 
						
							2023-01-05 15:15:27 +01:00  
				
					
						
							
							
								 
						
							
								4404a7f065 
								
							 
						 
						
							
							
								
								[Glitch] Add aria-hidden to content warning field when dimmed so that it is not confusing to screen reader users  
							
							... 
							
							
							
							Port 83888739fd 
							
						 
						
							2023-01-05 15:14:04 +01:00  
				
					
						
							
							
								 
						
							
								4f335da8f8 
								
							 
						 
						
							
							
								
								[Glitch] Add aria-hidden to 'Hide image' button in MediaGallery since the button is useless to screen reader users  
							
							... 
							
							
							
							Port c5da2f8c43 
							
						 
						
							2023-01-05 15:12:33 +01:00  
				
					
						
							
							
								 
						
							
								1702907a9d 
								
							 
						 
						
							
							
								
								[Glitch] Improve the contrast of the chart in “poll has ended” notifications  
							
							... 
							
							
							
							Port b81b646e3b 
							
						 
						
							2023-01-05 15:11:23 +01:00  
				
					
						
							
							
								 
						
							
								009fee7954 
								
							 
						 
						
							
							
								
								Remove object-fit polyfill for the old Microsoft Edge  
							
							... 
							
							
							
							Port d68c12648c 
							
						 
						
							2023-01-05 15:10:31 +01:00  
				
					
						
							
							
								 
						
							
								6c20dad201 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js` 
							
						 
						
							2023-01-05 14:16:25 +01:00  
				
					
						
							
							
								 
						
							
								18d00055f4 
								
							 
						 
						
							
							
								
								Add dropdown menu item to open admin interface for remote domains ( #21895 )  
							
							... 
							
							
							
							* Allow /admin/instances/:domain to handle IDNs
* Add dropdown menu item to open admin interface for remote domains 
							
						 
						
							2023-01-05 14:03:46 +01:00  
				
					
						
							
							
								 
						
							
								8cff96d94d 
								
							 
						 
						
							
							
								
								Replace hide toot with hide post ( #22385 )  
							
							... 
							
							
							
							* Change "Hide toot" to "Hide post"
* Update status_action_bar.js
Replace "Hide toot" with "Hide post" 
							
						 
						
							2023-01-05 13:45:01 +01:00  
				
					
						
							
							
								 
						
							
								a3b24d483e 
								
							 
						 
						
							
							
								
								Fix “Add new domain block” button using last submitted instead of current search value ( #22485 )  
							
							... 
							
							
							
							Fixes  #22162  
						
							2023-01-05 13:42:38 +01:00  
				
					
						
							
							
								 
						
							
								83888739fd 
								
							 
						 
						
							
							
								
								Add aria-hidden to content warning field when dimmed so that it is not confusing to screen reader users ( #22568 )  
							
							
							
						 
						
							2023-01-05 13:39:58 +01:00  
				
					
						
							
							
								 
						
							
								c5da2f8c43 
								
							 
						 
						
							
							
								
								Add aria-hidden to 'Hide image' button in MediaGallery since the button is useless to screen reader users ( #22513 )  
							
							
							
						 
						
							2023-01-05 13:36:42 +01:00  
				
					
						
							
							
								 
						
							
								b81b646e3b 
								
							 
						 
						
							
							
								
								Improve the contrast of the chart in “poll has ended” notifications ( #22575 )  
							
							... 
							
							
							
							* Improve the contrast of the chart in “poll has ended” notifications
* Further increase the contrast of non-leading poll options 
							
						 
						
							2023-01-05 13:34:10 +01:00  
				
					
						
							
							
								 
						
							
								7e9d5bdbb9 
								
							 
						 
						
							
							
								
								[Glitch] Fix unnecessary re-rendering of various components when typing in web UI ( #2063 )  
							
							... 
							
							
							
							Port 9620ee90be 
							
						 
						
							2023-01-05 13:32:29 +01:00  
				
					
						
							
							
								 
						
							
								d68c12648c 
								
							 
						 
						
							
							
								
								Remove object-fit polyfill for the old Microsoft Edge ( #22693 )  
							
							... 
							
							
							
							* chore: remove object-fit-images and its postcss packages
* chore: update postcss config
* chore: remove object-fit-image from extra_polyfills.js
* chore: remove object-fit property check from load_polyfills.js 
							
						 
						
							2023-01-05 13:32:02 +01:00  
				
					
						
							
							
								 
						
							
								cba7158085 
								
							 
						 
						
							
							
								
								Fix prettifier/lint issues ( #2066 )  
							
							... 
							
							
							
							* Add glitch-soc locale files to prettierignore
* Run prettier on theme.yml
* Add glitch-soc emoji_map.json to .prettierignore
* Run prettier on config/i18n-tasks.yml 
							
						 
						
							2023-01-04 18:38:45 +01:00  
				
					
						
							
							
								 
						
							
								17f79082b0 
								
							 
						 
						
							
							
								
								Bump stylelint from 14.14.0 to 14.16.1 ( #22910 )  
							
							... 
							
							
							
							* Bump stylelint-config-standard-scss from 5.0.0 to 6.1.0
Bumps [stylelint-config-standard-scss](https://github.com/stylelint-scss/stylelint-config-standard-scss ) from 5.0.0 to 6.1.0.
- [Release notes](https://github.com/stylelint-scss/stylelint-config-standard-scss/releases )
- [Changelog](https://github.com/stylelint-scss/stylelint-config-standard-scss/blob/main/CHANGELOG.md )
- [Commits](https://github.com/stylelint-scss/stylelint-config-standard-scss/compare/v5.0.0...v6.1.0 )
---
updated-dependencies:
- dependency-name: stylelint-config-standard-scss
  dependency-type: direct:development
  update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump stylelint from 14.14.0 to 14.16.1
Bumps [stylelint](https://github.com/stylelint/stylelint ) from 14.14.0 to 14.16.1.
- [Release notes](https://github.com/stylelint/stylelint/releases )
- [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md )
- [Commits](https://github.com/stylelint/stylelint/compare/14.14.0...14.16.1 )
---
updated-dependencies:
- dependency-name: stylelint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
* Fix
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-01-04 21:13:57 +09:00  
				
					
						
							
							
								 
						
							
								910d2d9f6b 
								
							 
						 
						
							
							
								
								Prevent doodle from closing on outside click ( #2047 )  
							
							... 
							
							
							
							Adds a new property to the dispatch, which when set to true, replaces the onClose handler with a no-op, preventing the modal from closing.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-01-04 11:59:43 +01:00  
				
					
						
							
							
								 
						
							
								476c131946 
								
							 
						 
						
							
							
								
								[Glitch] Replace flex styling with sensible layout rules  
							
							... 
							
							
							
							Port ef4d29c879 
							
						 
						
							2023-01-02 17:32:29 +01:00  
				
					
						
							
							
								 
						
							
								b4aabf3cf1 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge  
							
							
							
						 
						
							2023-01-02 17:29:59 +01:00  
				
					
						
							
							
								 
						
							
								41fe7576bf 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #22560 )  
							
							... 
							
							
							
							* New translations devise.en.yml (Slovak)
* New translations devise.en.yml (Slovenian)
* New translations devise.en.yml (Albanian)
* New translations devise.en.yml (Serbian (Cyrillic))
* New translations devise.en.yml (Swedish)
* New translations devise.en.yml (Turkish)
* New translations devise.en.yml (Ukrainian)
* New translations devise.en.yml (Chinese Simplified)
* New translations devise.en.yml (Chinese Traditional)
* New translations devise.en.yml (Urdu (Pakistan))
* New translations devise.en.yml (Vietnamese)
* New translations devise.en.yml (Galician)
* New translations devise.en.yml (Icelandic)
* New translations devise.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Indonesian)
* New translations devise.en.yml (Persian)
* New translations devise.en.yml (Tamil)
* New translations devise.en.yml (Spanish, Argentina)
* New translations devise.en.yml (Spanish, Mexico)
* New translations devise.en.yml (Bengali)
* New translations devise.en.yml (Thai)
* New translations devise.en.yml (Croatian)
* New translations devise.en.yml (Norwegian Nynorsk)
* New translations devise.en.yml (Kazakh)
* New translations devise.en.yml (Estonian)
* New translations devise.en.yml (Latvian)
* New translations devise.en.yml (Hindi)
* New translations devise.en.yml (Malay)
* New translations devise.en.yml (English, United Kingdom)
* New translations devise.en.yml (Welsh)
* New translations devise.en.yml (Faroese)
* New translations devise.en.yml (Chinese Traditional, Hong Kong)
* New translations devise.en.yml (Tatar)
* New translations devise.en.yml (Malayalam)
* New translations devise.en.yml (Breton)
* New translations devise.en.yml (French, Quebec)
* New translations devise.en.yml (Sinhala)
* New translations devise.en.yml (Kannada)
* New translations devise.en.yml (Scottish Gaelic)
* New translations devise.en.yml (Asturian)
* New translations devise.en.yml (Aragonese)
* New translations devise.en.yml (Occitan)
* New translations devise.en.yml (Serbian (Latin))
* New translations devise.en.yml (Kurmanji (Kurdish))
* New translations devise.en.yml (Sorani (Kurdish))
* New translations devise.en.yml (Scots)
* New translations devise.en.yml (Corsican)
* New translations devise.en.yml (Sardinian)
* New translations devise.en.yml (Kabyle)
* New translations devise.en.yml (Ido)
* New translations devise.en.yml (Standard Moroccan Tamazight)
* New translations doorkeeper.en.yml (Romanian)
* New translations doorkeeper.en.yml (French)
* New translations doorkeeper.en.yml (Spanish)
* New translations doorkeeper.en.yml (Afrikaans)
* New translations doorkeeper.en.yml (Arabic)
* New translations doorkeeper.en.yml (Belarusian)
* New translations doorkeeper.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Catalan)
* New translations doorkeeper.en.yml (Czech)
* New translations doorkeeper.en.yml (Danish)
* New translations doorkeeper.en.yml (German)
* New translations doorkeeper.en.yml (Greek)
* New translations doorkeeper.en.yml (Basque)
* New translations doorkeeper.en.yml (Finnish)
* New translations doorkeeper.en.yml (Irish)
* New translations doorkeeper.en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hungarian)
* New translations doorkeeper.en.yml (Armenian)
* New translations doorkeeper.en.yml (Italian)
* New translations doorkeeper.en.yml (Japanese)
* New translations doorkeeper.en.yml (Georgian)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Dutch)
* New translations doorkeeper.en.yml (Norwegian)
* New translations doorkeeper.en.yml (Portuguese)
* New translations doorkeeper.en.yml (Russian)
* New translations doorkeeper.en.yml (Slovak)
* New translations doorkeeper.en.yml (Slovenian)
* New translations doorkeeper.en.yml (Albanian)
* New translations doorkeeper.en.yml (Serbian (Cyrillic))
* New translations doorkeeper.en.yml (Swedish)
* New translations doorkeeper.en.yml (Turkish)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Vietnamese)
* New translations doorkeeper.en.yml (Galician)
* New translations doorkeeper.en.yml (Icelandic)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations doorkeeper.en.yml (Persian)
* New translations doorkeeper.en.yml (Tamil)
* New translations doorkeeper.en.yml (Spanish, Argentina)
* New translations doorkeeper.en.yml (Marathi)
* New translations doorkeeper.en.yml (Thai)
* New translations doorkeeper.en.yml (Croatian)
* New translations doorkeeper.en.yml (Norwegian Nynorsk)
* New translations doorkeeper.en.yml (Kazakh)
* New translations doorkeeper.en.yml (Estonian)
* New translations doorkeeper.en.yml (Latvian)
* New translations doorkeeper.en.yml (Hindi)
* New translations doorkeeper.en.yml (Malay)
* New translations doorkeeper.en.yml (Welsh)
* New translations doorkeeper.en.yml (Faroese)
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Tatar)
* New translations doorkeeper.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Breton)
* New translations doorkeeper.en.yml (French, Quebec)
* New translations doorkeeper.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Scottish Gaelic)
* New translations doorkeeper.en.yml (Asturian)
* New translations doorkeeper.en.yml (Aragonese)
* New translations doorkeeper.en.yml (Occitan)
* New translations doorkeeper.en.yml (Serbian (Latin))
* New translations doorkeeper.en.yml (Kurmanji (Kurdish))
* New translations doorkeeper.en.yml (Sorani (Kurdish))
* New translations doorkeeper.en.yml (Scots)
* New translations doorkeeper.en.yml (Corsican)
* New translations doorkeeper.en.yml (Sardinian)
* New translations doorkeeper.en.yml (Kabyle)
* New translations doorkeeper.en.yml (Ido)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Kannada)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.json (Italian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Arabic)
* New translations en.yml (Frisian)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations en.yml (Estonian)
* New translations en.yml (Norwegian Nynorsk)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations devise.en.yml (Estonian)
* New translations doorkeeper.en.yml (Estonian)
* New translations en.yml (Asturian)
* New translations en.yml (Vietnamese)
* New translations en.json (Bulgarian)
* New translations en.json (Estonian)
* New translations en.json (Bulgarian)
* New translations en.yml (Bulgarian)
* New translations simple_form.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Catalan)
* New translations simple_form.en.yml (Bulgarian)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Catalan)
* New translations en.yml (Asturian)
* New translations en.json (Catalan)
* New translations en.json (Estonian)
* New translations en.json (Estonian)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations simple_form.en.yml (Estonian)
* New translations en.json (Estonian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Latvian)
* New translations en.yml (Latvian)
* New translations simple_form.en.yml (Latvian)
* New translations doorkeeper.en.yml (Latvian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.json (Estonian)
* New translations en.yml (Indonesian)
* New translations doorkeeper.en.yml (Indonesian)
* New translations en.json (Latvian)
* New translations en.yml (Galician)
* New translations doorkeeper.en.yml (Belarusian)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (Esperanto)
* New translations doorkeeper.en.yml (Belarusian)
* New translations en.json (Estonian)
* New translations en.json (Hebrew)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.json (German)
* New translations en.yml (German)
* New translations activerecord.en.yml (German)
* New translations doorkeeper.en.yml (German)
* New translations en.yml (Esperanto)
* New translations en.yml (Esperanto)
* New translations en.json (Asturian)
* New translations en.yml (Asturian)
* New translations en.yml (Asturian)
* New translations en.json (German)
* New translations en.yml (Polish)
* New translations en.yml (Estonian)
* New translations simple_form.en.yml (Estonian)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations en.yml (German)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (Esperanto)
* New translations en.yml (Frisian)
* New translations en.yml (Frisian)
* New translations en.json (Taigi)
* New translations en.yml (Frisian)
* New translations en.json (Catalan)
* New translations en.yml (Catalan)
* New translations en.yml (Frisian)
* New translations simple_form.en.yml (Catalan)
* New translations en.yml (Frisian)
* New translations en.json (Vietnamese)
* New translations en.json (English, United Kingdom)
* New translations en.yml (Frisian)
* New translations en.yml (English, United Kingdom)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations doorkeeper.en.yml (English, United Kingdom)
* New translations en.yml (Ido)
* New translations activerecord.en.yml (Ido)
* New translations simple_form.en.yml (French, Quebec)
* New translations en.yml (Catalan)
* New translations simple_form.en.yml (Catalan)
* New translations doorkeeper.en.yml (Catalan)
* New translations en.json (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Vietnamese)
* New translations simple_form.en.yml (Vietnamese)
* New translations devise.en.yml (Vietnamese)
* Normalize
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-01-01 21:31:53 +09:00  
				
					
						
							
							
								 
						
							
								498cde7dc6 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2048 )  
							
							... 
							
							
							
							* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[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.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip] 
							
						 
						
							2022-12-30 18:31:26 +01:00  
				
					
						
							
							
								 
						
							
								ef4d29c879 
								
							 
						 
						
							
							
								
								Replace flex styling with sensible layout rules ( #22803 )  
							
							... 
							
							
							
							The old styling would cause multiple admin header buttons in a flex container to overflow the page on mobile. This new styling uses `flex-flow: wrap` along with a gap, which gets rid of the awkward `:not(:first-child)` pseudoselector and makes multiple buttons in a row flow nicely. 
							
						 
						
							2022-12-28 10:21:10 +01:00  
				
					
						
							
							
								 
						
							
								cbfeb105a8 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2045 )  
							
							... 
							
							
							
							* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Hindi)
[ci skip] 
							
						 
						
							2022-12-23 23:27:03 +01:00  
				
					
						
							
							
								 
						
							
								08837f730d 
								
							 
						 
						
							
							
								
								Use wrapper div as a spacer ( #2046 )  
							
							... 
							
							
							
							Keeps the alignment of timestamps, while also reducing clickable size
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2022-12-23 18:59:20 +01:00  
				
					
						
							
							
								 
						
							
								4b51d1386b 
								
							 
						 
						
							
							
								
								Realign timestamps ( #2044 )  
							
							... 
							
							
							
							Add missing display and overflow properties.
Fixes misaligned timestamps and missing overflow in search.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2022-12-23 12:35:03 +01:00  
				
					
						
							
							
								 
						
							
								05b3907b0c 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2043 )  
							
							... 
							
							
							
							* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations simple_form.en.yml (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip] 
							
						 
						
							2022-12-23 10:15:47 +01:00