2d029dedd9 
								
							 
						 
						
							
							
								
								Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes. 
							
						 
						
							2023-05-08 15:28:36 +02:00  
				
					
						
							
							
								 
						
							
								5d18840ab9 
								
							 
						 
						
							
							
								
								Fix more JS linting issues ( #2212 )  
							
							... 
							
							
							
							* Fix uses of intl.formatMessages without default messages
* Ignore lint issue for ColumnLink button 
							
						 
						
							2023-05-08 15:16:55 +02:00  
				
					
						
							
							
								 
						
							
								9818f34273 
								
							 
						 
						
							
							
								
								Rewrite Domain component as function component ( #24896 )  
							
							
							
						 
						
							2023-05-08 15:12:12 +02:00  
				
					
						
							
							
								 
						
							
								5bc8e2d1fd 
								
							 
						 
						
							
							
								
								Use LayoutType from is_mobile in actions/app ( #24863 )  
							
							
							
						 
						
							2023-05-08 15:10:21 +02:00  
				
					
						
							
							
								 
						
							
								16c5354b8c 
								
							 
						 
						
							
							
								
								Fix some more JS linting issues ( #2211 )  
							
							... 
							
							
							
							* Minor refactor and linting fixup in `flavours/glitch/actions/accounts.js`
This is some added boilerplate but it's much more consistent with the remaining
of the code, and avoids the linting issue.
* Fix missing /privacy-policy link in DM warning because of wrongly-named import
* Fix unnecessary import
* Fix regexp in flavours/glitch/utils/hashtag.js 
							
						 
						
							2023-05-08 14:02:41 +02:00  
				
					
						
							
							
								 
						
							
								7c1305b3a4 
								
							 
						 
						
							
							
								
								Add TypeScript support for `mastodon` alias and image imports ( #24895 )  
							
							
							
						 
						
							2023-05-08 11:28:36 +02:00  
				
					
						
							
							
								 
						
							
								76264e3fe8 
								
							 
						 
						
							
							
								
								Rewrite RadioButton component as FC ( #24897 )  
							
							
							
						 
						
							2023-05-08 11:12:53 +02:00  
				
					
						
							
							
								 
						
							
								a65d2d1045 
								
							 
						 
						
							
							
								
								Rewrite Image component as function component  ( #24893 )  
							
							
							
						 
						
							2023-05-08 11:12:44 +02:00  
				
					
						
							
							
								 
						
							
								490ccbf40b 
								
							 
						 
						
							
							
								
								Rewrite <NotSignedInIndicator /> as FC ( #24903 )  
							
							
							
						 
						
							2023-05-08 11:12:13 +02:00  
				
					
						
							
							
								 
						
							
								6fdbee240c 
								
							 
						 
						
							
							
								
								Rewrite <Check /> as FC ( #24901 )  
							
							
							
						 
						
							2023-05-08 08:26:02 +02:00  
				
					
						
							
							
								 
						
							
								de74acbe0c 
								
							 
						 
						
							
							
								
								Fix some more Javascript linting issues and discrepancies with upstream ( #2209 )  
							
							... 
							
							
							
							* Fix typo in flavours/glitch/features/video/index.js
* Fix various linting issues and discrepancies with upstream 
							
						 
						
							2023-05-07 21:43:25 +02:00  
				
					
						
							
							
								 
						
							
								ed0a407888 
								
							 
						 
						
							
							
								
								Fix thread lines not being properly updated when new posts are received ( #2210 )  
							
							
							
						 
						
							2023-05-07 20:06:10 +02:00  
				
					
						
							
							
								 
						
							
								179e38cf15 
								
							 
						 
						
							
							
								
								Reset language to default when cancelling a reply ( #2114 )  
							
							... 
							
							
							
							When cancelling a reply, the language was still set to the language of the replied to toot.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-05-07 18:45:10 +02:00  
				
					
						
							
							
								 
						
							
								3fb7fe14c6 
								
							 
						 
						
							
							
								
								Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream ( #2208 )  
							
							... 
							
							
							
							* Run eslint --fix
* Fix linting issues in video player and reduce divergences with upstream
This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.
* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`
Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.
* Fix linting issue and bug in streaming/index.js
* Fix linting issues in config/webpack/shared.js
* Fix unused import in flavours/glitch/features/ui/index.js
* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx
* Fix linting issues in flavours/glitch/reducers
* Fix linting issues in glitch-soc onboarding modal
* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx
* Remove dead code for unused local setting navbar_under
* Fix various linting issues
* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream 
							
						 
						
							2023-05-07 18:22:25 +02:00  
				
					
						
							
							
								 
						
							
								6f64c79ca4 
								
							 
						 
						
							
							
								
								Fix SCSS linting issues ( #2207 )  
							
							... 
							
							
							
							* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons
* Run stylelint --fix
* Avoid `@extend` directives with doodle modal CSS
* Drop use of `@extend` for notification cleanup buttons SCSS
* Run prettier on SCSS 
							
						 
						
							2023-05-07 15:04:59 +02:00  
				
					
						
							
							
								 
						
							
								a6207d243b 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2202 )  
							
							... 
							
							
							
							* New translations en.json (Russian)
[ci skip]
* New translations en.json (Russian)
[ci skip] 
							
						 
						
							2023-05-07 13:37:47 +02:00  
				
					
						
							
							
								 
						
							
								140aa6b054 
								
							 
						 
						
							
							
								
								Rewrite VerifiedBadge component as function component ( #24892 )  
							
							
							
						 
						
							2023-05-07 09:10:58 +02:00  
				
					
						
							
							
								 
						
							
								746979f75d 
								
							 
						 
						
							
							
								
								Fix compose textarea scroll behavior ( #24872 )  
							
							
							
						 
						
							2023-05-05 18:58:58 +02:00  
				
					
						
							
							
								 
						
							
								5811ccc611 
								
							 
						 
						
							
							
								
								Fix column back button error ( #24867 )  
							
							
							
						 
						
							2023-05-05 15:13:28 +02:00  
				
					
						
							
							
								 
						
							
								f95125bd04 
								
							 
						 
						
							
							
								
								Fail ESLint for Warnings in CI ( #24836 )  
							
							
							
						 
						
							2023-05-04 09:48:50 +02:00  
				
					
						
							
							
								 
						
							
								27bafabb64 
								
							 
						 
						
							
							
								
								Fix Back button going outside the app ( #24835 )  
							
							
							
						 
						
							2023-05-04 08:14:04 +02:00  
				
					
						
							
							
								 
						
							
								45579a26cf 
								
							 
						 
						
							
							
								
								Fixes build errors from some previous TS-related commits ( #24811 )  
							
							
							
						 
						
							2023-05-03 16:28:14 +02:00  
				
					
						
							
							
								 
						
							
								0999cb4601 
								
							 
						 
						
							
							
								
								Rewrite actions/app.ts and reducers/missed_updates.ts with createAction ( #24801 )  
							
							
							
						 
						
							2023-05-03 15:28:39 +02:00  
				
					
						
							
							
								 
						
							
								9a52a7f7a0 
								
							 
						 
						
							
							
								
								Remove MastodonMap TS type ( #24807 )  
							
							
							
						 
						
							2023-05-03 13:32:11 +02:00  
				
					
						
							
							
								 
						
							
								e38b391940 
								
							 
						 
						
							
							
								
								Add type annotation for some js files ( #24787 )  
							
							
							
						 
						
							2023-05-03 11:43:29 +02:00  
				
					
						
							
							
								 
						
							
								9c1929efad 
								
							 
						 
						
							
							
								
								Fix incorrect import of redux store ( #24805 )  
							
							
							
						 
						
							2023-05-03 10:29:45 +02:00  
				
					
						
							
							
								 
						
							
								d37c0a1060 
								
							 
						 
						
							
							
								
								Fix incorrect box shadow on avatar in thread view  ( #24800 )  
							
							
							
						 
						
							2023-05-03 09:11:20 +02:00  
				
					
						
							
							
								 
						
							
								8227af8dcc 
								
							 
						 
						
							
							
								
								use configureStore of redux-toolkit instead of createStore of redux ( #24790 )  
							
							
							
						 
						
							2023-05-02 20:39:06 +02:00  
				
					
						
							
							
								 
						
							
								8131a5b330 
								
							 
						 
						
							
							
								
								Add ALT badges to media that has alternative text in web UI ( #24782 )  
							
							
							
						 
						
							2023-05-02 14:47:04 +02:00  
				
					
						
							
							
								 
						
							
								598e63dad2 
								
							 
						 
						
							
							
								
								Change media elements to use aspect-ratio rather than compute height themselves ( #24686 )  
							
							
							
						 
						
							2023-05-02 13:58:48 +02:00  
				
					
						
							
							
								 
						
							
								f50105779b 
								
							 
						 
						
							
							
								
								Add type annotation for Blurhash component ( #24750 )  
							
							
							
						 
						
							2023-05-02 12:54:00 +02:00  
				
					
						
							
							
								 
						
							
								5a5975d7f7 
								
							 
						 
						
							
							
								
								Add type annotation for IconButton component ( #24753 )  
							
							
							
						 
						
							2023-05-02 12:53:32 +02:00  
				
					
						
							
							
								 
						
							
								fc56eda94b 
								
							 
						 
						
							
							
								
								Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 ( #24755 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-05-01 18:23:57 +09:00  
				
					
						
							
							
								 
						
							
								15fd712464 
								
							 
						 
						
							
							
								
								Add type annotation for RelativeTimestamp component ( #24749 )  
							
							
							
						 
						
							2023-05-01 00:51:31 +02:00  
				
					
						
							
							
								 
						
							
								81f75b1e0e 
								
							 
						 
						
							
							
								
								Rewrite Icon and IconWithBadge with typescript ( #24747 )  
							
							
							
						 
						
							2023-05-01 00:51:00 +02:00  
				
					
						
							
							
								 
						
							
								0a08e9d3d3 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24678 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-30 17:02:11 +09:00  
				
					
						
							
							
								 
						
							
								678d836c7d 
								
							 
						 
						
							
							
								
								Fix pop-in player placeholder layout in thread view ( #24715 )  
							
							
							
						 
						
							2023-04-30 06:42:43 +02:00  
				
					
						
							
							
								 
						
							
								cf1bc4bb93 
								
							 
						 
						
							
							
								
								Fix audio player width in thread view ( #24713 )  
							
							
							
						 
						
							2023-04-30 06:42:22 +02:00  
				
					
						
							
							
								 
						
							
								f22b4e556c 
								
							 
						 
						
							
							
								
								Add eslint-plugin-jsdoc ( #24719 )  
							
							
							
						 
						
							2023-04-30 02:29:54 +02:00  
				
					
						
							
							
								 
						
							
								bfeccf6748 
								
							 
						 
						
							
							
								
								Fix media description not being cleared ( #24720 )  
							
							
							
						 
						
							2023-04-30 02:29:24 +02:00  
				
					
						
							
							
								 
						
							
								e79998a11a 
								
							 
						 
						
							
							
								
								Restore translations from not-yet-ported onboarding changes as glitch-soc translations  
							
							
							
						 
						
							2023-04-29 19:38:08 +02:00  
				
					
						
							
							
								 
						
							
								38eeed6cbf 
								
							 
						 
						
							
							
								
								[Glitch] Change logo version in header based on screen size in web UI  
							
							... 
							
							
							
							Port 6028d047b9 
							
						 
						
							2023-04-29 18:54:13 +02:00  
				
					
						
							
							
								 
						
							
								1033598416 
								
							 
						 
						
							
							
								
								[Glitch] Enable formatjs/prefer-pound-in-plural  
							
							... 
							
							
							
							Port 2daa5a1549 
							
						 
						
							2023-04-29 18:38:23 +02:00  
				
					
						
							
							
								 
						
							
								edec08b970 
								
							 
						 
						
							
							
								
								Disable full-width media in thread view  
							
							
							
						 
						
							2023-04-29 12:43:01 +02:00  
				
					
						
							
							
								 
						
							
								cb97a92954 
								
							 
						 
						
							
							
								
								[Glitch] Fix thread lines in right-to-left locales ( #24714 )  
							
							... 
							
							
							
							Port 105f8687e4 
							
						 
						
							2023-04-29 12:21:44 +02:00  
				
					
						
							
							
								 
						
							
								103b6de8b2 
								
							 
						 
						
							
							
								
								[Glitch] Fix sass warning about deprecated slash as division ( #24653 )  
							
							... 
							
							
							
							Port 1527b02c6d 
							
						 
						
							2023-04-29 12:17:06 +02:00  
				
					
						
							
							
								 
						
							
								7b01b7c3bf 
								
							 
						 
						
							
							
								
								[Glitch] Add lines to threads in web UI  
							
							... 
							
							
							
							Port 290e4aba31 
							
						 
						
							2023-04-29 12:08:13 +02:00  
				
					
						
							
							
								 
						
							
								8015297f9e 
								
							 
						 
						
							
							
								
								[Glitch] Change label from "For you" to "People" on explore screen in web UI  
							
							... 
							
							
							
							Port 7cf963eec2 
							
						 
						
							2023-04-29 11:34:44 +02:00  
				
					
						
							
							
								 
						
							
								374a109546 
								
							 
						 
						
							
							
								
								[Glitch] Change styling of the recommended accounts to allow bio to be more visible  
							
							... 
							
							
							
							Port e1b4eeb636 
							
						 
						
							2023-04-29 11:28:24 +02:00  
				
					
						
							
							
								 
						
							
								0091b28ffe 
								
							 
						 
						
							
							
								
								[Glitch] Use CSS to trim long card descriptions  
							
							... 
							
							
							
							Port e713c545b8 
							
						 
						
							2023-04-29 11:26:58 +02:00  
				
					
						
							
							
								 
						
							
								11b34a903a 
								
							 
						 
						
							
							
								
								[Glitch] Fix infinite loop in emoji replacement code  
							
							... 
							
							
							
							Port fbb4de3dbc 
							
						 
						
							2023-04-29 11:14:43 +02:00  
				
					
						
							
							
								 
						
							
								0a813d96db 
								
							 
						 
						
							
							
								
								[Glitch] Fix characters being emojified even when using Variation Selector 15 (text)  
							
							... 
							
							
							
							Port 37886c28da 
							
						 
						
							2023-04-29 11:12:35 +02:00  
				
					
						
							
							
								 
						
							
								66bda4713e 
								
							 
						 
						
							
							
								
								[Glitch] Allow `==` when null checking  
							
							... 
							
							
							
							Port c1a7e38d2b 
							
						 
						
							2023-04-29 11:09:46 +02:00  
				
					
						
							
							
								 
						
							
								12b935fadf 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream. 
							
						 
						
							2023-04-29 10:44:56 +02:00  
				
					
						
							
							
								 
						
							
								105f8687e4 
								
							 
						 
						
							
							
								
								Fix thread lines in right-to-left locales ( #24714 )  
							
							
							
						 
						
							2023-04-28 13:12:35 +02:00  
				
					
						
							
							
								 
						
							
								2a3a110f00 
								
							 
						 
						
							
							
								
								Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS ( #24711 )  
							
							
							
						 
						
							2023-04-28 11:15:43 +02:00  
				
					
						
							
							
								 
						
							
								8979b70975 
								
							 
						 
						
							
							
								
								Add default post text to onboarding flow in web UI ( #24705 )  
							
							
							
						 
						
							2023-04-28 10:05:34 +02:00  
				
					
						
							
							
								 
						
							
								6028d047b9 
								
							 
						 
						
							
							
								
								Change logo version in header based on screen size in web UI ( #24707 )  
							
							
							
						 
						
							2023-04-28 10:00:33 +02:00  
				
					
						
							
							
								 
						
							
								7cf963eec2 
								
							 
						 
						
							
							
								
								Change label from "For you" to "People" on explore screen in web UI ( #24706 )  
							
							
							
						 
						
							2023-04-28 08:54:20 +02:00  
				
					
						
							
							
								 
						
							
								a5bc4ea550 
								
							 
						 
						
							
							
								
								Fix refering to unused `preview-card` CSS class instead of `status-card` ( #24696 )  
							
							
							
						 
						
							2023-04-28 07:50:31 +02:00  
				
					
						
							
							
								 
						
							
								d8a06c1375 
								
							 
						 
						
							
							
								
								Fix preview cards layout in thread view ( #24677 )  
							
							
							
						 
						
							2023-04-27 01:45:19 +02:00  
				
					
						
							
							
								 
						
							
								d4511f2a76 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24617 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-27 04:55:06 +09:00  
				
					
						
							
							
								 
						
							
								1565af1caf 
								
							 
						 
						
							
							
								
								[Glitch] [Proposal] Make able to write React in Typescript ( #2190 )  
							
							... 
							
							
							
							Port 4520e6473a 
							
						 
						
							2023-04-26 21:30:41 +02:00  
				
					
						
							
							
								 
						
							
								1527b02c6d 
								
							 
						 
						
							
							
								
								Fix sass warning about deprecated slash as division ( #24653 )  
							
							... 
							
							
							
							Co-authored-by: Nick Schonning <nschonni@gmail.com> 
							
						 
						
							2023-04-25 22:15:00 +02:00  
				
					
						
							
							
								 
						
							
								678480d4d3 
								
							 
						 
						
							
							
								
								Fix small mistakes in RTL layout ( #2182 )  
							
							... 
							
							
							
							Borders in blockquotes in reply-indicator weren't colored properly.
avatar margin when viewing edited toots dropdown was applied to wrong side.
Conversations had padding applied to the wrong side.
Padding for notifcation cleaner checkboxes was applied to wrong side.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-04-25 20:33:27 +02:00  
				
					
						
							
							
								 
						
							
								aea7866161 
								
							 
						 
						
							
							
								
								Change `drawer--header` to `drawer__header` ( #2189 )  
							
							... 
							
							
							
							Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-04-25 20:29:04 +02:00  
				
					
						
							
							
								 
						
							
								c35e3cb6ac 
								
							 
						 
						
							
							
								
								Add more tips to onboarding flow in web UI ( #24646 )  
							
							
							
						 
						
							2023-04-25 11:12:37 +02:00  
				
					
						
							
							
								 
						
							
								8099ba04be 
								
							 
						 
						
							
							
								
								Change hashtags and mentions in bios to open in-app in web UI ( #24643 )  
							
							
							
						 
						
							2023-04-25 06:33:21 +02:00  
				
					
						
							
							
								 
						
							
								804aa8d501 
								
							 
						 
						
							
							
								
								Fix cutting off first letter of hashtag links sometimes in web UI ( #24623 )  
							
							
							
						 
						
							2023-04-24 09:53:54 +02:00  
				
					
						
							
							
								 
						
							
								2daa5a1549 
								
							 
						 
						
							
							
								
								Enable formatjs/prefer-pound-in-plural ( #24622 )  
							
							
							
						 
						
							2023-04-24 08:07:19 +02:00  
				
					
						
							
							
								 
						
							
								290e4aba31 
								
							 
						 
						
							
							
								
								Add lines to threads in web UI ( #24549 )  
							
							
							
						 
						
							2023-04-24 08:07:03 +02:00  
				
					
						
							
							
								 
						
							
								ef3675d688 
								
							 
						 
						
							
							
								
								Remove empty Kushubian (csb) local files ( #24151 )  
							
							
							
						 
						
							2023-04-23 22:43:12 +02:00  
				
					
						
							
							
								 
						
							
								e1b4eeb636 
								
							 
						 
						
							
							
								
								Change styling of the recommended accounts to allow bio to be more visible  ( #24480 )  
							
							
							
						 
						
							2023-04-23 22:33:08 +02:00  
				
					
						
							
							
								 
						
							
								e713c545b8 
								
							 
						 
						
							
							
								
								Use CSS to trim long card descriptions ( #24265 )  
							
							
							
						 
						
							2023-04-23 22:32:47 +02:00  
				
					
						
							
							
								 
						
							
								0461f83320 
								
							 
						 
						
							
							
								
								Add new onboarding flow to web UI ( #24619 )  
							
							
							
						 
						
							2023-04-23 22:24:53 +02:00  
				
					
						
							
							
								 
						
							
								5b58ebb04f 
								
							 
						 
						
							
							
								
								Fix JS crashing if initial-state is not set ( #2193 )  
							
							... 
							
							
							
							Fixes issues with the JS for at least sign-up pages not working 
							
						 
						
							2023-04-22 19:13:20 +02:00  
				
					
						
							
							
								 
						
							
								9d75b03ba4 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24517 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-22 19:37:41 +09:00  
				
					
						
							
							
								 
						
							
								9ef32ea570 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite AnimatedNumber component with React hooks  
							
							... 
							
							
							
							Port ab740f464a 
							
						 
						
							2023-04-22 11:28:23 +02:00  
				
					
						
							
							
								 
						
							
								799e9917e4 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite GIFV component with React hooks  
							
							... 
							
							
							
							Port cf3fa1e814 
							
						 
						
							2023-04-22 11:22:49 +02:00  
				
					
						
							
							
								 
						
							
								6ea9137233 
								
							 
						 
						
							
							
								
								[Glitch] Add client-side validation for taken username in sign-up form  
							
							... 
							
							
							
							Port 955ec252a4 
							
						 
						
							2023-04-22 10:47:44 +02:00  
				
					
						
							
							
								 
						
							
								bc7b3399fb 
								
							 
						 
						
							
							
								
								[Glitch] Fix crash when trying to open the filter modal  
							
							... 
							
							
							
							Port bc4745f482 
							
						 
						
							2023-04-22 10:20:50 +02:00  
				
					
						
							
							
								 
						
							
								2f3dffb057 
								
							 
						 
						
							
							
								
								[Glitch] Add progress indicator to sign-up flow  
							
							... 
							
							
							
							Port e5c0b16735 
							
						 
						
							2023-04-22 10:18:20 +02:00  
				
					
						
							
							
								 
						
							
								a21a875dba 
								
							 
						 
						
							
							
								
								[Glitch] Fix status title for statuses without text  
							
							... 
							
							
							
							Port f05fb51ecb 
							
						 
						
							2023-04-22 10:16:20 +02:00  
				
					
						
							
							
								 
						
							
								f2797276b2 
								
							 
						 
						
							
							
								
								[Glitch] typo: collapsable -> collapsible  
							
							... 
							
							
							
							Port d02aa274be 
							
						 
						
							2023-04-22 10:13:58 +02:00  
				
					
						
							
							
								 
						
							
								abfdafef1e 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/auth/setup_controller.rb`:
  Upstream removed a method close to a glitch-soc theming-related method.
  Removed the method like upstream did. 
							
						 
						
							2023-04-22 10:06:11 +02:00  
				
					
						
							
							
								 
						
							
								fbb4de3dbc 
								
							 
						 
						
							
							
								
								Fix infinite loop in emoji replacement code ( #24615 )  
							
							
							
						 
						
							2023-04-21 18:08:28 +02:00  
				
					
						
							
							
								 
						
							
								37886c28da 
								
							 
						 
						
							
							
								
								Fix characters being emojified even when using Variation Selector 15 (text) ( #20949 )  
							
							
							
						 
						
							2023-04-20 16:43:55 +02:00  
				
					
						
							
							
								 
						
							
								c1a7e38d2b 
								
							 
						 
						
							
							
								
								Allow `==` when null checking ( #24593 )  
							
							
							
						 
						
							2023-04-19 17:46:46 +02:00  
				
					
						
							
							
								 
						
							
								ab740f464a 
								
							 
						 
						
							
							
								
								Rewrite AnimatedNumber component with React hooks ( #24559 )  
							
							
							
						 
						
							2023-04-17 13:25:15 +02:00  
				
					
						
							
							
								 
						
							
								bc4745f482 
								
							 
						 
						
							
							
								
								Fix crash when trying to open the filter modal ( #24556 )  
							
							
							
						 
						
							2023-04-17 10:15:21 +02:00  
				
					
						
							
							
								 
						
							
								9f8d34620b 
								
							 
						 
						
							
							
								
								Rewrite AvatarOverlay component with React hooks ( #24543 )  
							
							
							
						 
						
							2023-04-17 07:07:27 +02:00  
				
					
						
							
							
								 
						
							
								34f8e696e2 
								
							 
						 
						
							
							
								
								[Glitch] Change all components to use the same error page in web UI  
							
							... 
							
							
							
							Port cee357d538 
							
						 
						
							2023-04-16 18:20:51 +02:00  
				
					
						
							
							
								 
						
							
								a3c05640f7 
								
							 
						 
						
							
							
								
								[Glitch] Add “In Memoriam” banner back to profiles  
							
							... 
							
							
							
							Port 86ad43173f 
							
						 
						
							2023-04-16 18:02:16 +02:00  
				
					
						
							
							
								 
						
							
								cb0562f32c 
								
							 
						 
						
							
							
								
								[Glitch] Fix tab arrows on RTL layouts  
							
							... 
							
							
							
							Port af49d93fd6 
							
						 
						
							2023-04-16 17:58:32 +02:00  
				
					
						
							
							
								 
						
							
								f9a9f9344b 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-04-16 17:52:44 +02:00  
				
					
						
							
							
								 
						
							
								f28942cef9 
								
							 
						 
						
							
							
								
								[Glitch] Refactor styles to use logical properties for positioning ( #2156 )  
							
							... 
							
							
							
							Port babd86e59445848d6547 
							
						 
						
							2023-04-16 17:45:18 +02:00  
				
					
						
							
							
								 
						
							
								0cbd579ef0 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2172 )  
							
							... 
							
							
							
							* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Romanian)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Afrikaans)
[ci skip]
* New translations en.json (Arabic)
[ci skip]
* New translations en.json (Belarusian)
[ci skip]
* New translations en.json (Bulgarian)
[ci skip]
* New translations en.json (Catalan)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Danish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Greek)
[ci skip]
* New translations en.json (Frisian)
[ci skip]
* New translations en.json (Basque)
[ci skip]
* New translations en.json (Finnish)
[ci skip]
* New translations en.json (Irish)
[ci skip]
* New translations en.json (Hebrew)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Armenian)
[ci skip]
* New translations en.json (Italian)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.json (Georgian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.json (Lithuanian)
[ci skip]
* New translations en.json (Macedonian)
[ci skip]
* New translations en.json (Dutch)
[ci skip]
* New translations en.json (Norwegian)
[ci skip]
* New translations en.json (Punjabi)
[ci skip]
* New translations en.json (Portuguese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Slovak)
[ci skip]
* New translations en.json (Slovenian)
[ci skip]
* New translations en.json (Albanian)
[ci skip]
* New translations en.json (Serbian (Cyrillic))
[ci skip]
* New translations en.json (Swedish)
[ci skip]
* New translations en.json (Turkish)
[ci skip]
* New translations en.json (Ukrainian)
[ci skip]
* New translations en.json (Chinese Traditional)
[ci skip]
* New translations en.json (Urdu (Pakistan))
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.json (Icelandic)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Indonesian)
[ci skip]
* New translations en.json (Persian)
[ci skip]
* New translations en.json (Tamil)
[ci skip]
* New translations en.json (Bengali)
[ci skip]
* New translations en.json (Marathi)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.json (Croatian)
[ci skip]
* New translations en.json (Norwegian Nynorsk)
[ci skip]
* New translations en.json (Kazakh)
[ci skip]
* New translations en.json (Estonian)
[ci skip]
* New translations en.json (Latvian)
[ci skip]
* New translations en.json (Hindi)
[ci skip]
* New translations en.json (Malay)
[ci skip]
* New translations en.json (Telugu)
[ci skip]
* New translations en.json (English, United Kingdom)
[ci skip]
* New translations en.json (Burmese)
[ci skip]
* New translations en.json (Welsh)
[ci skip]
* New translations en.json (Faroese)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Uyghur)
[ci skip]
* New translations en.json (Chinese Traditional, Hong Kong)
[ci skip]
* New translations en.json (Tatar)
[ci skip]
* New translations en.json (Malayalam)
[ci skip]
* New translations en.json (Breton)
[ci skip]
* New translations en.json (Latin)
[ci skip]
* New translations en.json (Bosnian)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Sinhala)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.json (Kannada)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Asturian)
[ci skip]
* New translations en.json (Aragonese)
[ci skip]
* New translations en.json (Occitan)
[ci skip]
* New translations en.json (Serbian (Latin))
[ci skip]
* New translations en.json (Kurmanji (Kurdish))
[ci skip]
* New translations en.json (Sorani (Kurdish))
[ci skip]
* New translations en.json (Scots)
[ci skip]
* New translations en.json (Igbo)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Sardinian)
[ci skip]
* New translations en.json (Sanskrit)
[ci skip]
* New translations en.json (Kabyle)
[ci skip]
* New translations en.json (Ido)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.yml (German)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip] 
							
						 
						
							2023-04-16 17:25:43 +02:00  
				
					
						
							
							
								 
						
							
								cf3fa1e814 
								
							 
						 
						
							
							
								
								Rewrite GIFV component with React hooks ( #24552 )  
							
							
							
						 
						
							2023-04-16 16:09:04 +02:00  
				
					
						
							
							
								 
						
							
								e5c0b16735 
								
							 
						 
						
							
							
								
								Add progress indicator to sign-up flow ( #24545 )  
							
							
							
						 
						
							2023-04-16 07:01:24 +02:00  
				
					
						
							
							
								 
						
							
								955ec252a4 
								
							 
						 
						
							
							
								
								Add client-side validation for taken username in sign-up form ( #24546 )  
							
							
							
						 
						
							2023-04-16 02:10:48 +02:00  
				
					
						
							
							
								 
						
							
								f05fb51ecb 
								
							 
						 
						
							
							
								
								Fix status title for statuses without text ( #24359 )  
							
							
							
						 
						
							2023-04-14 17:29:09 +02:00  
				
					
						
							
							
								 
						
							
								d02aa274be 
								
							 
						 
						
							
							
								
								typo: collapsable -> collapsible ( #24521 )  
							
							
							
						 
						
							2023-04-14 11:01:23 +02:00  
				
					
						
							
							
								 
						
							
								af49d93fd6 
								
							 
						 
						
							
							
								
								Fix tab arrows on RTL layouts ( #24520 )  
							
							
							
						 
						
							2023-04-12 16:01:49 +02:00  
				
					
						
							
							
								 
						
							
								8f0b0435ab 
								
							 
						 
						
							
							
								
								Fix missing translation strings in en.json and defaultMessages.json ( #24518 )  
							
							
							
						 
						
							2023-04-12 15:24:45 +02:00  
				
					
						
							
							
								 
						
							
								86ad43173f 
								
							 
						 
						
							
							
								
								Add “In Memoriam” banner back to profiles ( #23614 )  
							
							
							
						 
						
							2023-04-12 14:50:02 +02:00  
				
					
						
							
							
								 
						
							
								c5eba06d8c 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24447 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-12 20:21:32 +09:00  
				
					
						
							
							
								 
						
							
								cee357d538 
								
							 
						 
						
							
							
								
								Change all components to use the same error page in web UI ( #24512 )  
							
							
							
						 
						
							2023-04-12 12:44:58 +02:00  
				
					
						
							
							
								 
						
							
								63a39ae2fa 
								
							 
						 
						
							
							
								
								Run `yarn manage:translations`  
							
							
							
						 
						
							2023-04-09 15:56:31 +02:00  
				
					
						
							
							
								 
						
							
								c11e69f33a 
								
							 
						 
						
							
							
								
								Move glitch-soc-only translation strings out of `app/javascript/mastodono/locales`  
							
							
							
						 
						
							2023-04-09 15:53:45 +02:00  
				
					
						
							
							
								 
						
							
								bfe46d08f9 
								
							 
						 
						
							
							
								
								[Glitch] Ensure tabIndex is number instead of string  
							
							... 
							
							
							
							Port ec0c104bf2 
							
						 
						
							2023-04-09 14:47:29 +02:00  
				
					
						
							
							
								 
						
							
								53cdcce3d1 
								
							 
						 
						
							
							
								
								[Glitch] Fix loading spinner + infinite scroll for private mentions  
							
							... 
							
							
							
							Port 9ef9974ff2 
							
						 
						
							2023-04-09 12:10:01 +02:00  
				
					
						
							
							
								 
						
							
								b756e49cf1 
								
							 
						 
						
							
							
								
								[Glitch] Enable Stylelint property-no-unknown  
							
							... 
							
							
							
							Port cd14f712ad 
							
						 
						
							2023-04-09 12:05:55 +02:00  
				
					
						
							
							
								 
						
							
								7b04c2fb71 
								
							 
						 
						
							
							
								
								[Glitch] Fix tooltip for dates without time  
							
							... 
							
							
							
							Port aa136cf2fa 
							
						 
						
							2023-04-09 12:04:17 +02:00  
				
					
						
							
							
								 
						
							
								5b88b7e81a 
								
							 
						 
						
							
							
								
								[Glitch] Remove Array.prototype.includes polyfill  
							
							... 
							
							
							
							Port c0886dee14 
							
						 
						
							2023-04-09 12:03:11 +02:00  
				
					
						
							
							
								 
						
							
								df6602ede1 
								
							 
						 
						
							
							
								
								[Glitch] Fix account header image missing in low-res  
							
							... 
							
							
							
							Port d7b8c6db7e 
							
						 
						
							2023-04-09 12:01:55 +02:00  
				
					
						
							
							
								 
						
							
								74c61b05ae 
								
							 
						 
						
							
							
								
								[Glitch] Fix height of announcements not being updated when using reduced animations  
							
							... 
							
							
							
							Port ffd5b2eea4 
							
						 
						
							2023-04-09 12:01:11 +02:00  
				
					
						
							
							
								 
						
							
								791e712a80 
								
							 
						 
						
							
							
								
								[Glitch] Update display_media typing to string  
							
							... 
							
							
							
							Port 17b2fd2177 
							
						 
						
							2023-04-09 12:00:26 +02:00  
				
					
						
							
							
								 
						
							
								f3f7ef2d13 
								
							 
						 
						
							
							
								
								[Glitch] Set marginRight as string  
							
							... 
							
							
							
							Port 927b2fd138 
							
						 
						
							2023-04-09 11:59:42 +02:00  
				
					
						
							
							
								 
						
							
								358e4067bb 
								
							 
						 
						
							
							
								
								[Glitch] SUBMIT doesn't exist on XMLHttpRequest  
							
							... 
							
							
							
							Port ab3f23da91 
							
						 
						
							2023-04-09 11:58:45 +02:00  
				
					
						
							
							
								 
						
							
								0f62451424 
								
							 
						 
						
							
							
								
								[Glitch] HTML string attributes set as booleans  
							
							... 
							
							
							
							Port a425915ce7 
							
						 
						
							2023-04-09 11:56:02 +02:00  
				
					
						
							
							
								 
						
							
								ce12934f5b 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Upstream removed a dependency that was textually close to a glitch-soc-only
  dependency.
  Removed the dependency as upstream did, while keeping the glitch-soc-only
  dependency. 
							
						 
						
							2023-04-09 11:45:08 +02:00  
				
					
						
							
							
								 
						
							
								10469a0b85 
								
							 
						 
						
							
							
								
								Move locale-data back to `app/javascript/mastodon/locales/locale-data` ( #2169 )  
							
							... 
							
							
							
							This reduces differences with upstream and fixes a bunch of locale-data
files having been forgotten. 
							
						 
						
							2023-04-08 14:11:40 +02:00  
				
					
						
							
							
								 
						
							
								aa136cf2fa 
								
							 
						 
						
							
							
								
								Fix tooltip for dates without time ( #24244 )  
							
							
							
						 
						
							2023-04-07 16:19:43 +02:00  
				
					
						
							
							
								 
						
							
								9ef9974ff2 
								
							 
						 
						
							
							
								
								Fix loading spinner + infinite scroll for private mentions ( #24446 )  
							
							
							
						 
						
							2023-04-07 15:44:31 +02:00  
				
					
						
							
							
								 
						
							
								c0886dee14 
								
							 
						 
						
							
							
								
								Remove Array.prototype.includes polyfill ( #24234 )  
							
							
							
						 
						
							2023-04-07 13:03:42 +02:00  
				
					
						
							
							
								 
						
							
								d7b8c6db7e 
								
							 
						 
						
							
							
								
								Fix account header image missing in low-res ( #24433 )  
							
							
							
						 
						
							2023-04-07 11:57:43 +02:00  
				
					
						
							
							
								 
						
							
								c9f3438efe 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24378 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-06 23:24:31 +09:00  
				
					
						
							
							
								 
						
							
								02d5c69404 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #2126 )  
							
							... 
							
							
							
							* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (French)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (German)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Norwegian)
[ci skip]
* New translations simple_form.en.yml (Norwegian)
[ci skip]
* New translations en.yml (Portuguese)
[ci skip]
* New translations en.json (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations simple_form.en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (French, Quebec)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* New translations simple_form.en.yml (Spanish)
[ci skip]
* New translations en.json (Spanish, Mexico)
[ci skip]
* New translations en.yml (Spanish, Mexico)
[ci skip]
* New translations simple_form.en.yml (Spanish, Mexico)
[ci skip]
* New translations en.json (Spanish, Argentina)
[ci skip]
* New translations en.yml (Spanish, Argentina)
[ci skip]
* New translations simple_form.en.yml (Spanish, Argentina)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations simple_form.en.yml (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Polish)
[ci skip]
* New translations en.json (Spanish)
[ci skip]
* New translations en.yml (Spanish)
[ci skip]
* Fix Crowdin YAML export issue
* Fix i18n YAML normalization 
							
						 
						
							2023-04-05 20:28:34 +02:00  
				
					
						
							
							
								 
						
							
								ffd5b2eea4 
								
							 
						 
						
							
							
								
								Fix height of announcements not being updated when using reduced animations ( #24354 )  
							
							
							
						 
						
							2023-04-05 14:58:10 +02:00  
				
					
						
							
							
								 
						
							
								17b2fd2177 
								
							 
						 
						
							
							
								
								Update display_media typing to string ( #24416 )  
							
							
							
						 
						
							2023-04-05 13:20:21 +02:00  
				
					
						
							
							
								 
						
							
								927b2fd138 
								
							 
						 
						
							
							
								
								Set marginRight as string ( #24422 )  
							
							
							
						 
						
							2023-04-05 10:57:36 +02:00  
				
					
						
							
							
								 
						
							
								ab3f23da91 
								
							 
						 
						
							
							
								
								SUBMIT doesn't exist on XMLHttpRequest ( #24423 )  
							
							
							
						 
						
							2023-04-05 10:56:55 +02:00  
				
					
						
							
							
								 
						
							
								cd14f712ad 
								
							 
						 
						
							
							
								
								Enable Stylelint property-no-unknown ( #24404 )  
							
							
							
						 
						
							2023-04-05 09:04:08 +02:00  
				
					
						
							
							
								 
						
							
								45848d6547 
								
							 
						 
						
							
							
								
								Fix styling regressions from RTL layout refactor ( #24415 )  
							
							
							
						 
						
							2023-04-04 16:48:34 +02:00  
				
					
						
							
							
								 
						
							
								ec0c104bf2 
								
							 
						 
						
							
							
								
								Ensure tabIndex is number instead of string ( #24409 )  
							
							
							
						 
						
							2023-04-04 16:33:44 +02:00  
				
					
						
							
							
								 
						
							
								a425915ce7 
								
							 
						 
						
							
							
								
								HTML string attributes set as booleans ( #24408 )  
							
							
							
						 
						
							2023-04-04 16:33:33 +02:00  
				
					
						
							
							
								 
						
							
								69ca6316ec 
								
							 
						 
						
							
							
								
								[Glitch] Fix inconsistent radius in drawer  
							
							... 
							
							
							
							Port fa98363a27 
							
						 
						
							2023-04-04 12:51:24 +02:00  
				
					
						
							
							
								 
						
							
								d13ef49b15 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-04-04 12:45:12 +02:00  
				
					
						
							
							
								 
						
							
								fa98363a27 
								
							 
						 
						
							
							
								
								Fix inconsistent radius in drawer ( #24407 )  
							
							
							
						 
						
							2023-04-04 11:41:05 +02:00  
				
					
						
							
							
								 
						
							
								8e19c44b2c 
								
							 
						 
						
							
							
								
								Align typings with installed versions ( #24410 )  
							
							
							
						 
						
							2023-04-04 10:48:26 +02:00  
				
					
						
							
							
								 
						
							
								d29cf8a044 
								
							 
						 
						
							
							
								
								[Glitch] Add colour to follow button when hashtag is being followed  
							
							... 
							
							
							
							Port 77bd32a26a 
							
						 
						
							2023-04-03 18:07:34 +02:00  
				
					
						
							
							
								 
						
							
								4d5b4dacd6 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-04-03 17:40:59 +02:00  
				
					
						
							
							
								 
						
							
								77bd32a26a 
								
							 
						 
						
							
							
								
								Add colour to follow button when hashtag is being followed ( #24361 )  
							
							
							
						 
						
							2023-04-03 16:25:15 +02:00  
				
					
						
							
							
								 
						
							
								4909c2e718 
								
							 
						 
						
							
							
								
								New Crowdin updates ( #24276 )  
							
							... 
							
							
							
							Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> 
							
						 
						
							2023-04-03 14:44:43 +02:00  
				
					
						
							
							
								 
						
							
								373e4a8ff0 
								
							 
						 
						
							
							
								
								Move ESLint configs to overrides ( #24370 )  
							
							
							
						 
						
							2023-04-03 12:41:10 +02:00  
				
					
						
							
							
								 
						
							
								4520e6473a 
								
							 
						 
						
							
							
								
								[Proposal] Make able to write React in Typescript ( #16210 )  
							
							... 
							
							
							
							Co-authored-by: berlysia <berlysia@gmail.com>
Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com> 
							
						 
						
							2023-04-03 03:31:39 +02:00  
				
					
						
							
							
								 
						
							
								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