5de49e74d4 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-05 12:01:26 +02:00  
				
					
						
							
							
								 
						
							
								000b835803 
								
							 
						 
						
							
							
								
								Add canonical link tags in web UI ( #25715 )  
							
							
							
						 
						
							2023-07-05 11:25:27 +02:00  
				
					
						
							
							
								 
						
							
								b7910bc751 
								
							 
						 
						
							
							
								
								Add button to see results for polls in web UI ( #25726 )  
							
							
							
						 
						
							2023-07-05 10:32:04 +02:00  
				
					
						
							
							
								 
						
							
								182fd93a07 
								
							 
						 
						
							
							
								
								fix read more button overlapping thread line bug ( #25706 )  
							
							
							
						 
						
							2023-07-04 14:57:46 +02:00  
				
					
						
							
							
								 
						
							
								6268188543 
								
							 
						 
						
							
							
								
								Fix local live feeds does not expand ( #25694 )  
							
							
							
						 
						
							2023-07-04 00:37:57 +02:00  
				
					
						
							
							
								 
						
							
								d9a5c1acfa 
								
							 
						 
						
							
							
								
								Add at-symbol prepended to mention span title ( #25684 )  
							
							... 
							
							
							
							Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com> 
							
						 
						
							2023-07-03 22:58:10 +02:00  
				
					
						
							
							
								 
						
							
								54a10523e2 
								
							 
						 
						
							
							
								
								Change labels of live feeds tabs in web UI ( #25683 )  
							
							
							
						 
						
							2023-07-03 22:57:18 +02:00  
				
					
						
							
							
								 
						
							
								69e124e2ed 
								
							 
						 
						
							
							
								
								Fix regression of icon button colors in web UI ( #25679 )  
							
							
							
						 
						
							2023-07-03 16:51:04 +02:00  
				
					
						
							
							
								 
						
							
								ed15893eed 
								
							 
						 
						
							
							
								
								Add regex filter back to firehose ( #2266 )  
							
							... 
							
							
							
							* Add regex filter back to firehose
The regex filter will apply to all tabs and not be automatically applied when pinned.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Keep regex when pinned
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-03 15:41:50 +02:00  
				
					
						
							
							
								 
						
							
								54cb679c19 
								
							 
						 
						
							
							
								
								Change button colors to increase hover/focus contrast and consistency ( #25677 )  
							
							
							
						 
						
							2023-07-03 11:32:31 +02:00  
				
					
						
							
							
								 
						
							
								b422b5eebd 
								
							 
						 
						
							
							
								
								Fix showing local only toots in "All" ( #2265 )  
							
							... 
							
							
							
							* Fix warnings about missing dependency in hooks
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add `allowLocalOnly` to timelineId
Without this local-only toots will never be loaded.
feedType is checked to be public to not show local-only toots in the "Remote" tab.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> 
							
						 
						
							2023-07-03 07:00:38 +02:00  
				
					
						
							
							
								 
						
							
								9f3c3f5209 
								
							 
						 
						
							
							
								
								Show local-only posts in “All” by default, and add back option to toggle it  
							
							
							
						 
						
							2023-07-02 20:28:02 +02:00  
				
					
						
							
							
								 
						
							
								587ddc2c7f 
								
							 
						 
						
							
							
								
								[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI  
							
							... 
							
							
							
							Port 5b46345459 
							
						 
						
							2023-07-02 12:00:03 +02:00  
				
					
						
							
							
								 
						
							
								c49e339c89 
								
							 
						 
						
							
							
								
								[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI  
							
							... 
							
							
							
							Port 0512537eb6 
							
						 
						
							2023-07-02 11:59:31 +02:00  
				
					
						
							
							
								 
						
							
								7cc2c1be29 
								
							 
						 
						
							
							
								
								[Glitch] Change local and federated timelines to be in a single firehose column  
							
							... 
							
							
							
							Port cea9db5a0b 
							
						 
						
							2023-07-02 11:58:51 +02:00  
				
					
						
							
							
								 
						
							
								eb1cb8224a 
								
							 
						 
						
							
							
								
								[Glitch] Use an Immutable Record as the root state  
							
							... 
							
							
							
							Port 78ba12f0bf 
							
						 
						
							2023-07-02 11:55:34 +02:00  
				
					
						
							
							
								 
						
							
								2ba4773ebe 
								
							 
						 
						
							
							
								
								[Glitch] Fix onboarding prompt being displayed because of disconnection gaps  
							
							... 
							
							
							
							Port 9934949fc4 
							
						 
						
							2023-07-02 11:55:08 +02:00  
				
					
						
							
							
								 
						
							
								b75aa6b819 
								
							 
						 
						
							
							
								
								[Glitch] Remove the search button from UI header when logged out  
							
							... 
							
							
							
							Port 285a691936 
							
						 
						
							2023-07-02 11:54:47 +02:00  
				
					
						
							
							
								 
						
							
								44e98a2740 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-07-02 11:49:08 +02:00  
				
					
						
							
							
								 
						
							
								5b46345459 
								
							 
						 
						
							
							
								
								Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )  
							
							
							
						 
						
							2023-07-02 11:12:16 +02:00  
				
					
						
							
							
								 
						
							
								0512537eb6 
								
							 
						 
						
							
							
								
								Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )  
							
							
							
						 
						
							2023-07-02 10:39:55 +02:00  
				
					
						
							
							
								 
						
							
								cea9db5a0b 
								
							 
						 
						
							
							
								
								Change local and federated timelines to be in a single firehose column ( #25641 )  
							
							
							
						 
						
							2023-07-02 00:05:10 +02:00  
				
					
						
							
							
								 
						
							
								78ba12f0bf 
								
							 
						 
						
							
							
								
								Use an Immutable Record as the root state ( #25584 )  
							
							
							
						 
						
							2023-06-30 17:03:25 +02:00  
				
					
						
							
							
								 
						
							
								9934949fc4 
								
							 
						 
						
							
							
								
								Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )  
							
							
							
						 
						
							2023-06-30 16:32:12 +02:00  
				
					
						
							
							
								 
						
							
								285a691936 
								
							 
						 
						
							
							
								
								Remove the search button from UI header when logged out ( #25631 )  
							
							
							
						 
						
							2023-06-28 14:57:51 +02:00  
				
					
						
							
							
								 
						
							
								c43cfd2406 
								
							 
						 
						
							
							
								
								[Glitch] Improve dismissable banner buttons when they dont fit on 1 line  
							
							... 
							
							
							
							Port ae30a60b1f 
							
						 
						
							2023-06-27 13:25:21 +02:00  
				
					
						
							
							
								 
						
							
								4faa4eb3c4 
								
							 
						 
						
							
							
								
								[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI  
							
							... 
							
							
							
							Port 65aa04647a 
							
						 
						
							2023-06-27 13:21:55 +02:00  
				
					
						
							
							
								 
						
							
								2f996375e5 
								
							 
						 
						
							
							
								
								[Glitch] Fix search not being easily findable on smaller screens in web UI  
							
							... 
							
							
							
							Port 2b78c07ef1 
							
						 
						
							2023-06-27 13:21:14 +02:00  
				
					
						
							
							
								 
						
							
								80a5c16ae1 
								
							 
						 
						
							
							
								
								Merge branch 'main' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2023-06-27 13:15:41 +02:00  
				
					
						
							
							
								 
						
							
								ae30a60b1f 
								
							 
						 
						
							
							
								
								Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )  
							
							... 
							
							
							
							Co-authored-by: Claire <claire.github-309c@sitedethib.com> 
							
						 
						
							2023-06-26 12:31:48 +02:00  
				
					
						
							
							
								 
						
							
								ed96e28c9e 
								
							 
						 
						
							
							
								
								Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )  
							
							
							
						 
						
							2023-06-26 12:30:35 +02:00  
				
					
						
							
							
								 
						
							
								7b024baf50 
								
							 
						 
						
							
							
								
								Change header backgrounds to use fewer different colors in web UI ( #25577 )  
							
							
							
						 
						
							2023-06-26 05:27:07 +02:00  
				
					
						
							
							
								 
						
							
								65aa04647a 
								
							 
						 
						
							
							
								
								Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )  
							
							
							
						 
						
							2023-06-26 05:26:54 +02:00  
				
					
						
							
							
								 
						
							
								2b78c07ef1 
								
							 
						 
						
							
							
								
								Fix search not being easily findable on smaller screens in web UI ( #25576 )  
							
							
							
						 
						
							2023-06-26 05:26:41 +02:00  
				
					
						
							
							
								 
						
							
								5def74a436 
								
							 
						 
						
							
							
								
								[Glitch] Remove unique accounts condition from Home onboarding prompt  
							
							... 
							
							
							
							Port 0842a68532 
							
						 
						
							2023-06-25 17:40:01 +02:00  
				
					
						
							
							
								 
						
							
								6fb34258a4 
								
							 
						 
						
							
							
								
								[Glitch] Add onboarding prompt when home feed too slow in web UI  
							
							... 
							
							
							
							Port 00ec43914a 
							
						 
						
							2023-06-25 17:40:01 +02:00  
				
					
						
							
							
								 
						
							
								7d160d2272 
								
							 
						 
						
							
							
								
								[Glitch] Fix j/k keyboard shortcuts on some status lists  
							
							... 
							
							
							
							Port a8c1c8bd37 
							
						 
						
							2023-06-25 17:40:01 +02:00  
				
					
						
							
							
								 
						
							
								222713a768 
								
							 
						 
						
							
							
								
								[Glitch] Fix custom signup URL may not loaded  
							
							... 
							
							
							
							Port 8d2c26834f 
							
						 
						
							2023-06-25 14:27:46 +02:00  
				
					
						
							
							
								 
						
							
								6fe345c383 
								
							 
						 
						
							
							
								
								[Glitch] Change emoji picker icon  
							
							... 
							
							
							
							Port 69db507924 
							
						 
						
							2023-06-25 14:27:46 +02:00  
				
					
						
							
							
								 
						
							
								c71fc42f4e 
								
							 
						 
						
							
							
								
								[Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS  
							
							... 
							
							
							
							Port 804488d38e 
							
						 
						
							2023-06-25 14:27:46 +02:00  
				
					
						
							
							
								 
						
							
								178e151019 
								
							 
						 
						
							
							
								
								Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars. 
							
						 
						
							2023-06-25 14:27:38 +02:00  
				
					
						
							
							
								 
						
							
								55e7c08a83 
								
							 
						 
						
							
							
								
								Fix verified badge in account lists potentially including rel="me" links ( #25561 )  
							
							
							
						 
						
							2023-06-24 17:24:31 +02:00  
				
					
						
							
							
								 
						
							
								a985d587e1 
								
							 
						 
						
							
							
								
								Change labels and styles on the onboarding screen in web UI ( #25559 )  
							
							
							
						 
						
							2023-06-23 16:34:27 +02:00  
				
					
						
							
							
								 
						
							
								0842a68532 
								
							 
						 
						
							
							
								
								Remove unique accounts condition from Home onboarding prompt ( #25556 )  
							
							
							
						 
						
							2023-06-23 14:44:54 +02:00  
				
					
						
							
							
								 
						
							
								00ec43914a 
								
							 
						 
						
							
							
								
								Add onboarding prompt when home feed too slow in web UI ( #25267 )  
							
							
							
						 
						
							2023-06-22 23:48:40 +02:00  
				
					
						
							
							
								 
						
							
								a8c1c8bd37 
								
							 
						 
						
							
							
								
								Fix j/k keyboard shortcuts on some status lists ( #25554 )  
							
							
							
						 
						
							2023-06-22 17:54:43 +02:00  
				
					
						
							
							
								 
						
							
								8d2c26834f 
								
							 
						 
						
							
							
								
								Fix custom signup URL may not loaded ( #25531 )  
							
							
							
						 
						
							2023-06-22 12:10:49 +02:00  
				
					
						
							
							
								 
						
							
								69db507924 
								
							 
						 
						
							
							
								
								Change emoji picker icon ( #25479 )  
							
							
							
						 
						
							2023-06-21 17:58:00 +02:00  
				
					
						
							
							
								 
						
							
								804488d38e 
								
							 
						 
						
							
							
								
								Rewrite `<AutosuggestHashtag />` as FC and TS ( #25481 )  
							
							
							
						 
						
							2023-06-19 14:11:46 +02:00  
				
					
						
							
							
								 
						
							
								3b04e39534 
								
							 
						 
						
							
							
								
								[Glitch] Fix non-interactive upload container being given a `button` role and tabIndex  
							
							... 
							
							
							
							Port c9d06d10d4 
							
						 
						
							2023-06-18 14:10:49 +02:00