Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								cc94c90bf1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb 
							
						 
						
							2019-09-30 12:23:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								fdd1848c7c 
								
							 
						 
						
							
							
								
								Add explanation to mute dialog, refactor and clean up mute/block UI ( #11992 )  
							
							... 
							
							
							
							* Add some explanation to the mute modal dialog
* Remove `isSubmitting` from mute modal code, this wasn't used
* Refactor block modal
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
* Refactor SCSS a bit
* Put mute modal toggle to the same side as in the report dialog for consistency
* Reword mute explanation
* Fix mute explanation styling
* Left-align all text in mute confirmation modal 
							
						 
						
							2019-09-29 21:46:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									trwnh 
								
							 
						 
						
							
							
							
							
								
							
							
								e4289a50fc 
								
							 
						 
						
							
							
								
								Fix muted text color not applying to all text ( #11996 )  
							
							... 
							
							
							
							Pleroma generates polls without p tag 
							
						 
						
							2019-09-29 16:54:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Cutls 
								
							 
						 
						
							
							
							
							
								
							
							
								45bdb2cea4 
								
							 
						 
						
							
							
								
								Fix overflow on conversations ( #11965 )  
							
							... 
							
							
							
							* Fix: overflow on conversations
* Fix: overflow on conversations 
							
						 
						
							2019-09-27 02:14:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5d5af651f1 
								
							 
						 
						
							
							
								
								Change conversations UI ( #11896 )  
							
							... 
							
							
							
							Fix  #11414 , fix  #9860 , fix  #10434  
						
							2019-09-21 20:01:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bd3e1b383e 
								
							 
						 
						
							
							
								
								Fix left side of single column layout being cropped on smaller screens ( #11894 )  
							
							... 
							
							
							
							Fix  #11476  
						
							2019-09-20 10:51:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								21cca10a6e 
								
							 
						 
						
							
							
								
								Fix placeholder colors for inputs not being explicitly defined ( #11890 )  
							
							... 
							
							
							
							Fix  #11841  
						
							2019-09-19 19:58:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								eac7c66d2a 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-09-05 11:36:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f6cd27f41f 
								
							 
						 
						
							
							
								
								Fix line breaks in hashtag autosuggestions in web UI ( #11764 )  
							
							
							
						 
						
							2019-09-05 06:14:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								acf168f1a2 
								
							 
						 
						
							
							
								
								Fix uncached media in web UI not being clickable ( #11745 )  
							
							
							
						 
						
							2019-09-03 04:56:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								59d873e1e5 
								
							 
						 
						
							
							
								
								Add "not available" label on unknown media attachments ( #11715 )  
							
							
							
						 
						
							2019-09-01 19:43:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								741b53651e 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design. 
							
						 
						
							2019-08-30 13:38:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b47119eb61 
								
							 
						 
						
							
							
								
								Change layout of public profile directory to be the same as in web UI ( #11705 )  
							
							
							
						 
						
							2019-08-30 07:41:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								79922ae20f 
								
							 
						 
						
							
							
								
								Add profile directory to web UI ( #11688 )  
							
							... 
							
							
							
							* Add profile directory to web UI
* Add a line of bio to the directory 
							
						 
						
							2019-08-30 00:14:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								449a0727a7 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb
All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes. 
							
						 
						
							2019-08-29 12:07:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								eaa759ffd4 
								
							 
						 
						
							
							
								
								Fix more visual issues with the audio player ( #11654 )  
							
							... 
							
							
							
							* Fix more visual issues with the audio player
- Add horizontal baseline in the middle of waveform
- Fix audio player colors in light theme
- Use audio element instead of web audio API
- Do not render any bars until the file is loaded
- Do not allow interactions with waveform until the file is loaded
* Fix code style issue 
							
						 
						
							2019-08-25 15:09:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f13761d84b 
								
							 
						 
						
							
							
								
								Add audio player ( #11644 )  
							
							
							
						 
						
							2019-08-23 22:38:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cf56532ced 
								
							 
						 
						
							
							
								
								Add header to trends section and change refresh rate to 15 minutes ( #11641 )  
							
							
							
						 
						
							2019-08-23 05:05:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c060523dc2 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json 
							
						 
						
							2019-08-19 21:49:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f4802e5c51 
								
							 
						 
						
							
							
								
								Fix loading bar being obscured by other elements in web UI ( #11598 )  
							
							
							
						 
						
							2019-08-18 14:57:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								193df2e8cb 
								
							 
						 
						
							
							
								
								Fix hashtag autosuggestions line breaks for long suggestions ( #11588 )  
							
							
							
						 
						
							2019-08-17 22:04:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								dc83169865 
								
							 
						 
						
							
							
								
								Improve focal point modal on mobile ( #11575 )  
							
							... 
							
							
							
							* Reduce padding around report modal and focal point modal title
* Increase max allowed height for focal point modal content 
							
						 
						
							2019-08-15 22:49:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a886bf3808 
								
							 
						 
						
							
							
								
								Allow clicking behind preview ( #11576 )  
							
							
							
						 
						
							2019-08-15 22:47:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								375f2f3864 
								
							 
						 
						
							
							
								
								Fix edit media modal on small screens, touch events ( #11573 )  
							
							
							
						 
						
							2019-08-15 20:28:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sasha Sorokin 
								
							 
						 
						
							
							
							
							
								
							
							
								406f2f7d57 
								
							 
						 
						
							
							
								
								Fix trending counter width ( #11569 )  
							
							... 
							
							
							
							Trending counter used to be constant 100px in width, which caused
issues in languages like Russian, where because of that, "talking"
text was cut to the size where actual count is not visible at all:
> 6 people talking
> Популярно у... 
							
						 
						
							2019-08-15 20:20:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								41b188dce6 
								
							 
						 
						
							
							
								
								Add OCR tool to media editing modal ( #11566 )  
							
							
							
						 
						
							2019-08-15 15:13:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								da208e7d9b 
								
							 
						 
						
							
							
								
								Add media editing modal ( #11563 )  
							
							... 
							
							
							
							Move media description input to a modal and unite that modal with
the focal point modal. Add a hint about choosing focal points, as
well as a preview of a 16:9 thumbnail. Enable the user to watch
the video next to the media description input.
Fix  #8320 
Fix  #6713  
							
						 
						
							2019-08-14 04:07:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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