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  
				
					
						
							
							
								 
						
							
								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