ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a7a6563f22 
								
							 
						 
						
							
							
								
								Merge pull request  #1179  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-07-29 23:37:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ce25139d5d 
								
							 
						 
						
							
							
								
								Fix crash in /web/lists  
							
							... 
							
							
							
							Fixes  #1181  
						
							2019-07-29 00:34:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a71d66ab0e 
								
							 
						 
						
							
							
								
								[Glitch] Add search results pagination to web UI ( #11409 )  
							
							... 
							
							
							
							Port 5119a0608d 
							
						 
						
							2019-07-28 17:10:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1c3117f682 
								
							 
						 
						
							
							
								
								[Glitch] Change contrast of status links that are not mentions nor hashtags  
							
							... 
							
							
							
							Port 6701b9329d 
							
						 
						
							2019-07-28 16:47:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								16b5fe3ac3 
								
							 
						 
						
							
							
								
								[Glitch] Change account domain block to clear out notifications and follows  
							
							... 
							
							
							
							Port 93a6ab5a32 
							
						 
						
							2019-07-28 16:45:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								6c7a3268c9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-07-28 16:28:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								450b8a70a5 
								
							 
						 
						
							
							
								
								Add autosuggestions for hashtags ( #11422 )  
							
							
							
						 
						
							2019-07-28 14:37:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								13b0943e36 
								
							 
						 
						
							
							
								
								Fix animate on hover in poll options without CW ( #11404 )  
							
							
							
						 
						
							2019-07-28 13:48:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6701b9329d 
								
							 
						 
						
							
							
								
								Change contrast of status links that are not mentions nor hashtags ( #11406 )  
							
							
							
						 
						
							2019-07-28 06:00:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5e0ccb3020 
								
							 
						 
						
							
							
								
								Fix tabs bar scrolling along with content on mobile ( #11418 )  
							
							
							
						 
						
							2019-07-27 19:25:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5119a0608d 
								
							 
						 
						
							
							
								
								Add search results pagination to web UI ( #11409 )  
							
							... 
							
							
							
							* Add search results pagination to web UI
Fix  #10737 
* Fix code style issue 
							
						 
						
							2019-07-27 05:49:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								93a6ab5a32 
								
							 
						 
						
							
							
								
								Change account domain block to clear out notifications and follows ( #11393 )  
							
							
							
						 
						
							2019-07-25 04:17:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								df7b27753c 
								
							 
						 
						
							
							
								
								Fix links in status media having their title rewritten  
							
							
							
						 
						
							2019-07-24 21:46:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								124a1d3880 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-07-24 16:23:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bf93e0c7c0 
								
							 
						 
						
							
							
								
								Handle animated emoji on mouse hover in CWs and poll options  
							
							
							
						 
						
							2019-07-23 16:24:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								b01e5e372f 
								
							 
						 
						
							
							
								
								[Glitch] Play animated custom emoji on hover  
							
							... 
							
							
							
							Port 99b3dd5b00 
							
						 
						
							2019-07-23 16:24:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1635e401b6 
								
							 
						 
						
							
							
								
								Fix scrolling in single-column mode on Chrome ( #11395 )  
							
							... 
							
							
							
							Fixes  #11389  
						
							2019-07-23 15:47:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								09a68ce895 
								
							 
						 
						
							
							
								
								Refactor DisplayName component to make it closer to upstream  
							
							
							
						 
						
							2019-07-23 10:51:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4eb0c50699 
								
							 
						 
						
							
							
								
								[Glitch] Display custom emoji in bio field names  
							
							... 
							
							
							
							Port 2582701b72 
							
						 
						
							2019-07-23 10:51:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								579ccb0bb9 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb 
							
						 
						
							2019-07-23 10:51:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6be7b414e2 
								
							 
						 
						
							
							
								
								Change unconfirmed user login behaviour ( #11375 )  
							
							... 
							
							
							
							Allow access to account settings, 2FA, authorized applications, and
account deletions to unconfirmed and pending users, as well as
users who had their accounts disabled. Suspended users cannot update
their e-mail or password or delete their account.
Display account status on account settings page, for example, when
an account is frozen, limited, unconfirmed or pending review.
After sign up, login users straight away and show a simple page that
tells them the status of their account with links to account settings
and logout, to reduce onboarding friction and allow users to correct
wrongly typed e-mail addresses.
Move the final sign-up step of SSO integrations to be the same
as above to reduce code duplication. 
							
						 
						
							2019-07-22 10:48:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f447eef7cd 
								
							 
						 
						
							
							
								
								Clean up redundant shouldUpdateScroll definitions  
							
							
							
						 
						
							2019-07-21 20:57:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								06990c0ece 
								
							 
						 
						
							
							
								
								[Glitch] Fix mutes, blocks, domain blocks and follow requests not paginating  
							
							... 
							
							
							
							Port 8ff757ed6a 
							
						 
						
							2019-07-21 20:57:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								9b58e25df5 
								
							 
						 
						
							
							
								
								[Glitch] Fix followers and followings on account profiles  
							
							... 
							
							
							
							Partial fix from 513f59726a 
							
						 
						
							2019-07-21 20:57:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakub Mendyk 
								
							 
						 
						
							
							
							
							
								
							
							
								1d58c95a8b 
								
							 
						 
						
							
							
								
								[Glitch] Fix followers/follows layout issues from  #8418  
							
							... 
							
							
							
							Port 816384cf32 
							
						 
						
							2019-07-21 20:57:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b67c436220 
								
							 
						 
						
							
							
								
								Add empty column message to bookmarks column  
							
							
							
						 
						
							2019-07-21 20:57:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jakub Mendyk 
								
							 
						 
						
							
							
							
							
								
							
							
								be07e0038c 
								
							 
						 
						
							
							
								
								[Glitch] Add messages informing that collections are empty  
							
							... 
							
							
							
							Port 6fae7f6a04 
							
						 
						
							2019-07-21 20:57:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ee7254e8eb 
								
							 
						 
						
							
							
								
								Fix boost to original audience not working on mobile ( #11371 )  
							
							
							
						 
						
							2019-07-21 18:11:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								99b3dd5b00 
								
							 
						 
						
							
							
								
								Play animated custom emoji on hover ( #11348 )  
							
							... 
							
							
							
							* Play animated custom emoji on hover in status
* Play animated custom emoji on hover in display names
* Play animated custom emoji on hover in bios/bio fields
* Add support for animation on hover on public pages emojis too
* Fix tests
* Code style cleanup 
							
						 
						
							2019-07-21 18:10:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2582701b72 
								
							 
						 
						
							
							
								
								Display custom emoji in bio field names ( #11350 )  
							
							... 
							
							
							
							Already displayed in public pages, but not WebUI 
							
						 
						
							2019-07-21 03:40:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c0f0a24e27 
								
							 
						 
						
							
							
								
								Merge pull request  #1158  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge upstream changes 
							
						 
						
							2019-07-21 00:53:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4daf8b17e3 
								
							 
						 
						
							
							
								
								Fix filtering behaviors  
							
							
							
						 
						
							2019-07-19 19:21:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								8dd730a71d 
								
							 
						 
						
							
							
								
								[Glitch] Add ActivityPub actor representing the entire server  
							
							... 
							
							
							
							Port SCSS changes from c2126e3f98 
							
						 
						
							2019-07-19 18:35:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								6c5f339573 
								
							 
						 
						
							
							
								
								Remove Atom feeds and old URLs in the form of GET /:username/updates/:id  
							
							... 
							
							
							
							Port SCSS changes from fbbcbd940d 
							
						 
						
							2019-07-19 18:27:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								eecce7e59b 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml 
							
						 
						
							2019-07-19 18:26:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								de4ead8fc6 
								
							 
						 
						
							
							
								
								Change single-column mode to scroll the whole page ( #11359 )  
							
							... 
							
							
							
							Fix  #10840  
						
							2019-07-19 09:25:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								026f3a9d2d 
								
							 
						 
						
							
							
								
								Fix avatar animation on hover when not logged in ( #11349 )  
							
							
							
						 
						
							2019-07-19 09:18:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									koyu 
								
							 
						 
						
							
							
							
							
								
							
							
								ee3ab5a51d 
								
							 
						 
						
							
							
								
								Added logout to dropdown menu ( #11353 )  
							
							... 
							
							
							
							* Added logout to dropdown menu
* Triggering build-and-test with empty commit as it seems it failed due to some internal failure
* Looks fine, ready to review
* Added changes from review
* method can be null without any problems
* Also target can be null 
							
						 
						
							2019-07-19 03:58:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								c2126e3f98 
								
							 
						 
						
							
							
								
								Add ActivityPub actor representing the entire server ( #11321 )  
							
							... 
							
							
							
							* Add support for an instance actor
* Skip username validation for local Application accounts
* Add migration script to create instance actor
* Make Codeclimate happy
* Switch to id -99 for instance actor
* Remove unused `icon` and `image` attributes from instance actor
* Use if/elsif/else instead of return + ternary operator
* Add instance actor to fresh installs
* Use instance actor as instance representative
Use instance actor for forwarding reports, relay operations, and spam
auto-reporting.
* Seed database in test environment
* Fix single-user mode
* Fix tests
* Fix specs to accomodate for an extra `Account`
* Auto-reject follows on instance actor
Following an instance actor might make sense, but we are not handling that
right now, so auto-reject.
* Fix webfinger lookup and serialization for instance actor
* Rename instance actor
* Make it clear in the HTML view that the instance actor should not be blocked
* Raise cache time for instance actor as there's no dynamic content
* Re-use /about/more with a flash message for instance actor profile 
							
						 
						
							2019-07-19 01:44:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3f7c78d821 
								
							 
						 
						
							
							
								
								Fix timestamp display in boost/fav modals in RTL locales  
							
							
							
						 
						
							2019-07-18 20:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								97643292bb 
								
							 
						 
						
							
							
								
								Fixups  
							
							
							
						 
						
							2019-07-18 20:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								307ef1231f 
								
							 
						 
						
							
							
								
								Public pages RTL fixes  
							
							
							
						 
						
							2019-07-18 20:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a5bcce0795 
								
							 
						 
						
							
							
								
								Unfiy status__prepend with upstream  
							
							
							
						 
						
							2019-07-18 20:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								bb8fa5568c 
								
							 
						 
						
							
							
								
								RTL fixes  
							
							
							
						 
						
							2019-07-18 20:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a12190368e 
								
							 
						 
						
							
							
								
								Fix some SCSS for RTL behavior  
							
							
							
						 
						
							2019-07-18 20:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e60632a915 
								
							 
						 
						
							
							
								
								Minor fixup  
							
							
							
						 
						
							2019-07-18 20:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4a32302acd 
								
							 
						 
						
							
							
								
								[Glitch] Fix RTL layout of status display names  
							
							... 
							
							
							
							Port e29581a150 
							
						 
						
							2019-07-18 20:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Masoud Abkenar 
								
							 
						 
						
							
							
							
							
								
							
							
								15783e6568 
								
							 
						 
						
							
							
								
								[Glitch] RTL: fix settings button margins in column headers  
							
							... 
							
							
							
							Port 35b461c0ae 
							
						 
						
							2019-07-18 20:56:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								30ca4a6772 
								
							 
						 
						
							
							
								
								Make width breakpoint for removing margins consistent and match upstream  
							
							... 
							
							
							
							Fixes  #1136  
						
							2019-07-18 20:55:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1e3372feb9 
								
							 
						 
						
							
							
								
								Fix *another* typo and crash in StatusIcons  
							
							
							
						 
						
							2019-07-18 09:54:59 +02:00