a2b4c29c8f 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30394 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-22 07:57:51 +00:00  
				
					
						
							
							
								 
						
							
								dc35563f65 
								
							 
						 
						
							
							
								
								[Glitch] Fix announcements icon rotating like settings one  
							
							... 
							
							
							
							Port cd0c547936 
							
						 
						
							2024-05-21 17:45:59 +02:00  
				
					
						
							
							
								 
						
							
								5ab111554e 
								
							 
						 
						
							
							
								
								Merge commit 'cd0c5479362260082dbe1cbc42e364017853bbfc' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-21 17:45:21 +02:00  
				
					
						
							
							
								 
						
							
								cd0c547936 
								
							 
						 
						
							
							
								
								Fix announcements icon rotating like settings one ( #30388 )  
							
							
							
						 
						
							2024-05-21 15:24:51 +00:00  
				
					
						
							
							
								 
						
							
								d3136e6d58 
								
							 
						 
						
							
							
								
								Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-21 12:06:38 +02:00  
				
					
						
							
							
								 
						
							
								eda2bdfc7a 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30383 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-21 08:48:36 +00:00  
				
					
						
							
							
								 
						
							
								ca5955ed76 
								
							 
						 
						
							
							
								
								[Glitch] Use a modern React context for identity in the app  
							
							... 
							
							
							
							Port a178ba7cd5 
							
						 
						
							2024-05-20 12:53:52 +02:00  
				
					
						
							
							
								 
						
							
								e46321e63d 
								
							 
						 
						
							
							
								
								Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-20 12:17:36 +02:00  
				
					
						
							
							
								 
						
							
								8b75d18371 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30358 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-20 07:41:38 +00:00  
				
					
						
							
							
								 
						
							
								990a0c19a9 
								
							 
						 
						
							
							
								
								Fix a warning when running JS Tests because of FakeIdentityContext using deprecated context API ( #30368 )  
							
							
							
						 
						
							2024-05-20 07:29:27 +00:00  
				
					
						
							
							
								 
						
							
								a178ba7cd5 
								
							 
						 
						
							
							
								
								Use a modern React context for identity in the app ( #30098 )  
							
							
							
						 
						
							2024-05-19 17:07:32 +00:00  
				
					
						
							
							
								 
						
							
								7b078b46a2 
								
							 
						 
						
							
							
								
								[Glitch] Fix Web UI trying to save user settings when logged out  
							
							... 
							
							
							
							Port 66906a1bc1 
							
						 
						
							2024-05-16 19:34:50 +02:00  
				
					
						
							
							
								 
						
							
								061464a563 
								
							 
						 
						
							
							
								
								[Glitch] Fix incorrect element selector from  #30221  
							
							... 
							
							
							
							Port 94493cff92 
							
						 
						
							2024-05-16 19:34:17 +02:00  
				
					
						
							
							
								 
						
							
								2810231180 
								
							 
						 
						
							
							
								
								Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Upstream renamed a helper method everywhere.
  There was one glitch-soc line involving changes because of the local-only post
  feature.
  Ported upstream's change. 
							
						 
						
							2024-05-16 19:30:10 +02:00  
				
					
						
							
							
								 
						
							
								66906a1bc1 
								
							 
						 
						
							
							
								
								Fix Web UI trying to save user settings when logged out ( #30324 )  
							
							
							
						 
						
							2024-05-16 13:01:01 +00:00  
				
					
						
							
							
								 
						
							
								cdb042ae86 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30319 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-16 07:50:19 +00:00  
				
					
						
							
							
								 
						
							
								94493cff92 
								
							 
						 
						
							
							
								
								Fix incorrect element selector from  #30221  ( #30307 )  
							
							
							
						 
						
							2024-05-16 07:33:29 +00:00  
				
					
						
							
							
								 
						
							
								aad5e841b5 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30290 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-15 08:53:57 +00:00  
				
					
						
							
							
								 
						
							
								47ce5f4ca9 
								
							 
						 
						
							
							
								
								[Glitch] Fix missing prop warning for `<Account>`  
							
							... 
							
							
							
							Port 1bf661cddb 
							
						 
						
							2024-05-14 20:53:40 +02:00  
				
					
						
							
							
								 
						
							
								160823716a 
								
							 
						 
						
							
							
								
								[Glitch] Add active animation to header settings button  
							
							... 
							
							
							
							Port cb93c1edf0 
							
						 
						
							2024-05-14 20:53:01 +02:00  
				
					
						
							
							
								 
						
							
								666760f450 
								
							 
						 
						
							
							
								
								Merge commit '1bf661cddbc614d4076e9d9e855575fc29e976c0' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Upstream fixed a command we have modified in glitch-soc.
  Updated as upstream did. 
							
						 
						
							2024-05-14 20:47:14 +02:00  
				
					
						
							
							
								 
						
							
								1bf661cddb 
								
							 
						 
						
							
							
								
								Fix missing prop warning for `<Account>` ( #30291 )  
							
							
							
						 
						
							2024-05-14 18:15:42 +00:00  
				
					
						
							
							
								 
						
							
								3a7aec2807 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30254 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-13 11:30:41 +00:00  
				
					
						
							
							
								 
						
							
								cb93c1edf0 
								
							 
						 
						
							
							
								
								Add active animation to header settings button ( #30221 )  
							
							
							
						 
						
							2024-05-13 09:19:42 +00:00  
				
					
						
							
							
								 
						
							
								f65a6d50f1 
								
							 
						 
						
							
							
								
								[Glitch] Fix typo  
							
							... 
							
							
							
							Port c36a8786c1 
							
						 
						
							2024-05-11 22:44:41 +02:00  
				
					
						
							
							
								 
						
							
								f35ba6963d 
								
							 
						 
						
							
							
								
								Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-11 22:10:56 +02:00  
				
					
						
							
							
								 
						
							
								c9557bdd3b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30215 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-10 09:34:48 +00:00  
				
					
						
							
							
								 
						
							
								c36a8786c1 
								
							 
						 
						
							
							
								
								Fix typo ( #30224 )  
							
							
							
						 
						
							2024-05-10 09:19:27 +00:00  
				
					
						
							
							
								 
						
							
								f7dadc9f0b 
								
							 
						 
						
							
							
								
								Merge commit '5cd13ee4f19c112ea855063c2495e2874746f23a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-07 12:13:02 +02:00  
				
					
						
							
							
								 
						
							
								ed556db395 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30201 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-07 09:36:16 +00:00  
				
					
						
							
							
								 
						
							
								016d194274 
								
							 
						 
						
							
							
								
								Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, upstream added helpers right next to glitch-soc only
  helpers.
  Added upstream's helpers.
- `spec/models/status_spec.rb`:
  Not a real conflict, upstream added specs right next to glitch-soc only
  specs.
  Added upstream's tests. 
							
						 
						
							2024-05-06 17:53:51 +02:00  
				
					
						
							
							
								 
						
							
								9be2c02e52 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30169 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-06 08:36:29 +00:00  
				
					
						
							
							
								 
						
							
								c59f6ef5b8 
								
							 
						 
						
							
							
								
								[Glitch] Convert `entrypoints/two_factor_authentication` to Typescript  
							
							... 
							
							
							
							Port 9e260014c7 
							
						 
						
							2024-05-04 16:30:24 +02:00  
				
					
						
							
							
								 
						
							
								b6ada33ad4 
								
							 
						 
						
							
							
								
								[Glitch] Fix word breaking in filtered notifications badge  
							
							... 
							
							
							
							Port 616e2f2666 
							
						 
						
							2024-05-04 16:30:05 +02:00  
				
					
						
							
							
								 
						
							
								3789d9f825 
								
							 
						 
						
							
							
								
								Merge commit 'b7902225d698a107df2cf8b4ca221caad38fa464' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS`
  while glitch-soc had custom code to read from `MAX_TOOT_CHARS`.
  Switched to using upstream's implementation of the tests. 
							
						 
						
							2024-05-04 16:28:30 +02:00  
				
					
						
							
							
								 
						
							
								4b82dc84f5 
								
							 
						 
						
							
							
								
								[Glitch] Change width breakpoint for mobile placement behavior  
							
							... 
							
							
							
							Port 26e10aa203 
							
						 
						
							2024-05-04 16:16:22 +02:00  
				
					
						
							
							
								 
						
							
								6662d604c1 
								
							 
						 
						
							
							
								
								[Glitch] Add loading indicator and empty result message to advanced interface search  
							
							... 
							
							
							
							Port 7d3fe2b4c3 
							
						 
						
							2024-05-04 16:15:54 +02:00  
				
					
						
							
							
								 
						
							
								e62595c966 
								
							 
						 
						
							
							
								
								[Glitch] Remove usage of deprecated `defaultTypes` on React functional components  
							
							... 
							
							
							
							Port b9b4db483c 
							
						 
						
							2024-05-04 16:15:16 +02:00  
				
					
						
							
							
								 
						
							
								f09f5b35f2 
								
							 
						 
						
							
							
								
								Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/account.rb`:
  Upstream refactored this file a bit, moving validation limits to constants.
  We already had a similar change, although with different constant names.
  Updated to match upstream's code.
The following files were also modified accordingly:
- `app/views/settings/profiles/show.html.haml`
- `spec/requests/api/v1/accounts/credentials_spec.rb` 
							
						 
						
							2024-05-04 16:12:51 +02:00  
				
					
						
							
							
								 
						
							
								494d28bb56 
								
							 
						 
						
							
							
								
								[Glitch] Convert `entrypoints/sign_up` to Typescript  
							
							... 
							
							
							
							Port 4527e012da 
							
						 
						
							2024-05-04 15:51:58 +02:00  
				
					
						
							
							
								 
						
							
								fe7db7905f 
								
							 
						 
						
							
							
								
								[Glitch] Convert easy entrypoints files to Typescript  
							
							... 
							
							
							
							Port 36909065b5 
							
						 
						
							2024-05-04 15:49:30 +02:00  
				
					
						
							
							
								 
						
							
								defd1e4024 
								
							 
						 
						
							
							
								
								[Glitch] Remove home marker updates  
							
							... 
							
							
							
							Port 4f4b77920e 
							
						 
						
							2024-05-04 15:42:33 +02:00  
				
					
						
							
							
								 
						
							
								a76980a229 
								
							 
						 
						
							
							
								
								Merge commit 'f0c9cbaf3b079700b8179222d409c644dfd8ff66' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-04 15:40:07 +02:00  
				
					
						
							
							
								 
						
							
								552e09d57f 
								
							 
						 
						
							
							
								
								[Glitch] Fix marker thunks to not ignore eslint directives for the whole file  
							
							... 
							
							
							
							Port 65093c619f 
							
						 
						
							2024-05-04 15:30:18 +02:00  
				
					
						
							
							
								 
						
							
								a4ce53df27 
								
							 
						 
						
							
							
								
								[Glitch] Change moderation warning notification icon  
							
							... 
							
							
							
							Port de4a7bf531 
							
						 
						
							2024-05-04 15:29:51 +02:00  
				
					
						
							
							
								 
						
							
								aac59a34ed 
								
							 
						 
						
							
							
								
								[Glitch] Add in-app notifications for moderation actions/warnings  
							
							... 
							
							
							
							Port 4ef0b48b95 
							
						 
						
							2024-05-04 15:29:29 +02:00  
				
					
						
							
							
								 
						
							
								8dbcf8a287 
								
							 
						 
						
							
							
								
								[Glitch] Change design of people tab on explore in web UI  
							
							... 
							
							
							
							Port 0ec061aa8f 
							
						 
						
							2024-05-04 15:28:17 +02:00  
				
					
						
							
							
								 
						
							
								d6f9c97ae4 
								
							 
						 
						
							
							
								
								Merge commit '7201f99cf83a74331febd1624ca9aaace68af5e6' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-04 15:24:22 +02:00  
				
					
						
							
							
								 
						
							
								333905b2d5 
								
							 
						 
						
							
							
								
								[Glitch] Change mute options to be in dropdown on muted users list in web UI  
							
							... 
							
							
							
							Port 74012831f6 
							
						 
						
							2024-05-04 15:15:00 +02:00  
				
					
						
							
							
								 
						
							
								bac4026d80 
								
							 
						 
						
							
							
								
								Merge commit '85fdbd0ad53837c9209acf3fb45811d5bae41cd9' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-04 15:10:54 +02:00  
				
					
						
							
							
								 
						
							
								bceb45adda 
								
							 
						 
						
							
							
								
								Merge commit '3f6887557b23d363e7f8f18518db4447739d64bb' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/entrypoints/common.js`:
  Upstream moved everything from `app/javascript/packs` to
  `app/javascript/entrypoints` while this file was a glitch-soc
  addition. Moved it like the rest.
- `tsconfig.json`:
  Conflict due to glitch-soc's flavor.
  Updated like upstream.
Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs` 
							
						 
						
							2024-05-04 14:59:00 +02:00  
				
					
						
							
							
								 
						
							
								9e260014c7 
								
							 
						 
						
							
							
								
								Convert `entrypoints/two_factor_authentication` to Typescript ( #30105 )  
							
							
							
						 
						
							2024-05-02 12:02:13 +00:00  
				
					
						
							
							
								 
						
							
								616e2f2666 
								
							 
						 
						
							
							
								
								Fix word breaking in filtered notifications badge ( #30114 )  
							
							
							
						 
						
							2024-05-02 09:40:18 +00:00  
				
					
						
							
							
								 
						
							
								309f352e6a 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30140 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-05-02 08:57:30 +00:00  
				
					
						
							
							
								 
						
							
								b039e62194 
								
							 
						 
						
							
							
								
								Merge commit 'a2399046ca600d492b492b8dae88011de687bece' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 19:49:59 +02:00  
				
					
						
							
							
								 
						
							
								6204d13a2e 
								
							 
						 
						
							
							
								
								Merge commit 'ec71c02c4b028c3541742f023729aeb295a51559' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `Gemfile`:
  There was an extra newline in glitch-soc for some reason.
  Removed it. 
							
						 
						
							2024-05-01 19:38:34 +02:00  
				
					
						
							
							
								 
						
							
								360590ecd8 
								
							 
						 
						
							
							
								
								Merge commit 'a3902997440c71f161e392f1ad6c5cdcf6aba95d' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/controllers/accounts_controller.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes.
- `app/lib/account_statuses_filter.rb`:
  Conflict due to glitch-soc's local-only posting feature.
  Refactored as upstream did but kept local changes. 
							
						 
						
							2024-05-01 19:30:41 +02:00  
				
					
						
							
							
								 
						
							
								df933836ca 
								
							 
						 
						
							
							
								
								[Glitch] Fix incorrect label for filtered notifications badge  
							
							... 
							
							
							
							Port 66ee0d4a1f 
							
						 
						
							2024-05-01 19:18:06 +02:00  
				
					
						
							
							
								 
						
							
								62b3f284db 
								
							 
						 
						
							
							
								
								[Glitch] Fix unfollow button being out of frame on small screens on old browsers  
							
							... 
							
							
							
							Port 4117c8f6b8 
							
						 
						
							2024-05-01 19:17:28 +02:00  
				
					
						
							
							
								 
						
							
								946bd2e7e1 
								
							 
						 
						
							
							
								
								Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 19:16:48 +02:00  
				
					
						
							
							
								 
						
							
								ac5113d524 
								
							 
						 
						
							
							
								
								[Glitch] Update eslint (non-major)  
							
							... 
							
							
							
							Port 37d984b8bf 
							
						 
						
							2024-05-01 19:04:59 +02:00  
				
					
						
							
							
								 
						
							
								e76ddf79bc 
								
							 
						 
						
							
							
								
								[Glitch] Add `/` keyboard shortcut to focus the search field  
							
							... 
							
							
							
							Port c386c36866 
							
						 
						
							2024-05-01 18:57:39 +02:00  
				
					
						
							
							
								 
						
							
								6f342a6d4c 
								
							 
						 
						
							
							
								
								Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/helpers/theme_helper.rb`:
  Conflict caused by our different theme systems.
  Ported upstream's changes.
- `app/models/account.rb`:
  Upstream basically made a change we already made.
  Moved constant declaration to match upstream. 
							
						 
						
							2024-05-01 18:56:48 +02:00  
				
					
						
							
							
								 
						
							
								2d43547934 
								
							 
						 
						
							
							
								
								[Glitch] Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`)  
							
							... 
							
							
							
							Port 730e2127e1 
							
						 
						
							2024-05-01 18:43:37 +02:00  
				
					
						
							
							
								 
						
							
								9ce82a35cb 
								
							 
						 
						
							
							
								
								Merge commit '20b1e55f24a87868d661fc7b033bbbbd48b1a918' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 18:42:26 +02:00  
				
					
						
							
							
								 
						
							
								3739dda2f6 
								
							 
						 
						
							
							
								
								[Glitch] Add purple border to active compose field search inputs  
							
							... 
							
							
							
							Port 1c87cb8019 
							
						 
						
							2024-05-01 17:31:39 +02:00  
				
					
						
							
							
								 
						
							
								0fb469e2f3 
								
							 
						 
						
							
							
								
								Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 17:30:52 +02:00  
				
					
						
							
							
								 
						
							
								41c43168fb 
								
							 
						 
						
							
							
								
								[Glitch] Makes the star icon rotate around its actual centre axis  
							
							... 
							
							
							
							Port c6da3ee828 
							
						 
						
							2024-05-01 17:27:59 +02:00  
				
					
						
							
							
								 
						
							
								b21322b406 
								
							 
						 
						
							
							
								
								[Glitch] Fix blue border on emoji/language search in Safari & Chrome  
							
							... 
							
							
							
							Port e284417349 
							
						 
						
							2024-05-01 17:27:29 +02:00  
				
					
						
							
							
								 
						
							
								4543bb9384 
								
							 
						 
						
							
							
								
								[Glitch] Fix language and emoji search field background colors on light theme  
							
							... 
							
							
							
							Port 5d67247061 
							
						 
						
							2024-05-01 17:27:10 +02:00  
				
					
						
							
							
								 
						
							
								3503fe1865 
								
							 
						 
						
							
							
								
								Merge commit '4045c069f8f91200d0e7c64a8097e425aee71041' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 17:26:21 +02:00  
				
					
						
							
							
								 
						
							
								46cc9141c9 
								
							 
						 
						
							
							
								
								[Glitch] Fix contrast in notification request badge  
							
							... 
							
							
							
							Port 0b9d4103cb 
							
						 
						
							2024-05-01 17:23:07 +02:00  
				
					
						
							
							
								 
						
							
								15f6d2d038 
								
							 
						 
						
							
							
								
								Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Conflict due to glitch-soc having a different default site name.
  Updated the tests as upstream did, keeping glitch-soc's default name. 
							
						 
						
							2024-05-01 17:22:02 +02:00  
				
					
						
							
							
								 
						
							
								87b9b23025 
								
							 
						 
						
							
							
								
								[Glitch] Use integers and not numbers in notification policy API counters  
							
							... 
							
							
							
							Port b4d991adaa 
							
						 
						
							2024-05-01 17:12:57 +02:00  
				
					
						
							
							
								 
						
							
								c316852a65 
								
							 
						 
						
							
							
								
								[Glitch] Add API types for status and related objects  
							
							... 
							
							
							
							Port e47a3d00fe 
							
						 
						
							2024-05-01 17:12:16 +02:00  
				
					
						
							
							
								 
						
							
								297c8c37b1 
								
							 
						 
						
							
							
								
								[Glitch] Fix Redux Middleware types  
							
							... 
							
							
							
							Port 07635228e2 
							
						 
						
							2024-05-01 17:08:44 +02:00  
				
					
						
							
							
								 
						
							
								0f756eaed2 
								
							 
						 
						
							
							
								
								[Glitch] Fix search box color on light theme  
							
							... 
							
							
							
							Port fa9574086d 
							
						 
						
							2024-05-01 17:08:05 +02:00  
				
					
						
							
							
								 
						
							
								2c386d4cfe 
								
							 
						 
						
							
							
								
								Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 17:06:49 +02:00  
				
					
						
							
							
								 
						
							
								3b1c8d56b2 
								
							 
						 
						
							
							
								
								[Glitch] Fix light theme header on mobile  
							
							... 
							
							
							
							Port 90eb4a5d01 
							
						 
						
							2024-05-01 16:49:21 +02:00  
				
					
						
							
							
								 
						
							
								1783820acd 
								
							 
						 
						
							
							
								
								[Glitch] Fix background tint in single column light theme  
							
							... 
							
							
							
							Port 430da03160 
							
						 
						
							2024-05-01 16:48:55 +02:00  
				
					
						
							
							
								 
						
							
								375bd52d97 
								
							 
						 
						
							
							
								
								[Glitch] Handle `createAppAsyncThunk` rejected actions in the errors middleware  
							
							... 
							
							
							
							Port 69e5771881 
							
						 
						
							2024-05-01 16:48:27 +02:00  
				
					
						
							
							
								 
						
							
								7f404fd635 
								
							 
						 
						
							
							
								
								Merge commit '90eb4a5d01f1f1e8a76e7dc814eae992a9c1ee16' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 16:47:25 +02:00  
				
					
						
							
							
								 
						
							
								b3d5567bd0 
								
							 
						 
						
							
							
								
								[Glitch] Remove global `boosts` state and convert boosts modal to Typescript  
							
							... 
							
							
							
							Port 67442f9039 
							
						 
						
							2024-05-01 16:42:20 +02:00  
				
					
						
							
							
								 
						
							
								0f90e624c5 
								
							 
						 
						
							
							
								
								Merge commit '672c9f5f05bde788877ae0dcdb6668366c4c8941' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/helpers/application_helper.rb`:
  Conflict due to our theming system being different.
  Ported upstream's changes. 
							
						 
						
							2024-05-01 16:10:45 +02:00  
				
					
						
							
							
								 
						
							
								bc370938ef 
								
							 
						 
						
							
							
								
								[Glitch] Fix logo pushing header buttons out of view on certain conditions in mobile layout  
							
							... 
							
							
							
							Port 4f068d4fcc 
							
						 
						
							2024-05-01 15:56:38 +02:00  
				
					
						
							
							
								 
						
							
								cc720cd38f 
								
							 
						 
						
							
							
								
								[Glitch] Fix `<RelativeTimestamp>` types  
							
							... 
							
							
							
							Port 961bb84e4c 
							
						 
						
							2024-05-01 15:56:37 +02:00  
				
					
						
							
							
								 
						
							
								0ab212f6a9 
								
							 
						 
						
							
							
								
								[Glitch] Fix props for `<Button>`  
							
							... 
							
							
							
							Port d088964761 
							
						 
						
							2024-05-01 15:56:37 +02:00  
				
					
						
							
							
								 
						
							
								02f9ce9ce3 
								
							 
						 
						
							
							
								
								[Glitch] Fix PropTypes for some record objects  
							
							... 
							
							
							
							Port f2fd1da23f 
							
						 
						
							2024-05-01 15:56:37 +02:00  
				
					
						
							
							
								 
						
							
								5cb4adbf4e 
								
							 
						 
						
							
							
								
								[Glitch] Fix language picker and privacy picker not having a backdrop filter  
							
							... 
							
							
							
							Port c913e2f3e5 
							
						 
						
							2024-05-01 15:56:37 +02:00  
				
					
						
							
							
								 
						
							
								555f45f249 
								
							 
						 
						
							
							
								
								[Glitch] Fix notifications marker fetch  
							
							... 
							
							
							
							Port b9982ce578 
							
						 
						
							2024-05-01 15:56:37 +02:00  
				
					
						
							
							
								 
						
							
								371c5e59eb 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite PIP state in Typescript  
							
							... 
							
							
							
							Port 9fbe8d3a0c 
							
						 
						
							2024-05-01 15:56:37 +02:00  
				
					
						
							
							
								 
						
							
								059e10e546 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite markers reducer in Typescript  
							
							... 
							
							
							
							Port 27d014a7fa 
							
						 
						
							2024-05-01 14:55:03 +02:00  
				
					
						
							
							
								 
						
							
								3f61981f5d 
								
							 
						 
						
							
							
								
								Merge commit '8a498f4e65ecf27cc2c992d02b47f890dafef20b' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 14:50:16 +02:00  
				
					
						
							
							
								 
						
							
								03af271d3d 
								
							 
						 
						
							
							
								
								[Glitch] Fix column borders disappearing in advanced interface on low width viewports  
							
							... 
							
							
							
							Port b2d841ce9a 
							
						 
						
							2024-05-01 14:32:29 +02:00  
				
					
						
							
							
								 
						
							
								7b46517c38 
								
							 
						 
						
							
							
								
								Merge commit 'd49343ed11b3c08c4e81ecd70e17e01bd30154a6' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-05-01 14:31:14 +02:00  
				
					
						
							
							
								 
						
							
								d63c0a2879 
								
							 
						 
						
							
							
								
								[Glitch] Support "system" theme setting (light/dark theme depending on user system preference)  
							
							... 
							
							
							
							Port 02ea161506 
							
						 
						
							2024-05-01 14:25:51 +02:00  
				
					
						
							
							
								 
						
							
								a6147a831f 
								
							 
						 
						
							
							
								
								Merge commit '02ea16150647ac3baf0bb8a89203ccc7200b4a2f' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/lib/themes.rb`
- `app/views/layouts/application.html.haml`
- `app/views/layouts/embedded.html.haml`
- `app/views/layouts/error.html.haml`
- `config/settings.yml`
All these conflicts are because glitch-soc and upstream have different theming
systems and upstream changed a few things to have dynamic theme selection based
on system settings.
Conflicts were solved to take that into account, and `current_theme` has been
changed in the process to return a tuple of `[flavour, skin]` to be used in
the `theme_style_tags` helper. 
							
						 
						
							2024-05-01 14:25:47 +02:00  
				
					
						
							
							
								 
						
							
								26e10aa203 
								
							 
						 
						
							
							
								
								Change width breakpoint for mobile placement behavior ( #30131 )  
							
							
							
						 
						
							2024-04-30 23:39:28 +00:00  
				
					
						
							
							
								 
						
							
								d6048d3a6c 
								
							 
						 
						
							
							
								
								Add compatibility `app/javascript/flavours/glitch/styles/index.scss`  
							
							
							
						 
						
							2024-04-30 21:27:04 +02:00  
				
					
						
							
							
								 
						
							
								8a34c42341 
								
							 
						 
						
							
							
								
								Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss`  
							
							... 
							
							
							
							This is just to reduce differences with upstream. 
							
						 
						
							2024-04-30 21:03:04 +02:00  
				
					
						
							
							
								 
						
							
								56821ed879 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30128 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-30 09:05:53 +00:00  
				
					
						
							
							
								 
						
							
								7d3fe2b4c3 
								
							 
						 
						
							
							
								
								Add loading indicator and empty result message to advanced interface search ( #30085 )  
							
							
							
						 
						
							2024-04-29 09:55:41 +00:00  
				
					
						
							
							
								 
						
							
								b9b4db483c 
								
							 
						 
						
							
							
								
								Remove usage of deprecated `defaultTypes` on React functional components ( #30099 )  
							
							
							
						 
						
							2024-04-29 09:29:59 +00:00  
				
					
						
							
							
								 
						
							
								4527e012da 
								
							 
						 
						
							
							
								
								Convert `entrypoints/sign_up` to Typescript ( #30106 )  
							
							
							
						 
						
							2024-04-29 08:23:05 +00:00  
				
					
						
							
							
								 
						
							
								9be7efedf0 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30092 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-29 08:15:43 +00:00  
				
					
						
							
							
								 
						
							
								36909065b5 
								
							 
						 
						
							
							
								
								Convert easy entrypoints files to Typescript ( #30102 )  
							
							
							
						 
						
							2024-04-29 08:02:41 +00:00  
				
					
						
							
							
								 
						
							
								4f4b77920e 
								
							 
						 
						
							
							
								
								Remove home marker updates ( #22721 )  
							
							
							
						 
						
							2024-04-29 07:55:58 +00:00  
				
					
						
							
							
								 
						
							
								7208edbd37 
								
							 
						 
						
							
							
								
								Replace `use_pack`, `layouts/theme` and `@theme` by new helpers  
							
							... 
							
							
							
							Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced 
							
						 
						
							2024-04-28 15:45:42 +02:00  
				
					
						
							
							
								 
						
							
								c3e12a4dfa 
								
							 
						 
						
							
							
								
								Change how theme style packs are loaded  
							
							... 
							
							
							
							Load the `common` style pack, and then charge the style pack for the current
skin, independent from any selected JS pack. 
							
						 
						
							2024-04-28 15:45:41 +02:00  
				
					
						
							
							
								 
						
							
								dee57982f1 
								
							 
						 
						
							
							
								
								Rename “home” pack to “application”  
							
							
							
						 
						
							2024-04-28 15:06:41 +02:00  
				
					
						
							
							
								 
						
							
								9a8be8cf49 
								
							 
						 
						
							
							
								
								Remove theme fallback mechanism  
							
							... 
							
							
							
							Remove the `fallback` property and do not fallback to using another flavour
when a pack is not available in the selected flavour.
Flavours should define all packs, and should they wish to piggy-back on
another one, they can import that other one's pack explicitly instead. 
							
						 
						
							2024-04-28 15:05:16 +02:00  
				
					
						
							
							
								 
						
							
								62bc36416f 
								
							 
						 
						
							
							
								
								Get rid of `app/javascript/core`  
							
							... 
							
							
							
							Have all flavors implement everything they need instead. 
							
						 
						
							2024-04-28 15:04:52 +02:00  
				
					
						
							
							
								 
						
							
								65093c619f 
								
							 
						 
						
							
							
								
								Fix marker thunks to not ignore eslint directives for the whole file ( #30089 )  
							
							
							
						 
						
							2024-04-26 17:11:27 +00:00  
				
					
						
							
							
								 
						
							
								de4a7bf531 
								
							 
						 
						
							
							
								
								Change moderation warning notification icon ( #30081 )  
							
							
							
						 
						
							2024-04-26 15:33:15 +00:00  
				
					
						
							
							
								 
						
							
								5201882a23 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30077 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-26 10:05:18 +00:00  
				
					
						
							
							
								 
						
							
								4ef0b48b95 
								
							 
						 
						
							
							
								
								Add in-app notifications for moderation actions/warnings ( #30065 )  
							
							
							
						 
						
							2024-04-25 17:26:05 +00:00  
				
					
						
							
							
								 
						
							
								0ec061aa8f 
								
							 
						 
						
							
							
								
								Change design of people tab on explore in web UI ( #30059 )  
							
							
							
						 
						
							2024-04-25 16:25:33 +00:00  
				
					
						
							
							
								 
						
							
								85fdbd0ad5 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30062 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-25 08:50:54 +00:00  
				
					
						
							
							
								 
						
							
								113c931cda 
								
							 
						 
						
							
							
								
								Fix follow request notifications not being displayed ( #2695 )  
							
							
							
						 
						
							2024-04-24 17:00:48 +02:00  
				
					
						
							
							
								 
						
							
								ebcf9840f4 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30050 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-24 08:45:24 +00:00  
				
					
						
							
							
								 
						
							
								74012831f6 
								
							 
						 
						
							
							
								
								Change mute options to be in dropdown on muted users list in web UI ( #30049 )  
							
							
							
						 
						
							2024-04-24 08:45:12 +00:00  
				
					
						
							
							
								 
						
							
								3f6887557b 
								
							 
						 
						
							
							
								
								Move JS source from `packs` to `entrypoints` ( #30037 )  
							
							
							
						 
						
							2024-04-23 16:45:12 +00:00  
				
					
						
							
							
								 
						
							
								32ead51e5a 
								
							 
						 
						
							
							
								
								Add material design icons to admin/settings views ( #27780 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-04-23 16:43:49 +00:00  
				
					
						
							
							
								 
						
							
								d754b15afb 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30034 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-23 09:07:05 +00:00  
				
					
						
							
							
								 
						
							
								75163d9daf 
								
							 
						 
						
							
							
								
								Fixed rendering error on /start when not logged in ( #30023 )  
							
							
							
						 
						
							2024-04-22 08:53:08 +00:00  
				
					
						
							
							
								 
						
							
								3655fb6a22 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #30014 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-22 08:42:35 +00:00  
				
					
						
							
							
								 
						
							
								c61130af33 
								
							 
						 
						
							
							
								
								New Crowdin translations  
							
							
							
						 
						
							2024-04-22 04:27:38 +00:00  
				
					
						
							
							
								 
						
							
								ec71c02c4b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29994 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-19 13:57:43 +00:00  
				
					
						
							
							
								 
						
							
								443186ff40 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29980 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-18 11:18:39 +00:00  
				
					
						
							
							
								 
						
							
								c35042b7eb 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29972 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-17 09:07:13 +00:00  
				
					
						
							
							
								 
						
							
								66ee0d4a1f 
								
							 
						 
						
							
							
								
								Fix incorrect label for filtered notifications badge ( #29922 )  
							
							
							
						 
						
							2024-04-16 09:25:23 +00:00  
				
					
						
							
							
								 
						
							
								285d4123b5 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29955 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-16 08:36:21 +00:00  
				
					
						
							
							
								 
						
							
								4117c8f6b8 
								
							 
						 
						
							
							
								
								Fix unfollow button being out of frame on small screens on old browsers ( #29923 )  
							
							
							
						 
						
							2024-04-15 11:56:48 +00:00  
				
					
						
							
							
								 
						
							
								4e78cb9988 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29939 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-15 09:29:39 +00:00  
				
					
						
							
							
								 
						
							
								c386c36866 
								
							 
						 
						
							
							
								
								Add `/` keyboard shortcut to focus the search field ( #29921 )  
							
							
							
						 
						
							2024-04-12 09:42:12 +00:00  
				
					
						
							
							
								 
						
							
								5992df0762 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29920 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-12 08:19:48 +00:00  
				
					
						
							
							
								 
						
							
								20b1e55f24 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29903 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-11 10:30:31 +00:00  
				
					
						
							
							
								 
						
							
								db5a5636d9 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29888 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-10 13:03:40 +00:00  
				
					
						
							
							
								 
						
							
								13faf26315 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29859 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-08 13:44:54 +00:00  
				
					
						
							
							
								 
						
							
								730e2127e1 
								
							 
						 
						
							
							
								
								Fix webpack warnings due to unhandled extensions (`LICENCE` and `README.md`) ( #29869 )  
							
							
							
						 
						
							2024-04-08 08:17:51 +00:00  
				
					
						
							
							
								 
						
							
								91531e9586 
								
							 
						 
						
							
							
								
								[Glitch] Add ability to reorder uploaded media before posting in web UI  
							
							... 
							
							
							
							Port 8e7e86ee35 
							
						 
						
							2024-04-06 22:34:03 +02:00  
				
					
						
							
							
								 
						
							
								fc533cfad3 
								
							 
						 
						
							
							
								
								[Glitch] Fix background and icon on notification requests in web UI  
							
							... 
							
							
							
							Port 0cea7a623b 
							
						 
						
							2024-04-06 21:51:51 +02:00  
				
					
						
							
							
								 
						
							
								b55bbfa2b3 
								
							 
						 
						
							
							
								
								[Glitch] Change design of notification about lost connections in web UI  
							
							... 
							
							
							
							Port 29f9dc742e 
							
						 
						
							2024-04-06 21:49:57 +02:00  
				
					
						
							
							
								 
						
							
								1ae08ae257 
								
							 
						 
						
							
							
								
								[Glitch] Change out-of-band hashtags design in web UI  
							
							... 
							
							
							
							Port dd061291b1 
							
						 
						
							2024-04-06 21:48:52 +02:00  
				
					
						
							
							
								 
						
							
								0e76b919b5 
								
							 
						 
						
							
							
								
								Merge commit '0cea7a623be470c51d7a162265f44f5a3e149275' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-04-06 21:48:35 +02:00  
				
					
						
							
							
								 
						
							
								a844a6a577 
								
							 
						 
						
							
							
								
								[Glitch] Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately  
							
							... 
							
							
							
							Port dfa43707eb 
							
						 
						
							2024-04-06 21:39:04 +02:00  
				
					
						
							
							
								 
						
							
								c3a128f31e 
								
							 
						 
						
							
							
								
								Remove strings already defined upstream  
							
							
							
						 
						
							2024-04-06 21:25:04 +02:00  
				
					
						
							
							
								 
						
							
								afaad0755f 
								
							 
						 
						
							
							
								
								[Glitch] Remove setting for unfollow confirmation modal, and make it unconditional  
							
							... 
							
							
							
							Port 37ca59815c 
							
						 
						
							2024-04-06 21:17:45 +02:00  
				
					
						
							
							
								 
						
							
								1d1c3a808a 
								
							 
						 
						
							
							
								
								Merge commit '6c381f20b1d52c96525cbd5c41b0c972c3394a48' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/user_settings.rb`:
  Upstream removed a setting textually adjacent to a glitch-soc-only setting.
  Removed the setting glitch-soc removed. 
							
						 
						
							2024-04-06 21:01:40 +02:00  
				
					
						
							
							
								 
						
							
								f635cde756 
								
							 
						 
						
							
							
								
								[Glitch] Change new modals to allow vertical scrolling  
							
							... 
							
							
							
							Port de6c9e0fcd 
							
						 
						
							2024-04-06 20:43:43 +02:00  
				
					
						
							
							
								 
						
							
								0f8b33238f 
								
							 
						 
						
							
							
								
								[Glitch] Change icon of severed relationships notifications  
							
							... 
							
							
							
							Port 387c78ddf9 
							
						 
						
							2024-04-06 20:39:07 +02:00  
				
					
						
							
							
								 
						
							
								576c085ea0 
								
							 
						 
						
							
							
								
								[Glitch] Add the role ID to the badge component  
							
							... 
							
							
							
							Port ec1e770fea 
							
						 
						
							2024-04-06 20:35:29 +02:00  
				
					
						
							
							
								 
						
							
								777984faeb 
								
							 
						 
						
							
							
								
								Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-04-06 20:34:07 +02:00  
				
					
						
							
							
								 
						
							
								f14b6f3d99 
								
							 
						 
						
							
							
								
								[Glitch] Fix duplicate translation string for severed relationships  
							
							... 
							
							
							
							Port 885d0faf83 
							
						 
						
							2024-04-06 20:31:09 +02:00  
				
					
						
							
							
								 
						
							
								903dc53522 
								
							 
						 
						
							
							
								
								Merge commit '05eda8d19330a9c27c0cf07de19a87edff269057' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-04-06 20:01:25 +02:00  
				
					
						
							
							
								 
						
							
								375af259a2 
								
							 
						 
						
							
							
								
								[Glitch] Change back button to always appear in advanced web UI  
							
							... 
							
							
							
							Port be52633ee4 
							
						 
						
							2024-04-06 19:55:13 +02:00  
				
					
						
							
							
								 
						
							
								67842ffb22 
								
							 
						 
						
							
							
								
								Merge commit '01464074c91f9b7a720928fc4ee912be3d8002d2' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-04-06 19:54:11 +02:00  
				
					
						
							
							
								 
						
							
								0f966209ca 
								
							 
						 
						
							
							
								
								[Glitch] Add notifications of severed relationships  
							
							... 
							
							
							
							Port 44bf7b8128 
							
						 
						
							2024-04-06 19:38:57 +02:00  
				
					
						
							
							
								 
						
							
								f2b23aa5f3 
								
							 
						 
						
							
							
								
								Merge commit '954b470fbce3fbe4b9b42992b03425fa24d6a2ad' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `config/navigation.rb`:
  Upstream added a navigation item while glitch-soc had an additional one.
  Ported upstream changes. 
							
						 
						
							2024-04-06 19:35:21 +02:00  
				
					
						
							
							
								 
						
							
								9451997fa8 
								
							 
						 
						
							
							
								
								Refactor notifications code to reduce differences with upstream ( #2692 )  
							
							... 
							
							
							
							* Merge back `Follow` notification component
* Merge back part of `FollowRequestContainer` notification container
* Reduce differences with upstream in the `mention` case
* Reduce differences with upstream in the `favourite` case
* Reduce differences with upstream in the `reblog` case
* Reduce differences with upstream in the `status` case
* Reduce differences with upstream in the `update` case
* Reduce differences with upstream in the `poll` case
* Merge back `AdminSignup` notification component
* Merge back `AdminReport` notification container 
							
						 
						
							2024-04-06 19:34:30 +02:00  
				
					
						
							
							
								 
						
							
								8a64406d34 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #2668 )  
							
							... 
							
							
							
							* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-04-06 18:18:06 +02:00  
				
					
						
							
							
								 
						
							
								6ac90d4c5d 
								
							 
						 
						
							
							
								
								Add tests for our number formatting function ( #29852 )  
							
							
							
						 
						
							2024-04-05 08:06:31 +00:00  
				
					
						
							
							
								 
						
							
								906a399634 
								
							 
						 
						
							
							
								
								Fix wrong extension for a test file ( #29853 )  
							
							
							
						 
						
							2024-04-05 07:57:44 +00:00  
				
					
						
							
							
								 
						
							
								1c87cb8019 
								
							 
						 
						
							
							
								
								Add purple border to active compose field search inputs ( #29839 )  
							
							
							
						 
						
							2024-04-04 11:51:06 +00:00  
				
					
						
							
							
								 
						
							
								c6da3ee828 
								
							 
						 
						
							
							
								
								Makes the star icon rotate around its actual centre axis ( #29844 )  
							
							
							
						 
						
							2024-04-03 21:10:02 +00:00  
				
					
						
							
							
								 
						
							
								37d984b8bf 
								
							 
						 
						
							
							
								
								Update eslint (non-major) ( #29820 )  
							
							... 
							
							
							
							Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com> 
							
						 
						
							2024-04-03 18:05:39 +00:00  
				
					
						
							
							
								 
						
							
								e284417349 
								
							 
						 
						
							
							
								
								Fix blue border on emoji/language search in Safari & Chrome ( #29832 )  
							
							
							
						 
						
							2024-04-03 15:19:10 +00:00  
				
					
						
							
							
								 
						
							
								5d67247061 
								
							 
						 
						
							
							
								
								Fix language and emoji search field background colors on light theme ( #29828 )  
							
							
							
						 
						
							2024-04-03 14:22:50 +00:00  
				
					
						
							
							
								 
						
							
								56d13069cd 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29836 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-03 09:04:29 +00:00  
				
					
						
							
							
								 
						
							
								0b9d4103cb 
								
							 
						 
						
							
							
								
								Fix contrast in notification request badge ( #29826 )  
							
							
							
						 
						
							2024-04-02 14:05:46 +00:00  
				
					
						
							
							
								 
						
							
								b4d991adaa 
								
							 
						 
						
							
							
								
								Use integers and not numbers in notification policy API counters ( #29810 )  
							
							
							
						 
						
							2024-04-02 10:06:26 +00:00  
				
					
						
							
							
								 
						
							
								e47a3d00fe 
								
							 
						 
						
							
							
								
								Add API types for status and related objects ( #29792 )  
							
							
							
						 
						
							2024-04-02 10:03:33 +00:00  
				
					
						
							
							
								 
						
							
								07635228e2 
								
							 
						 
						
							
							
								
								Fix Redux Middleware types ( #29800 )  
							
							
							
						 
						
							2024-04-02 09:56:03 +00:00  
				
					
						
							
							
								 
						
							
								c717747603 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29812 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-04-02 09:26:06 +00:00  
				
					
						
							
							
								 
						
							
								fa9574086d 
								
							 
						 
						
							
							
								
								Fix search box color on light theme ( #29808 )  
							
							
							
						 
						
							2024-04-02 09:15:31 +00:00  
				
					
						
							
							
								 
						
							
								90eb4a5d01 
								
							 
						 
						
							
							
								
								Fix light theme header on mobile ( #29809 )  
							
							
							
						 
						
							2024-03-29 21:03:30 +00:00  
				
					
						
							
							
								 
						
							
								430da03160 
								
							 
						 
						
							
							
								
								Fix background tint in single column light theme ( #29803 )  
							
							
							
						 
						
							2024-03-29 17:16:51 +00:00  
				
					
						
							
							
								 
						
							
								69e5771881 
								
							 
						 
						
							
							
								
								Handle `createAppAsyncThunk` rejected actions in the errors middleware ( #29791 )  
							
							
							
						 
						
							2024-03-29 13:57:39 +00:00  
				
					
						
							
							
								 
						
							
								f96648d41c 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29796 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-29 13:35:50 +00:00  
				
					
						
							
							
								 
						
							
								67442f9039 
								
							 
						 
						
							
							
								
								Remove global `boosts` state and convert boosts modal to Typescript ( #29774 )  
							
							
							
						 
						
							2024-03-28 15:33:15 +00:00  
				
					
						
							
							
								 
						
							
								8a498f4e65 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29785 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-28 14:48:09 +00:00  
				
					
						
							
							
								 
						
							
								4f068d4fcc 
								
							 
						 
						
							
							
								
								Fix logo pushing header buttons out of view on certain conditions in mobile layout ( #29787 )  
							
							
							
						 
						
							2024-03-28 14:00:57 +00:00  
				
					
						
							
							
								 
						
							
								961bb84e4c 
								
							 
						 
						
							
							
								
								Fix `<RelativeTimestamp>` types ( #29781 )  
							
							
							
						 
						
							2024-03-28 10:07:01 +00:00  
				
					
						
							
							
								 
						
							
								d088964761 
								
							 
						 
						
							
							
								
								Fix props for `<Button>` ( #29780 )  
							
							
							
						 
						
							2024-03-28 10:06:25 +00:00  
				
					
						
							
							
								 
						
							
								f2fd1da23f 
								
							 
						 
						
							
							
								
								Fix PropTypes for some record objects ( #29786 )  
							
							
							
						 
						
							2024-03-28 10:05:16 +00:00  
				
					
						
							
							
								 
						
							
								1025fff6b9 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29772 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-27 21:19:03 +00:00  
				
					
						
							
							
								 
						
							
								c913e2f3e5 
								
							 
						 
						
							
							
								
								Fix language picker and privacy picker not having a backdrop filter ( #29779 )  
							
							
							
						 
						
							2024-03-27 16:32:00 +00:00  
				
					
						
							
							
								 
						
							
								b9982ce578 
								
							 
						 
						
							
							
								
								Fix notifications marker fetch ( #29777 )  
							
							
							
						 
						
							2024-03-27 15:49:02 +00:00  
				
					
						
							
							
								 
						
							
								9fbe8d3a0c 
								
							 
						 
						
							
							
								
								Rewrite PIP state in Typescript ( #27645 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-03-27 15:19:33 +00:00  
				
					
						
							
							
								 
						
							
								27d014a7fa 
								
							 
						 
						
							
							
								
								Rewrite markers reducer in Typescript ( #27644 )  
							
							
							
						 
						
							2024-03-27 12:47:09 +00:00  
				
					
						
							
							
								 
						
							
								b2d841ce9a 
								
							 
						 
						
							
							
								
								Fix column borders disappearing in advanced interface on low width viewports ( #29763 )  
							
							
							
						 
						
							2024-03-26 23:14:11 +00:00  
				
					
						
							
							
								 
						
							
								b3d970bdb8 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29756 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-26 09:49:19 +00:00  
				
					
						
							
							
								 
						
							
								02ea161506 
								
							 
						 
						
							
							
								
								Support "system" theme setting (light/dark theme depending on user system preference) ( #29748 )  
							
							... 
							
							
							
							Co-authored-by: Nishiki Liu <hello@nshki.com> 
							
						 
						
							2024-03-26 09:25:49 +00:00  
				
					
						
							
							
								 
						
							
								0cea7a623b 
								
							 
						 
						
							
							
								
								Fix background and icon on notification requests in web UI ( #29706 )  
							
							
							
						 
						
							2024-03-25 13:39:06 +00:00  
				
					
						
							
							
								 
						
							
								29f9dc742e 
								
							 
						 
						
							
							
								
								Change design of notification about lost connections in web UI ( #29731 )  
							
							
							
						 
						
							2024-03-25 13:27:38 +00:00  
				
					
						
							
							
								 
						
							
								dd061291b1 
								
							 
						 
						
							
							
								
								Change out-of-band hashtags design in web UI ( #29732 )  
							
							
							
						 
						
							2024-03-25 12:45:00 +00:00  
				
					
						
							
							
								 
						
							
								799e3be9bd 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29726 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-25 11:07:38 +00:00  
				
					
						
							
							
								 
						
							
								8e7e86ee35 
								
							 
						 
						
							
							
								
								Add ability to reorder uploaded media before posting in web UI ( #28456 )  
							
							
							
						 
						
							2024-03-25 10:29:55 +00:00  
				
					
						
							
							
								 
						
							
								6c381f20b1 
								
							 
						 
						
							
							
								
								Restore advanced filter bar setting ( #29737 )  
							
							
							
						 
						
							2024-03-24 14:17:06 +00:00  
				
					
						
							
							
								 
						
							
								37ca59815c 
								
							 
						 
						
							
							
								
								Remove setting for unfollow confirmation modal, and make it unconditional ( #29373 )  
							
							
							
						 
						
							2024-03-22 16:24:04 +00:00  
				
					
						
							
							
								 
						
							
								de6c9e0fcd 
								
							 
						 
						
							
							
								
								Change new modals to allow vertical scrolling ( #29644 )  
							
							
							
						 
						
							2024-03-22 16:21:50 +00:00  
				
					
						
							
							
								 
						
							
								387c78ddf9 
								
							 
						 
						
							
							
								
								Change icon of severed relationships notifications ( #29712 )  
							
							
							
						 
						
							2024-03-22 15:45:04 +00:00  
				
					
						
							
							
								 
						
							
								dfa43707eb 
								
							 
						 
						
							
							
								
								Change `AccountRelationshipSeveranceEvent` model to store lost followers and following counts separately ( #29714 )  
							
							
							
						 
						
							2024-03-22 15:44:31 +00:00  
				
					
						
							
							
								 
						
							
								5db5fa879b 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29708 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-22 14:50:03 +00:00  
				
					
						
							
							
								 
						
							
								ec1e770fea 
								
							 
						 
						
							
							
								
								Add the role ID to the badge component ( #29707 )  
							
							
							
						 
						
							2024-03-22 11:59:35 +00:00  
				
					
						
							
							
								 
						
							
								885d0faf83 
								
							 
						 
						
							
							
								
								Fix duplicate translation string for severed relationships ( #29689 )  
							
							
							
						 
						
							2024-03-21 10:06:21 +00:00  
				
					
						
							
							
								 
						
							
								c007dd5dd2 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29687 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-21 09:57:45 +00:00  
				
					
						
							
							
								 
						
							
								49089817b0 
								
							 
						 
						
							
							
								
								[Glitch] Fix “Explore” icon in navigation bar not being filled when selected  
							
							... 
							
							
							
							Port 3211e960ac 
							
						 
						
							2024-03-20 18:33:00 +01:00  
				
					
						
							
							
								 
						
							
								c0aade79b0 
								
							 
						 
						
							
							
								
								Merge commit '8a1423a47425dd67615e94bdfd13d64b53676da4' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-20 18:31:09 +01:00  
				
					
						
							
							
								 
						
							
								be52633ee4 
								
							 
						 
						
							
							
								
								Change back button to always appear in advanced web UI ( #29669 )  
							
							
							
						 
						
							2024-03-20 17:21:03 +00:00  
				
					
						
							
							
								 
						
							
								44bf7b8128 
								
							 
						 
						
							
							
								
								Add notifications of severed relationships ( #27511 )  
							
							
							
						 
						
							2024-03-20 15:37:21 +00:00  
				
					
						
							
							
								 
						
							
								3211e960ac 
								
							 
						 
						
							
							
								
								Fix “Explore” icon in navigation bar not being filled when selected ( #29649 )  
							
							
							
						 
						
							2024-03-20 13:31:31 +00:00  
				
					
						
							
							
								 
						
							
								df777776f1 
								
							 
						 
						
							
							
								
								[Glitch] Fix blockquote color in reply indicator  
							
							... 
							
							
							
							Port 50fd94f481 
							
						 
						
							2024-03-20 12:32:37 +01:00  
				
					
						
							
							
								 
						
							
								5e039b96c3 
								
							 
						 
						
							
							
								
								[Glitch] Fix emoji picker placement on limited-height viewports  
							
							... 
							
							
							
							Port 94f7ae192b 
							
						 
						
							2024-03-20 12:31:45 +01:00  
				
					
						
							
							
								 
						
							
								72baa1e5c3 
								
							 
						 
						
							
							
								
								[Glitch] Fix emoji picker dropdown background and borders  
							
							... 
							
							
							
							Port e36e7ea243 
							
						 
						
							2024-03-20 12:31:12 +01:00  
				
					
						
							
							
								 
						
							
								100cb46608 
								
							 
						 
						
							
							
								
								[Glitch] Fix icon and styling in browser notifications banner  
							
							... 
							
							
							
							Port a583317df6 
							
						 
						
							2024-03-20 12:30:45 +01:00  
				
					
						
							
							
								 
						
							
								eb3aed9545 
								
							 
						 
						
							
							
								
								Merge commit '50fd94f481cf23a81662140afe99df2fbf1149be' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `yarn.lock`:
  Upstream touched a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did. 
							
						 
						
							2024-03-20 12:27:52 +01:00  
				
					
						
							
							
								 
						
							
								50fd94f481 
								
							 
						 
						
							
							
								
								Fix blockquote color in reply indicator ( #29659 )  
							
							
							
						 
						
							2024-03-20 11:20:23 +00:00  
				
					
						
							
							
								 
						
							
								94f7ae192b 
								
							 
						 
						
							
							
								
								Fix emoji picker placement on limited-height viewports ( #29651 )  
							
							
							
						 
						
							2024-03-20 11:07:02 +00:00  
				
					
						
							
							
								 
						
							
								e36e7ea243 
								
							 
						 
						
							
							
								
								Fix emoji picker dropdown background and borders ( #29653 )  
							
							
							
						 
						
							2024-03-20 11:06:50 +00:00  
				
					
						
							
							
								 
						
							
								a583317df6 
								
							 
						 
						
							
							
								
								Fix icon and styling in browser notifications banner ( #29658 )  
							
							
							
						 
						
							2024-03-20 11:06:44 +00:00  
				
					
						
							
							
								 
						
							
								6c0b1a41a1 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29657 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-20 08:39:42 +00:00  
				
					
						
							
							
								 
						
							
								d0dfcc9f3a 
								
							 
						 
						
							
							
								
								Fix build issue with glitch-soc's theming system  
							
							
							
						 
						
							2024-03-19 19:58:04 +01:00  
				
					
						
							
							
								 
						
							
								da2bb672ce 
								
							 
						 
						
							
							
								
								[Glitch] Change filtered icon from “archive” to “inventory 2”  
							
							... 
							
							
							
							Port ffc5be4820 
							
						 
						
							2024-03-19 19:35:17 +01:00  
				
					
						
							
							
								 
						
							
								8b3bd12def 
								
							 
						 
						
							
							
								
								[Glitch] Slightly increase font weight of favorite/boost numbers in detailed statuses  
							
							... 
							
							
							
							Port bd06963c16 
							
						 
						
							2024-03-19 19:35:17 +01:00  
				
					
						
							
							
								 
						
							
								885a4c73cb 
								
							 
						 
						
							
							
								
								[Glitch] Add badge on account card in report moderation interface when account is already suspended  
							
							... 
							
							
							
							Port cf08a438e7 
							
						 
						
							2024-03-19 19:35:17 +01:00  
				
					
						
							
							
								 
						
							
								ccf2f2cb75 
								
							 
						 
						
							
							
								
								[Glitch] Fix mute for 30 days  
							
							... 
							
							
							
							Port 39839baec3 
							
						 
						
							2024-03-19 19:24:51 +01:00  
				
					
						
							
							
								 
						
							
								d959501ef1 
								
							 
						 
						
							
							
								
								[Glitch] Fix extra separator besides favourite count on private posts  
							
							... 
							
							
							
							Port 726e7ad024 
							
						 
						
							2024-03-19 19:24:34 +01:00  
				
					
						
							
							
								 
						
							
								876aa35350 
								
							 
						 
						
							
							
								
								Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `package.json`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did.
- `yarn.lock`:
  Upstream updated a dependency that is on an adjacent line to a
  glitch-soc-only dependency in that file.
  Updated as upstream did. 
							
						 
						
							2024-03-19 19:21:12 +01:00  
				
					
						
							
							
								 
						
							
								ffc5be4820 
								
							 
						 
						
							
							
								
								Change filtered icon from “archive” to “inventory 2” ( #29652 )  
							
							
							
						 
						
							2024-03-19 15:39:26 +00:00  
				
					
						
							
							
								 
						
							
								bd06963c16 
								
							 
						 
						
							
							
								
								Slightly increase font weight of favorite/boost numbers in detailed statuses ( #29648 )  
							
							
							
						 
						
							2024-03-19 13:39:30 +00:00  
				
					
						
							
							
								 
						
							
								6c68c3c0ce 
								
							 
						 
						
							
							
								
								Introduce `inline_svg` gem, minimal usage, prep for material design icons ( #29612 )  
							
							
							
						 
						
							2024-03-19 09:03:15 +00:00  
				
					
						
							
							
								 
						
							
								4e61bce4e9 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29641 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-19 08:36:52 +00:00  
				
					
						
							
							
								 
						
							
								cf08a438e7 
								
							 
						 
						
							
							
								
								Add badge on account card in report moderation interface when account is already suspended ( #29592 )  
							
							
							
						 
						
							2024-03-19 08:20:53 +00:00  
				
					
						
							
							
								 
						
							
								39839baec3 
								
							 
						 
						
							
							
								
								Fix mute for 30 days ( #29640 )  
							
							
							
						 
						
							2024-03-19 08:18:14 +00:00  
				
					
						
							
							
								 
						
							
								04817e965a 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29623 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-18 08:47:48 +00:00  
				
					
						
							
							
								 
						
							
								726e7ad024 
								
							 
						 
						
							
							
								
								Fix extra separator besides favourite count on private posts ( #29605 )  
							
							
							
						 
						
							2024-03-16 01:11:59 +00:00  
				
					
						
							
							
								 
						
							
								c511e52d1e 
								
							 
						 
						
							
							
								
								[Glitch] Add “Learn more” on block modal to inform of federation caveats  
							
							... 
							
							
							
							Port d702a03a0c 
							
						 
						
							2024-03-15 22:58:16 +01:00  
				
					
						
							
							
								 
						
							
								80fda17868 
								
							 
						 
						
							
							
								
								[Glitch] Change mute, block and domain block confirmations in web UI  
							
							... 
							
							
							
							Port ec19d0a14b 
							
						 
						
							2024-03-15 22:58:01 +01:00  
				
					
						
							
							
								 
						
							
								3beba00c4e 
								
							 
						 
						
							
							
								
								[Glitch] Change Explore icon to compass in advanced interface  
							
							... 
							
							
							
							Port be7a68b095 
							
						 
						
							2024-03-15 22:50:15 +01:00  
				
					
						
							
							
								 
						
							
								b8f476256e 
								
							 
						 
						
							
							
								
								Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-15 22:48:04 +01:00  
				
					
						
							
							
								 
						
							
								7fe848b161 
								
							 
						 
						
							
							
								
								[Glitch] Convert `packs/public.jsx` to Typescript  
							
							... 
							
							
							
							Port c76ae7a5c0 
							
						 
						
							2024-03-15 22:43:36 +01:00  
				
					
						
							
							
								 
						
							
								1b06e4e1b7 
								
							 
						 
						
							
							
								
								Merge commit 'c76ae7a5c0d247264afa896f081db9d1fd278711' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/javascript/packs/public.jsx`:
  In glitch-soc, this file was split across the following files:
  - `app/javascript/packs/public.jsx`
  - `app/javascript/core/embed.js`
  - `app/javascript/core/settings.js`
  Update all those files accordingly, as well as the related `theme.yml` files. 
							
						 
						
							2024-03-15 22:37:55 +01:00  
				
					
						
							
							
								 
						
							
								6ee7a64465 
								
							 
						 
						
							
							
								
								Reduce differences with upstream in “public” pack ( #2680 )  
							
							... 
							
							
							
							* Reduce differences with upstream
* Further reduce pack differences with upstream 
							
						 
						
							2024-03-15 22:21:57 +01:00  
				
					
						
							
							
								 
						
							
								d702a03a0c 
								
							 
						 
						
							
							
								
								Add “Learn more” on block modal to inform of federation caveats ( #29614 )  
							
							
							
						 
						
							2024-03-15 19:09:21 +00:00  
				
					
						
							
							
								 
						
							
								a32f992182 
								
							 
						 
						
							
							
								
								[Glitch] Add domain information to profiles in web UI  
							
							... 
							
							
							
							Port 407287573c 
							
						 
						
							2024-03-15 18:51:41 +01:00  
				
					
						
							
							
								 
						
							
								2c622497c2 
								
							 
						 
						
							
							
								
								Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-15 18:48:39 +01:00  
				
					
						
							
							
								 
						
							
								ec19d0a14b 
								
							 
						 
						
							
							
								
								Change mute, block and domain block confirmations in web UI ( #29576 )  
							
							
							
						 
						
							2024-03-15 17:36:41 +00:00  
				
					
						
							
							
								 
						
							
								be7a68b095 
								
							 
						 
						
							
							
								
								Change Explore icon to compass in advanced interface ( #29610 )  
							
							
							
						 
						
							2024-03-15 16:06:48 +00:00  
				
					
						
							
							
								 
						
							
								c76ae7a5c0 
								
							 
						 
						
							
							
								
								Convert `packs/public.jsx` to Typescript ( #29501 )  
							
							
							
						 
						
							2024-03-15 13:16:45 +00:00  
				
					
						
							
							
								 
						
							
								407287573c 
								
							 
						 
						
							
							
								
								Add domain information to profiles in web UI ( #29602 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2024-03-15 13:08:38 +00:00  
				
					
						
							
							
								 
						
							
								2e49bc97b0 
								
							 
						 
						
							
							
								
								Merge commit '7720c684c5bf54e73e8815defe15473777d1c201' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-15 12:20:32 +01:00  
				
					
						
							
							
								 
						
							
								6865fda593 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29603 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-15 10:02:10 +00:00  
				
					
						
							
							
								 
						
							
								000a900d3b 
								
							 
						 
						
							
							
								
								[Glitch] Fix back button appearing in column header unexpectedly in web UI  
							
							... 
							
							
							
							Port 30483d618f 
							
						 
						
							2024-03-14 17:43:38 +01:00  
				
					
						
							
							
								 
						
							
								84c7b272e1 
								
							 
						 
						
							
							
								
								[Glitch] Fix accounts not getting imported into redux store for some filtered notification types  
							
							... 
							
							
							
							Port 95a5713ff7 
							
						 
						
							2024-03-14 17:43:38 +01:00  
				
					
						
							
							
								 
						
							
								4b2a935c4a 
								
							 
						 
						
							
							
								
								[Glitch] Change design of metadata underneath posts in web UI  
							
							... 
							
							
							
							Port 4991198b70 
							
						 
						
							2024-03-14 17:43:38 +01:00  
				
					
						
							
							
								 
						
							
								042d17ddf1 
								
							 
						 
						
							
							
								
								[Glitch] Fix wrong background color on search results in web UI  
							
							... 
							
							
							
							Port 1e1d97a787 
							
						 
						
							2024-03-14 17:30:46 +01:00  
				
					
						
							
							
								 
						
							
								88f477749c 
								
							 
						 
						
							
							
								
								[Glitch] Use sender's `username` to column title in notification request if it's `display_name` is not set  
							
							... 
							
							
							
							Port 3156d04ec1 
							
						 
						
							2024-03-14 17:29:38 +01:00  
				
					
						
							
							
								 
						
							
								e91ede5be6 
								
							 
						 
						
							
							
								
								Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2024-03-14 17:27:16 +01:00  
				
					
						
							
							
								 
						
							
								30483d618f 
								
							 
						 
						
							
							
								
								Fix back button appearing in column header unexpectedly in web UI ( #29551 )  
							
							
							
						 
						
							2024-03-14 10:01:55 +00:00  
				
					
						
							
							
								 
						
							
								95a5713ff7 
								
							 
						 
						
							
							
								
								Fix accounts not getting imported into redux store for some filtered notification types ( #29588 )  
							
							
							
						 
						
							2024-03-14 09:34:36 +00:00  
				
					
						
							
							
								 
						
							
								4991198b70 
								
							 
						 
						
							
							
								
								Change design of metadata underneath posts in web UI ( #29585 )  
							
							
							
						 
						
							2024-03-14 09:18:24 +00:00  
				
					
						
							
							
								 
						
							
								1e1d97a787 
								
							 
						 
						
							
							
								
								Fix wrong background color on search results in web UI ( #29584 )  
							
							
							
						 
						
							2024-03-14 09:07:29 +00:00  
				
					
						
							
							
								 
						
							
								5aea35de13 
								
							 
						 
						
							
							
								
								New Crowdin Translations (automated) ( #29587 )  
							
							... 
							
							
							
							Co-authored-by: GitHub Actions <noreply@github.com> 
							
						 
						
							2024-03-14 09:00:42 +00:00  
				
					
						
							
							
								 
						
							
								3156d04ec1 
								
							 
						 
						
							
							
								
								Use sender's `username` to column title in notification request if it's `display_name` is not set ( #29575 )  
							
							
							
						 
						
							2024-03-14 08:58:44 +00:00  
				
					
						
							
							
								 
						
							
								369e728536 
								
							 
						 
						
							
							
								
								Fix collapsed posts background color  
							
							
							
						 
						
							2024-03-13 20:17:58 +01:00  
				
					
						
							
							
								 
						
							
								e7b49181af 
								
							 
						 
						
							
							
								
								[Glitch] Hide media by default in notification requests  
							
							... 
							
							
							
							Port a32a126cac 
							
						 
						
							2024-03-13 20:15:23 +01:00  
				
					
						
							
							
								 
						
							
								65ca37bbaa 
								
							 
						 
						
							
							
								
								Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Conflict due to glitch-soc having factored the file differently.
  Ported upstream's changes. 
							
						 
						
							2024-03-13 20:14:18 +01:00  
				
					
						
							
							
								 
						
							
								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