Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ff76f6de4f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml 
							
						 
						
							2019-08-07 13:56:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b55fd4f12d 
								
							 
						 
						
							
							
								
								Fix featured tags not finding the right tag on save ( #11504 )  
							
							... 
							
							
							
							Regression from b838607 
							
						 
						
							2019-08-07 10:00:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								191392e5c3 
								
							 
						 
						
							
							
								
								Add trends UI with admin and user settings ( #11502 )  
							
							
							
						 
						
							2019-08-06 17:57:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								77416866a7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-08-05 13:13:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ebc78b6f2b 
								
							 
						 
						
							
							
								
								Change icon button styles to make hover/focus states more obvious ( #11474 )  
							
							... 
							
							
							
							* Change icon buttons styles to make hover/focused states more obvious
* Fix CW button size inconsistency
* Fix icon button background color consistency 
							
						 
						
							2019-08-03 19:10:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								293f789239 
								
							 
						 
						
							
							
								
								Fix scroll to top in single column UI ( #11463 )  
							
							
							
						 
						
							2019-08-01 19:17:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cf45e39dd5 
								
							 
						 
						
							
							
								
								Fix column header scrolling with the page ( #11458 )  
							
							... 
							
							
							
							Regression from de4ead8 
							
						 
						
							2019-08-01 12:26:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mélanie Chauvel (ariasuni) 
								
							 
						 
						
							
							
							
							
								
							
							
								67899611b4 
								
							 
						 
						
							
							
								
								Fix jumping of toot date when clicking spoiler button ( #11449 )  
							
							... 
							
							
							
							* Fix jumping of toot date when clicking spoiler button
* Fix lint 
							
						 
						
							2019-07-31 10:06:58 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								124a1d3880 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-07-24 16:23:53 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								fbbcbd940d 
								
							 
						 
						
							
							
								
								Remove Atom feeds and old URLs in the form of GET /:username/updates/:id ( #11247 )  
							
							
							
						 
						
							2019-07-07 16:16:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8176d21824 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-06-28 12:11:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0943e994dd 
								
							 
						 
						
							
							
								
								Add message telling FTS is disabled when no toot can be found because of this ( #11112 )  
							
							... 
							
							
							
							* Add message telling FTS is disabled when no toot can be found because of this
Fixes  #11082 
* Remove info icon and reword message 
							
						 
						
							2019-06-27 21:12:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1177694c3e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder 
							
						 
						
							2019-06-24 15:02:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a266d7f1a2 
								
							 
						 
						
							
							
								
								Change audio format from ogg to mp3 for wider compatibility ( #11141 )  
							
							... 
							
							
							
							* Change audio format from ogg to mp3 for wider compatibility
* Add media description as title to links of unknown media attachments 
							
						 
						
							2019-06-21 22:59:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4741ea0029 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-06-13 22:23:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								770515a629 
								
							 
						 
						
							
							
								
								Fix ordering of keyboard access between CW field, textarea and emoji picker ( #11066 )  
							
							
							
						 
						
							2019-06-13 17:07:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								89025150d1 
								
							 
						 
						
							
							
								
								Fix border-bottom of active tab bars ( #11068 )  
							
							
							
						 
						
							2019-06-13 00:14:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1b4242ddf7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-06-11 21:55:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cbaff2bf53 
								
							 
						 
						
							
							
								
								Fix list not being automatically unpinned when it returns 404 in web UI ( #11045 )  
							
							
							
						 
						
							2019-06-11 02:26:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5a158899bc 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb 
							
						 
						
							2019-06-10 18:59:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f698e28803 
								
							 
						 
						
							
							
								
								Fix position of search icon ( #11003 )  
							
							
							
						 
						
							2019-06-09 01:59:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0984e09538 
								
							 
						 
						
							
							
								
								Fix more issues in the light theme ( #10996 )  
							
							... 
							
							
							
							* Fix tabs bar in light theme
* Fix borders on small screens in light theme 
							
						 
						
							2019-06-08 22:32:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								73e610790e 
								
							 
						 
						
							
							
								
								Change full logo to use primary text color of the given theme ( #10994 )  
							
							... 
							
							
							
							* Change full logo to use primary text color of the given theme
* Fix colors of public layout header in light theme 
							
						 
						
							2019-06-08 15:30:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c7feecc715 
								
							 
						 
						
							
							
								
								Improve light theme ( #10992 )  
							
							
							
						 
						
							2019-06-08 10:23:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b44ae7d284 
								
							 
						 
						
							
							
								
								Fix RTL layout not being RTL within the columns area ( #10990 )  
							
							
							
						 
						
							2019-06-07 23:35:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								00552d2f79 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb 
							
						 
						
							2019-06-07 17:00:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								2b35ddc80a 
								
							 
						 
						
							
							
								
								Fix display of alt-text when a media attachment is not available ( #10981 )  
							
							
							
						 
						
							2019-06-07 12:41:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8bf8d6d9d9 
								
							 
						 
						
							
							
								
								Change preferences page into appearance, notifications, and other ( #10977 )  
							
							
							
						 
						
							2019-06-07 03:39:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								e20f7876e8 
								
							 
						 
						
							
							
								
								Fix sass-lint config ( #10982 )  
							
							
							
						 
						
							2019-06-06 18:51:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								88a04bf6c4 
								
							 
						 
						
							
							
								
								Fix emoji picker being always displayed ( #10979 )  
							
							... 
							
							
							
							* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests 
							
						 
						
							2019-06-06 12:30:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b01b8521ec 
								
							 
						 
						
							
							
								
								Fix margins on profile metadata in single column mode ( #10961 )  
							
							
							
						 
						
							2019-06-04 23:11:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a4e0071538 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock 
							
						 
						
							2019-06-03 14:54:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jeong Arm 
								
							 
						 
						
							
							
							
							
								
							
							
								77375ad7df 
								
							 
						 
						
							
							
								
								Fix profile picture preview ( #10931 )  
							
							
							
						 
						
							2019-06-02 18:04:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								96ac52dabd 
								
							 
						 
						
							
							
								
								Improvement variable height in single column layout ( #10917 )  
							
							... 
							
							
							
							* Improvement variable height of compose and navigation panel in single column layout
* Fix wrong quotes and missing commas 
							
						 
						
							2019-06-02 10:05:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hanage999 
								
							 
						 
						
							
							
							
							
								
							
							
								702dbf1622 
								
							 
						 
						
							
							
								
								Center 2-columns layout without side effect ( #10915 )  
							
							
							
						 
						
							2019-06-01 07:59:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								206d0ea6a2 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-05-30 13:31:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takeshi Umeda 
								
							 
						 
						
							
							
							
							
								
							
							
								9c174f4d02 
								
							 
						 
						
							
							
								
								Fix safari post field display issue in single column layout ( #10883 )  
							
							
							
						 
						
							2019-05-29 12:03:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b9c5aed987 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-05-28 17:45:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c5234ac2aa 
								
							 
						 
						
							
							
								
								Use <use /> to render transparent SVG logo instead of inserting it ( #10845 )  
							
							
							
						 
						
							2019-05-27 03:33:39 +02:00