663dd49a85 
								
							 
						 
						
							
							
								
								[Glitch] Fix navigation panel icons missing classes  
							
							... 
							
							
							
							Port acf3f410ae 
							
						 
						
							2024-03-13 20:13:35 +01:00  
				
					
						
							
							
								 
						
							
								e1b64151a2 
								
							 
						 
						
							
							
								
								[Glitch] Fix toggle button color for light (and dark/default) theme  
							
							... 
							
							
							
							Port 268856d5d9 
							
						 
						
							2024-03-13 20:13:35 +01:00  
				
					
						
							
							
								 
						
							
								48134bcd10 
								
							 
						 
						
							
							
								
								Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-13 20:13:29 +01:00  
				
					
						
							
							
								 
						
							
								00d72866a3 
								
							 
						 
						
							
							
								
								[Glitch] Use vanilla JS to get Rails CSRF values  
							
							... 
							
							
							
							Port 00d94f3ffa 
							
						 
						
							2024-03-13 19:17:59 +01:00  
				
					
						
							
							
								 
						
							
								06881a8669 
								
							 
						 
						
							
							
								
								Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-13 19:16:47 +01:00  
				
					
						
							
							
								 
						
							
								8c0673037a 
								
							 
						 
						
							
							
								
								[Glitch] Change background color in web UI  
							
							... 
							
							
							
							Port 5b60d4b696 
							
						 
						
							2024-03-13 19:05:05 +01:00  
				
					
						
							
							
								 
						
							
								c6dbb33944 
								
							 
						 
						
							
							
								
								Merge commit 'd4ed7e466c41f19e5f9352700c76e7ffc4d28119' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-13 18:58:47 +01:00  
				
					
						
							
							
								 
						
							
								435c46b316 
								
							 
						 
						
							
							
								
								[Glitch] Fix i18n typo  
							
							... 
							
							
							
							Port af4e44e30a 
							
						 
						
							2024-03-13 18:58:00 +01:00  
				
					
						
							
							
								 
						
							
								27ffc09847 
								
							 
						 
						
							
							
								
								Merge commit 'af4e44e30a6a2701102a7d573e47e9db42025821' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-13 18:56:40 +01:00  
				
					
						
							
							
								 
						
							
								b36e96ec90 
								
							 
						 
						
							
							
								
								[Glitch] Change action button to be last on profiles in web UI  
							
							... 
							
							
							
							Port 19efa1b9f1 
							
						 
						
							2024-03-13 18:40:00 +01:00  
				
					
						
							
							
								 
						
							
								13c9524436 
								
							 
						 
						
							
							
								
								[Glitch] Add notification policies and notification requests in web UI  
							
							... 
							
							
							
							Port c10bbf5fe3 
							
						 
						
							2024-03-13 18:38:46 +01:00  
				
					
						
							
							
								 
						
							
								a32a126cac 
								
							 
						 
						
							
							
								
								Hide media by default in notification requests ( #29572 )  
							
							
							
						 
						
							2024-03-13 16:47:48 +00:00  
				
					
						
							
							
								 
						
							
								acf3f410ae 
								
							 
						 
						
							
							
								
								Fix navigation panel icons missing classes ( #29569 )  
							
							
							
						 
						
							2024-03-13 12:54:50 +00:00  
				
					
						
							
							
								 
						
							
								171948b910 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29563 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-13 12:42:44 +00:00  
				
					
						
							
							
								 
						
							
								268856d5d9 
								
							 
						 
						
							
							
								
								Fix toggle button color for light (and dark/default) theme ( #29553 )  
							
							
							
						 
						
							2024-03-13 11:45:20 +00:00  
				
					
						
							
							
								 
						
							
								00d94f3ffa 
								
							 
						 
						
							
							
								
								Use vanilla JS to get Rails CSRF values ( #29403 )  
							
							
							
						 
						
							2024-03-12 17:10:37 +00:00  
				
					
						
							
							
								 
						
							
								5b60d4b696 
								
							 
						 
						
							
							
								
								Change background color in web UI ( #29522 )  
							
							
							
						 
						
							2024-03-12 09:51:30 +00:00  
				
					
						
							
							
								 
						
							
								af4e44e30a 
								
							 
						 
						
							
							
								
								Fix i18n typo ( #29557 )  
							
							
							
						 
						
							2024-03-12 09:42:51 +00:00  
				
					
						
							
							
								 
						
							
								dc36b961aa 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29554 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-12 09:03:51 +00:00  
				
					
						
							
							
								 
						
							
								3631ddbfc9 
								
							 
						 
						
							
							
								
								[Glitch] Change icons in navigation panel to be filled when active in web UI  
							
							... 
							
							
							
							Port 16c856729b 
							
						 
						
							2024-03-11 18:09:07 +01:00  
				
					
						
							
							
								 
						
							
								6440651976 
								
							 
						 
						
							
							
								
								[Glitch] Use the server setting to get the max number of poll options in UI  
							
							... 
							
							
							
							Port b9722dfe2b 
							
						 
						
							2024-03-11 17:38:07 +01:00  
				
					
						
							
							
								 
						
							
								efbc8cba17 
								
							 
						 
						
							
							
								
								[Glitch] Change dropdown menu icon to not be replaced by close icon when open in web UI  
							
							... 
							
							
							
							Port 2347ea813e 
							
						 
						
							2024-03-11 17:36:07 +01:00  
				
					
						
							
							
								 
						
							
								777510a696 
								
							 
						 
						
							
							
								
								[Glitch] Add hints for rules  
							
							... 
							
							
							
							Port 5b3a8737d6 
							
						 
						
							2024-03-11 17:34:02 +01:00  
				
					
						
							
							
								 
						
							
								a5127d0ef8 
								
							 
						 
						
							
							
								
								Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did. 
							
						 
						
							2024-03-11 17:29:07 +01:00  
				
					
						
							
							
								 
						
							
								c10bbf5fe3 
								
							 
						 
						
							
							
								
								Add notification policies and notification requests in web UI ( #29433 )  
							
							
							
						 
						
							2024-03-11 15:02:21 +00:00  
				
					
						
							
							
								 
						
							
								19efa1b9f1 
								
							 
						 
						
							
							
								
								Change action button to be last on profiles in web UI ( #29533 )  
							
							
							
						 
						
							2024-03-11 14:33:48 +00:00  
				
					
						
							
							
								 
						
							
								16c856729b 
								
							 
						 
						
							
							
								
								Change icons in navigation panel to be filled when active in web UI ( #29537 )  
							
							
							
						 
						
							2024-03-11 13:35:23 +00:00  
				
					
						
							
							
								 
						
							
								b9722dfe2b 
								
							 
						 
						
							
							
								
								Use the server setting to get the max number of poll options in UI ( #29490 )  
							
							
							
						 
						
							2024-03-11 09:13:35 +00:00  
				
					
						
							
							
								 
						
							
								2347ea813e 
								
							 
						 
						
							
							
								
								Change dropdown menu icon to not be replaced by close icon when open in web UI ( #29532 )  
							
							
							
						 
						
							2024-03-11 08:57:23 +00:00  
				
					
						
							
							
								 
						
							
								5b3a8737d6 
								
							 
						 
						
							
							
								
								Add hints for rules ( #29539 )  
							
							
							
						 
						
							2024-03-11 08:57:07 +00:00  
				
					
						
							
							
								 
						
							
								f85168b189 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29467 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-11 07:37:04 +00:00  
				
					
						
							
							
								 
						
							
								46152a19a6 
								
							 
						 
						
							
							
								
								Convert logo.jsx to Typescript  
							
							
							
						 
						
							2024-03-08 12:46:49 +01:00  
				
					
						
							
							
								 
						
							
								2b4e9fbc71 
								
							 
						 
						
							
							
								
								[Glitch] Add form element on focal point modal  
							
							... 
							
							
							
							Port 8515bc7962 
							
						 
						
							2024-03-08 12:43:59 +01:00  
				
					
						
							
							
								 
						
							
								98cf4b7ba0 
								
							 
						 
						
							
							
								
								Reduce code differences with upstream  
							
							
							
						 
						
							2024-03-08 12:42:03 +01:00  
				
					
						
							
							
								 
						
							
								6996b96fab 
								
							 
						 
						
							
							
								
								[Glitch] Make columns-area unscrollable when modal opened  
							
							... 
							
							
							
							Port 2091ae92be 
							
						 
						
							2024-03-08 11:50:23 +01:00  
				
					
						
							
							
								 
						
							
								a79bd2cd11 
								
							 
						 
						
							
							
								
								Make some CSS differences with upstream more explicit  
							
							
							
						 
						
							2024-03-08 11:47:34 +01:00  
				
					
						
							
							
								 
						
							
								e95f2c2b68 
								
							 
						 
						
							
							
								
								Add a glitch-soc local setting to make the post publish toast optional ( #2666 )  
							
							
							
						 
						
							2024-03-08 11:35:18 +01:00  
				
					
						
							
							
								 
						
							
								d002458c7b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #2661 )  
							
							... 
							
							
							
							* New Crowdin translations
* Fix bogus translations
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-03-07 22:39:48 +01:00  
				
					
						
							
							
								 
						
							
								1fc6edfa84 
								
							 
						 
						
							
							
								
								[Glitch] Fix unhandled nullable attachments limitation counter  
							
							... 
							
							
							
							Port b8bd94ca8e 
							
						 
						
							2024-03-07 13:01:21 +01:00  
				
					
						
							
							
								 
						
							
								442a5cb66c 
								
							 
						 
						
							
							
								
								Merge commit '653ce43abe0a928d944a15c433d2c8324f9b5e2a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-07 12:59:51 +01:00  
				
					
						
							
							
								 
						
							
								3f239facff 
								
							 
						 
						
							
							
								
								Update flavor screenshots ( #2664 )  
							
							
							
						 
						
							2024-03-07 12:59:00 +01:00  
				
					
						
							
							
								 
						
							
								8c9341a67b 
								
							 
						 
						
							
							
								
								Further reduce pointless CSS differences with upstream ( #2665 )  
							
							
							
						 
						
							2024-03-06 22:13:23 +01:00  
				
					
						
							
							
								 
						
							
								b8bd94ca8e 
								
							 
						 
						
							
							
								
								Fix unhandled nullable attachments limitation counter ( #29183 )  
							
							
							
						 
						
							2024-03-06 12:53:54 +00:00  
				
					
						
							
							
								 
						
							
								1b418a3550 
								
							 
						 
						
							
							
								
								New Crowdin translations  
							
							
							
						 
						
							2024-03-04 04:57:12 +00:00  
				
					
						
							
							
								 
						
							
								159e500749 
								
							 
						 
						
							
							
								
								Merge commit '18945f62e07617ac44b7a25a61799b0959fe67f7' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-01 18:34:48 +01:00  
				
					
						
							
							
								 
						
							
								1d721b21e1 
								
							 
						 
						
							
							
								
								Add attribution to Tabler.io icons used in the new mailer designs ( #29470 )  
							
							
							
						 
						
							2024-03-01 14:51:01 +00:00  
				
					
						
							
							
								 
						
							
								934cab7508 
								
							 
						 
						
							
							
								
								New welcome email ( #28883 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> 
							
						 
						
							2024-03-01 12:16:53 +00:00  
				
					
						
							
							
								 
						
							
								f01605c665 
								
							 
						 
						
							
							
								
								Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/admin.tsx`:
  Changes applied to `app/javascript/core/admin.ts` instead. 
							
						 
						
							2024-03-01 13:02:59 +01:00  
				
					
						
							
							
								 
						
							
								ec953bf378 
								
							 
						 
						
							
							
								
								Fix regression in handling `select` elements in `packs/admin.tsx` ( #29469 )  
							
							
							
						 
						
							2024-03-01 10:16:35 +00:00  
				
					
						
							
							
								 
						
							
								f6654e0842 
								
							 
						 
						
							
							
								
								Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/admin.jsx`:
  This file was split between `app/javascript/core/admin.js`,
  `app/javascript/pack/admin.jsx`, and
  `app/javascript/flavours/glitch/packs/admin.jsx`.
  Ported upstream's change, splitting the new file to
  `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`,
  and `app/javascript/flavours/glitch/packs/admin.tsx` 
							
						 
						
							2024-02-29 19:02:31 +01:00  
				
					
						
							
							
								 
						
							
								a04b384482 
								
							 
						 
						
							
							
								
								[Glitch] Fix regression with search bar icon position  
							
							... 
							
							
							
							Port edd6aa70e1 
							
						 
						
							2024-02-29 18:30:24 +01:00  
				
					
						
							
							
								 
						
							
								bbfcd71118 
								
							 
						 
						
							
							
								
								[Glitch] Fix preview card player getting embedded when clicking on the external link button  
							
							... 
							
							
							
							Port f24c62a5c8 
							
						 
						
							2024-02-29 18:29:57 +01:00  
				
					
						
							
							
								 
						
							
								5b97fdf84c 
								
							 
						 
						
							
							
								
								[Glitch] Fix full date display not respecting the locale 12/24h format  
							
							... 
							
							
							
							Port 4185f3792c 
							
						 
						
							2024-02-29 18:29:11 +01:00  
				
					
						
							
							
								 
						
							
								4d7e7cc562 
								
							 
						 
						
							
							
								
								Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-29 18:24:47 +01:00  
				
					
						
							
							
								 
						
							
								8dbdd7571f 
								
							 
						 
						
							
							
								
								Merge pull request  #2655  from TheEssem/fix/open-in  
							
							... 
							
							
							
							Use upstream's openURL function for search 
							
						 
						
							2024-02-29 18:23:56 +01:00  
				
					
						
							
							
								 
						
							
								958a810553 
								
							 
						 
						
							
							
								
								Convert `packs/admin.jsx` to Typescript ( #29425 )  
							
							
							
						 
						
							2024-02-29 15:21:03 +00:00  
				
					
						
							
							
								 
						
							
								edd6aa70e1 
								
							 
						 
						
							
							
								
								Fix regression with search bar icon position ( #29456 )  
							
							
							
						 
						
							2024-02-29 13:54:06 +00:00  
				
					
						
							
							
								 
						
							
								f24c62a5c8 
								
							 
						 
						
							
							
								
								Fix preview card player getting embedded when clicking on the external link button ( #29457 )  
							
							
							
						 
						
							2024-02-29 13:54:02 +00:00  
				
					
						
							
							
								 
						
							
								4185f3792c 
								
							 
						 
						
							
							
								
								Fix full date display not respecting the locale 12/24h format ( #29448 )  
							
							
							
						 
						
							2024-02-29 09:40:13 +00:00  
				
					
						
							
							
								 
						
							
								cdf5098166 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29452 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-29 09:38:33 +00:00  
				
					
						
							
							
								 
						
							
								9242c536d2 
								
							 
						 
						
							
							
								
								Use openURL function from upstream  
							
							
							
						 
						
							2024-02-28 23:41:18 -06:00  
				
					
						
							
							
								 
						
							
								ab195bcee1 
								
							 
						 
						
							
							
								
								New Crowdin translations  
							
							
							
						 
						
							2024-02-29 04:27:18 +00:00  
				
					
						
							
							
								 
						
							
								4004801ee8 
								
							 
						 
						
							
							
								
								[Glitch] Show comments in the admin/instances page  
							
							... 
							
							
							
							Port deffb8ecb6 
							
						 
						
							2024-02-28 20:38:17 +01:00  
				
					
						
							
							
								 
						
							
								c844817c78 
								
							 
						 
						
							
							
								
								[Glitch] Fix the regression with the search icon position  
							
							... 
							
							
							
							Port edfc53856f 
							
						 
						
							2024-02-28 20:37:48 +01:00  
				
					
						
							
							
								 
						
							
								ccdf56085d 
								
							 
						 
						
							
							
								
								Merge commit '7f84bbfd92377689f84121ec45c5b9d809d94cde' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-28 20:37:38 +01:00  
				
					
						
							
							
								 
						
							
								9324fbe984 
								
							 
						 
						
							
							
								
								[Glitch] Update devDependencies (non-major)  
							
							... 
							
							
							
							Port dc4427dc9b 
							
						 
						
							2024-02-28 20:30:58 +01:00  
				
					
						
							
							
								 
						
							
								21e7a53ca5 
								
							 
						 
						
							
							
								
								Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one
  were changed, but otherwise no real conflict.
  Ported upstream's changes and kept glitch-soc's `i18n:extract`.
- `tsconfig.json`:
  Upstream's dependencies changed the code style rules for json formatting, and
  we had local changes.
  Kept our changes, but with upstream's formatting/
- `yarn.lock`:
  A dependency textually adjacent to a glitch-soc-only one got changed.
  Applied upstream's change, keeping the glitch-soc-only dependency. 
							
						 
						
							2024-02-28 20:27:28 +01:00  
				
					
						
							
							
								 
						
							
								0ff9800989 
								
							 
						 
						
							
							
								
								[Glitch] Use modern ES syntax rather than `.call`  
							
							... 
							
							
							
							Port 899eac1a92 
							
						 
						
							2024-02-28 20:11:26 +01:00  
				
					
						
							
							
								 
						
							
								c2f0ea415e 
								
							 
						 
						
							
							
								
								Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`. 
							
						 
						
							2024-02-28 20:10:01 +01:00  
				
					
						
							
							
								 
						
							
								7f84bbfd92 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29430 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-28 12:14:42 +00:00  
				
					
						
							
							
								 
						
							
								deffb8ecb6 
								
							 
						 
						
							
							
								
								Show comments in the admin/instances page ( #29240 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-02-28 12:07:06 +00:00  
				
					
						
							
							
								 
						
							
								edfc53856f 
								
							 
						 
						
							
							
								
								Fix the regression with the search icon position ( #29417 )  
							
							
							
						 
						
							2024-02-28 12:01:18 +00:00  
				
					
						
							
							
								 
						
							
								c19787f3f4 
								
							 
						 
						
							
							
								
								Add doodle feature back ( #2652 )  
							
							
							
						 
						
							2024-02-27 21:27:51 +01:00  
				
					
						
							
							
								 
						
							
								e8155319c7 
								
							 
						 
						
							
							
								
								Take advantage of upstream's refactor and reduce code duplication  
							
							
							
						 
						
							2024-02-27 19:28:13 +01:00  
				
					
						
							
							
								 
						
							
								916d78373d 
								
							 
						 
						
							
							
								
								[Glitch] Change behavior of privacy dropdown to only change value on validation  
							
							... 
							
							
							
							Port 90573c3abb 
							
						 
						
							2024-02-27 19:24:34 +01:00  
				
					
						
							
							
								 
						
							
								1b219e709b 
								
							 
						 
						
							
							
								
								[Glitch] Fix filters title and keywords overflow  
							
							... 
							
							
							
							Port 213c87ae59 
							
						 
						
							2024-02-27 19:24:03 +01:00  
				
					
						
							
							
								 
						
							
								a482932649 
								
							 
						 
						
							
							
								
								Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/application_controller.rb`:
  Not a real conflict, upstream fixed a bug in a line adjacent to code
  modified by glitch-soc.
  Ported upstream's change. 
							
						 
						
							2024-02-27 19:20:57 +01:00  
				
					
						
							
							
								 
						
							
								dc4427dc9b 
								
							 
						 
						
							
							
								
								Update devDependencies (non-major) ( #29089 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2024-02-27 16:07:43 +00:00  
				
					
						
							
							
								 
						
							
								899eac1a92 
								
							 
						 
						
							
							
								
								Use modern ES syntax rather than `.call` ( #29368 )  
							
							
							
						 
						
							2024-02-27 15:42:05 +00:00  
				
					
						
							
							
								 
						
							
								bc4c5ed918 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29423 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-27 14:53:53 +00:00  
				
					
						
							
							
								 
						
							
								90573c3abb 
								
							 
						 
						
							
							
								
								Change behavior of privacy dropdown to only change value on validation ( #29406 )  
							
							
							
						 
						
							2024-02-27 11:41:19 +00:00  
				
					
						
							
							
								 
						
							
								213c87ae59 
								
							 
						 
						
							
							
								
								Fix filters title and keywords overflow ( #29396 )  
							
							
							
						 
						
							2024-02-27 10:46:58 +00:00  
				
					
						
							
							
								 
						
							
								8a80ad7fc4 
								
							 
						 
						
							
							
								
								[Glitch] Remove unused `media-spoiler-*` JS/CSS  
							
							... 
							
							
							
							Port c7555271a6 
							
						 
						
							2024-02-26 17:54:58 +01:00  
				
					
						
							
							
								 
						
							
								20bc633b0c 
								
							 
						 
						
							
							
								
								[Glitch] Change new explore compass icon CSS class to explore  
							
							... 
							
							
							
							Port 10fdd88288 
							
						 
						
							2024-02-26 17:54:58 +01:00  
				
					
						
							
							
								 
						
							
								3fc4859279 
								
							 
						 
						
							
							
								
								[Glitch] Fix search icon position on mobile  
							
							... 
							
							
							
							Port 1cb74eeec0 
							
						 
						
							2024-02-26 17:54:58 +01:00  
				
					
						
							
							
								 
						
							
								658911c268 
								
							 
						 
						
							
							
								
								[Glitch] Improve alt text form accessibility with long texts  
							
							... 
							
							
							
							Port bbf6cb66f6 
							
						 
						
							2024-02-26 17:54:58 +01:00  
				
					
						
							
							
								 
						
							
								f6903d9ab0 
								
							 
						 
						
							
							
								
								[Glitch] Change explore icon from hashtag to compass in web UI  
							
							... 
							
							
							
							Port b8b2f20b16 
							
						 
						
							2024-02-26 17:54:58 +01:00  
				
					
						
							
							
								 
						
							
								67ca8bb56a 
								
							 
						 
						
							
							
								
								Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/admin.jsx`:
  Change applied to `app/javascript/core/admin.js` instead. 
							
						 
						
							2024-02-26 17:43:16 +01:00  
				
					
						
							
							
								 
						
							
								c7555271a6 
								
							 
						 
						
							
							
								
								Remove unused `media-spoiler-*` JS/CSS ( #29407 )  
							
							
							
						 
						
							2024-02-26 15:30:58 +00:00  
				
					
						
							
							
								 
						
							
								10fdd88288 
								
							 
						 
						
							
							
								
								Change new explore compass icon CSS class to explore ( #29395 )  
							
							
							
						 
						
							2024-02-26 15:28:38 +00:00  
				
					
						
							
							
								 
						
							
								98e3dc2578 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29382 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-26 13:03:06 +00:00  
				
					
						
							
							
								 
						
							
								1cb74eeec0 
								
							 
						 
						
							
							
								
								Fix search icon position on mobile ( #29384 )  
							
							
							
						 
						
							2024-02-26 00:57:48 +00:00  
				
					
						
							
							
								 
						
							
								bbf6cb66f6 
								
							 
						 
						
							
							
								
								Improve alt text form accessibility with long texts ( #27095 )  
							
							
							
						 
						
							2024-02-26 00:57:13 +00:00  
				
					
						
							
							
								 
						
							
								fa2bbbfd9d 
								
							 
						 
						
							
							
								
								Fix "threaded more" typo  
							
							
							
						 
						
							2024-02-25 17:10:25 -06:00  
				
					
						
							
							
								 
						
							
								3ffb81e04f 
								
							 
						 
						
							
							
								
								[Glitch] Add end-to-end test for OCR in media uploads  
							
							... 
							
							
							
							Port ca8fbda5d0 
							
						 
						
							2024-02-24 16:13:13 +01:00  
				
					
						
							
							
								 
						
							
								ad0be125f5 
								
							 
						 
						
							
							
								
								[Glitch] Fix pixel alignment for some composer icons  
							
							... 
							
							
							
							Port 25ffe0af45 
							
						 
						
							2024-02-24 15:53:42 +01:00  
				
					
						
							
							
								 
						
							
								2dc244784c 
								
							 
						 
						
							
							
								
								Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-24 15:43:15 +01:00  
				
					
						
							
							
								 
						
							
								1ad91dece8 
								
							 
						 
						
							
							
								
								Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/admin.jsx`:
  Changes applied to `app/javascript/core/admin.js` instead. 
							
						 
						
							2024-02-24 15:35:56 +01:00  
				
					
						
							
							
								 
						
							
								d2cfc6e5e2 
								
							 
						 
						
							
							
								
								Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-24 15:02:28 +01:00  
				
					
						
							
							
								 
						
							
								ba67ea3d12 
								
							 
						 
						
							
							
								
								[Glitch] Fix `sensitive` flag not being removed when removing CW in new compose form  
							
							... 
							
							
							
							Port c645490d55 
							
						 
						
							2024-02-24 14:53:49 +01:00  
				
					
						
							
							
								 
						
							
								200e11ae88 
								
							 
						 
						
							
							
								
								[Glitch] Change follow suggestions design in web UI  
							
							... 
							
							
							
							Port 63f4ea055a 
							
						 
						
							2024-02-24 14:53:09 +01:00  
				
					
						
							
							
								 
						
							
								26924a0c7d 
								
							 
						 
						
							
							
								
								[Glitch] Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string  
							
							... 
							
							
							
							Port 7ee93b7431 
							
						 
						
							2024-02-24 14:52:44 +01:00  
				
					
						
							
							
								 
						
							
								e45f40d203 
								
							 
						 
						
							
							
								
								[Glitch] Fix modal container bounds  
							
							... 
							
							
							
							Port 476a043fc5 
							
						 
						
							2024-02-24 14:49:35 +01:00  
				
					
						
							
							
								 
						
							
								9f0ff2bedf 
								
							 
						 
						
							
							
								
								[Glitch] Clean up some unused CSS definitions  
							
							... 
							
							
							
							Port 67ec192d7d 
							
						 
						
							2024-02-24 14:49:03 +01:00  
				
					
						
							
							
								 
						
							
								ef3d15554b 
								
							 
						 
						
							
							
								
								Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes. 
							
						 
						
							2024-02-24 14:46:14 +01:00  
				
					
						
							
							
								 
						
							
								3c36e1be68 
								
							 
						 
						
							
							
								
								[Glitch] Fix report reason selector in moderation interface not unselecting rules when changing category  
							
							... 
							
							
							
							Port 9ce914cc89 
							
						 
						
							2024-02-24 14:36:55 +01:00  
				
					
						
							
							
								 
						
							
								3894674200 
								
							 
						 
						
							
							
								
								[Glitch] Fix 'focus the compose textarea' shortcut is not working  
							
							... 
							
							
							
							Port 3c315a68af 
							
						 
						
							2024-02-24 14:35:52 +01:00  
				
					
						
							
							
								 
						
							
								cce3f3d6da 
								
							 
						 
						
							
							
								
								[Glitch] Change onboarding prompt to follow suggestions carousel in web UI  
							
							... 
							
							
							
							Port 9cdc60ecc6 
							
						 
						
							2024-02-24 14:35:08 +01:00  
				
					
						
							
							
								 
						
							
								ab2f0daa10 
								
							 
						 
						
							
							
								
								Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version. 
							
						 
						
							2024-02-24 14:27:43 +01:00  
				
					
						
							
							
								 
						
							
								b4cca47f5f 
								
							 
						 
						
							
							
								
								[Glitch] Remove unused l18n messages  
							
							... 
							
							
							
							Port b3075a9993 
							
						 
						
							2024-02-24 14:19:26 +01:00  
				
					
						
							
							
								 
						
							
								5b9ddfcfcc 
								
							 
						 
						
							
							
								
								Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-24 14:18:16 +01:00  
				
					
						
							
							
								 
						
							
								4d6844eb2f 
								
							 
						 
						
							
							
								
								[Glitch] Fixed the toggle emoji dropdown bug  
							
							... 
							
							
							
							Port 1467f1e1e1 
							
						 
						
							2024-02-24 14:15:59 +01:00  
				
					
						
							
							
								 
						
							
								dfd74f0dae 
								
							 
						 
						
							
							
								
								Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-24 14:15:49 +01:00  
				
					
						
							
							
								 
						
							
								6da69967d0 
								
							 
						 
						
							
							
								
								[Glitch] Change compose form to use server-provided post character limit  
							
							... 
							
							
							
							Port 805dba7f8d 
							
						 
						
							2024-02-24 13:56:12 +01:00  
				
					
						
							
							
								 
						
							
								20615a516d 
								
							 
						 
						
							
							
								
								Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-02-24 13:53:59 +01:00  
				
					
						
							
							
								 
						
							
								6901930c8d 
								
							 
						 
						
							
							
								
								Add back confirmation modal for missing media description  
							
							
							
						 
						
							2024-02-23 23:04:32 +01:00  
				
					
						
							
							
								 
						
							
								138286147f 
								
							 
						 
						
							
							
								
								Fix emoji being inserted in incorrect places  
							
							
							
						 
						
							2024-02-23 21:45:48 +01:00  
				
					
						
							
							
								 
						
							
								6eede9d84b 
								
							 
						 
						
							
							
								
								Add notification badge feature back  
							
							
							
						 
						
							2024-02-23 21:05:34 +01:00  
				
					
						
							
							
								 
						
							
								9ab030bb13 
								
							 
						 
						
							
							
								
								Add thread mode button  
							
							
							
						 
						
							2024-02-23 21:05:34 +01:00  
				
					
						
							
							
								 
						
							
								e333453343 
								
							 
						 
						
							
							
								
								Use Warning icon for CWs in app settings  
							
							
							
						 
						
							2024-02-23 21:05:34 +01:00  
				
					
						
							
							
								 
						
							
								e62cd93650 
								
							 
						 
						
							
							
								
								Fix composer offering to edit federation settings for an existing post  
							
							
							
						 
						
							2024-02-23 21:05:34 +01:00  
				
					
						
							
							
								 
						
							
								23dc650596 
								
							 
						 
						
							
							
								
								Restore preselect on reply option  
							
							
							
						 
						
							2024-02-23 21:05:34 +01:00  
				
					
						
							
							
								 
						
							
								84d05ca221 
								
							 
						 
						
							
							
								
								Reimplement glitchy elephant friend  
							
							
							
						 
						
							2024-02-23 21:05:33 +01:00  
				
					
						
							
							
								 
						
							
								3564a15553 
								
							 
						 
						
							
							
								
								Refactor composer dropdowns  
							
							
							
						 
						
							2024-02-23 21:05:33 +01:00  
				
					
						
							
							
								 
						
							
								0e77c45624 
								
							 
						 
						
							
							
								
								Add local-only option back as a federation setting dropdown  
							
							
							
						 
						
							2024-02-23 21:05:33 +01:00  
				
					
						
							
							
								 
						
							
								47deb680d5 
								
							 
						 
						
							
							
								
								Add Content-Type dropdown back  
							
							
							
						 
						
							2024-02-23 21:05:33 +01:00  
				
					
						
							
							
								 
						
							
								118bb5bc81 
								
							 
						 
						
							
							
								
								Add secondary post button back  
							
							
							
						 
						
							2024-02-23 21:05:33 +01:00  
				
					
						
							
							
								 
						
							
								61559a42a9 
								
							 
						 
						
							
							
								
								Restore glitch-soc's permalink behavior for reply indicator  
							
							
							
						 
						
							2024-02-23 20:57:20 +01:00  
				
					
						
							
							
								 
						
							
								179437ed0e 
								
							 
						 
						
							
							
								
								Restore access to glitch-soc app settings  
							
							
							
						 
						
							2024-02-23 20:57:20 +01:00  
				
					
						
							
							
								 
						
							
								056f9bf3c2 
								
							 
						 
						
							
							
								
								Add back “spoilers always on” feature  
							
							
							
						 
						
							2024-02-23 20:57:18 +01:00  
				
					
						
							
							
								 
						
							
								25ffe0af45 
								
							 
						 
						
							
							
								
								Fix pixel alignment for some composer icons ( #29372 )  
							
							
							
						 
						
							2024-02-23 15:32:13 +00:00  
				
					
						
							
							
								 
						
							
								bba4118ddd 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29369 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-23 15:21:02 +00:00  
				
					
						
							
							
								 
						
							
								380f4fc95c 
								
							 
						 
						
							
							
								
								Reimplement sensitive checkbox  
							
							
							
						 
						
							2024-02-22 23:49:06 +01:00  
				
					
						
							
							
								 
						
							
								5fd50756b4 
								
							 
						 
						
							
							
								
								Restore glitch-soc's support of custom poll limits  
							
							
							
						 
						
							2024-02-22 23:06:12 +01:00  
				
					
						
							
							
								 
						
							
								9c10aaa4d5 
								
							 
						 
						
							
							
								
								[Glitch] Change design of compose form in web UI  
							
							... 
							
							
							
							Port 6936e5aa69 
							
						 
						
							2024-02-22 23:06:12 +01:00  
				
					
						
							
							
								 
						
							
								7586d4348f 
								
							 
						 
						
							
							
								
								Switch glitch-soc to upstream's old composer  
							
							
							
						 
						
							2024-02-22 22:10:17 +01:00  
				
					
						
							
							
								 
						
							
								10a0d76bf0 
								
							 
						 
						
							
							
								
								Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different handling for
  the character limit.
  Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream completely redesigned this, and glitch-soc had different limits for
  option length and number of options.
  Ported glitch-soc's changes to the new version.
Additional change:
- `app/javascript/styles/components.scss`:
  Change how the new image is looked up. 
							
						 
						
							2024-02-22 20:58:41 +01:00  
				
					
						
							
							
								 
						
							
								fff378177e 
								
							 
						 
						
							
							
								
								Further reduce differences with upstream (mainly private mention styling) ( #2641 )  
							
							... 
							
							
							
							* Use upstream's CSS for private mentions styling
* Further reduce differences with upstream 
							
						 
						
							2024-02-22 18:45:54 +01:00  
				
					
						
							
							
								 
						
							
								b71904816a 
								
							 
						 
						
							
							
								
								Change registrations to be disabled by default for new servers ( #29280 )  
							
							
							
						 
						
							2024-02-22 13:28:19 +00:00  
				
					
						
							
							
								 
						
							
								604c93332f 
								
							 
						 
						
							
							
								
								Fix pillbar button colors ( #2639 )  
							
							
							
						 
						
							2024-02-21 19:30:54 +01:00  
				
					
						
							
							
								 
						
							
								154a3119fb 
								
							 
						 
						
							
							
								
								Further reduce CSS differences with upstream ( #2638 )  
							
							
							
						 
						
							2024-02-21 17:50:41 +01:00  
				
					
						
							
							
								 
						
							
								fd2b6c29c6 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29311 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-21 11:24:44 +00:00  
				
					
						
							
							
								 
						
							
								bf6e57b420 
								
							 
						 
						
							
							
								
								Further reduce CSS and markup differences with upstream ( #2637 )  
							
							... 
							
							
							
							* Reduce differences in `MovedNote` markup and styling
* Remove unused setting toggle meta text support
* Fix various CSS discrepancies with upstream
* Further reduce differences with upstream 
							
						 
						
							2024-02-20 23:06:17 +01:00  
				
					
						
							
							
								 
						
							
								5f50b634cf 
								
							 
						 
						
							
							
								
								Further reduce CSS and markup differences with upstream ( #2635 )  
							
							... 
							
							
							
							* Further reduce CSS differences with upstream
* Reduce differences in markup and CSS with upstream
* Redo collapsible post notifications
* Reduce CSS differences further
* Reduce differences with upstream regarding `.status` and `.status__wrapper`
* Further reduce differences with upstream
* Reduce differences with upstream in DisplayName 
							
						 
						
							2024-02-20 18:49:59 +01:00  
				
					
						
							
							
								 
						
							
								9a2b9d1484 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29298 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-02-20 09:23:40 +00:00  
				
					
						
							
							
								 
						
							
								bde4df6be6 
								
							 
						 
						
							
							
								
								Remove CSS definitions for some unused classes ( #29279 )  
							
							
							
						 
						
							2024-02-20 09:18:44 +00:00  
				
					
						
							
							
								 
						
							
								b8b2f20b16 
								
							 
						 
						
							
							
								
								Change explore icon from hashtag to compass in web UI ( #29294 )  
							
							
							
						 
						
							2024-02-20 09:10:44 +00:00  
				
					
						
							
							
								 
						
							
								0a2b95c4f5 
								
							 
						 
						
							
							
								
								Adopt upstream's design for preview cards ( #2634 )  
							
							... 
							
							
							
							Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Christian Schmidt <github@chsc.dk> 
							
						 
						
							2024-02-19 22:47:01 +01:00  
				
					
						
							
							
								 
						
							
								89ea492d70 
								
							 
						 
						
							
							
								
								Further reduce CSS changes with upstream ( #2632 )  
							
							
							
						 
						
							2024-02-19 19:54:51 +01:00  
				
					
						
							
							
								 
						
							
								c645490d55 
								
							 
						 
						
							
							
								
								Fix `sensitive` flag not being removed when removing CW in new compose form ( #29248 )  
							
							
							
						 
						
							2024-02-19 13:31:16 +00:00