ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							1149ddd3da 
							
						 
					 
					
						
						
							
							Fix glitch SCSS for links in error messages in admin interface  
						
						... 
						
						
						
						Port SCSS changes from 011b032300657ccca4a42866749afc6ec2588ecc 
						
						
					 
					
						2019-05-04 16:43:08 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							33c80e0783 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- app/models/media_attachment.rb 
						
						
					 
					
						2019-05-04 16:37:26 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							9f25ab9792 
							
						 
					 
					
						
						
							
							Fix polls icon not showing in CW button in detailed statuses  
						
						
						
						
					 
					
						2019-05-03 21:55:50 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							63b1388fef 
							
						 
					 
					
						
						
							
							Change font weight of sensitive button to 500 ( #10682 )  
						
						
						
						
					 
					
						2019-05-03 20:44:20 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							011b032300 
							
						 
					 
					
						
						
							
							Provide a link to existing domain block when trying to block an already-blocked domain ( #10663 )  
						
						... 
						
						
						
						* When trying to block an already-blocked domain, provide a link to the block
* Fix styling for links in flash messages
* Allow blocks to be upgraded but not downgraded 
						
						
					 
					
						2019-05-03 20:36:36 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							7617f78359 
							
						 
					 
					
						
						
							
							Fix crash in onboarding modal  
						
						... 
						
						
						
						Fixes  #1027  
					
						2019-05-03 19:24:54 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							eb63217210 
							
						 
					 
					
						
						
							
							Add button to view context to media modal ( #10676 )  
						
						... 
						
						
						
						* Add "view context" button to media modal when opened from gallery
* Add "view context" button to video modal
Allow closing the video modal by navigating back in the browser,
just like the media modal 
						
						
					 
					
						2019-05-03 16:16:30 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							5121d9c12f 
							
						 
					 
					
						
						
							
							When selecting a toot via keyboard, ensure it is scrolled into view ( #10593 )  
						
						
						
						
					 
					
						2019-05-03 06:20:35 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							05ef3462ba 
							
						 
					 
					
						
						
							
							Make the "mark media as sensitive" button more obvious in web UI ( #10673 )  
						
						... 
						
						
						
						* Make the "mark media as sensitive" button more obvious in web UI
* Use eye-slash icon instead of eye icon to mean "hide" 
						
						
					 
					
						2019-05-03 04:34:55 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							967e419f8f 
							
						 
					 
					
						
						
							
							Fix alignment of items in the account gallery in web UI and load more per page ( #10674 )  
						
						
						
						
					 
					
						2019-05-03 04:02:55 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3f143606fa 
							
						 
					 
					
						
						
							
							Change account gallery in web UI ( #10667 )  
						
						... 
						
						
						
						- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab 
						
						
					 
					
						2019-05-02 08:34:32 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							cc5a81b7d8 
							
						 
					 
					
						
						
							
							Make hi-color privacy icons opt-in instead of opt-out  
						
						
						
						
					 
					
						2019-05-01 20:23:25 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							ac54292d69 
							
						 
					 
					
						
						
							
							Add high color privacy icons  
						
						... 
						
						
						
						Fixes  #1015  
					
						2019-05-01 16:38:01 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							d4c95e6a8a 
							
						 
					 
					
						
						
							
							When selecting a toot via keyboard, ensure it is scrolled into view  
						
						... 
						
						
						
						Fixes detailed status column 
						
						
					 
					
						2019-04-29 20:28:38 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							3e095cab83 
							
						 
					 
					
						
						
							
							Add support for missing formatting tags  
						
						
						
						
					 
					
						2019-04-29 19:31:09 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							67fb9a8679 
							
						 
					 
					
						
						
							
							Add keyboard shortcut to collapse/uncollapse toots  
						
						
						
						
					 
					
						2019-04-28 20:23:04 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							f3acf8f414 
							
						 
					 
					
						
						
							
							Add hotkey for bookmarking a toot  
						
						
						
						
					 
					
						2019-04-28 20:23:04 +02:00 
						 
				 
			
				
					
						
							
							
								partev 
							
						 
					 
					
						
						
						
						
							
						
						
							5e79dd3f17 
							
						 
					 
					
						
						
							
							Update hy.json ( #10644 )  
						
						
						
						
					 
					
						2019-04-28 12:51:20 +09:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							cd9a284702 
							
						 
					 
					
						
						
							
							Fix regression with textarea's caret position when selecting a suggestion  
						
						
						
						
					 
					
						2019-04-27 21:40:42 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fba96c808d 
							
						 
					 
					
						
						
							
							Add blurhash ( #10630 )  
						
						... 
						
						
						
						* Add blurhash
* Use fallback color for spoiler when blurhash missing
* Federate the blurhash and accept it as long as it's at most 5x5
* Display unknown media attachments as blurhash placeholders
* Improve style of embed actions and spoiler button
* Change blurhash resolution from 3x3 to 4x4
* Improve dependency definitions
* Fix code style issues 
						
						
					 
					
						2019-04-27 03:24:09 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							aa1832ac4d 
							
						 
					 
					
						
						
							
							Hide suggestions by default  
						
						... 
						
						
						
						They will be enabled if the input has focus 
						
						
					 
					
						2019-04-26 22:38:03 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							fddd8251dd 
							
						 
					 
					
						
						
							
							Attempt to fix CSS  
						
						
						
						
					 
					
						2019-04-26 22:38:03 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							d7e4be285a 
							
						 
					 
					
						
						
							
							Add emoji suggestion to poll options  
						
						
						
						
					 
					
						2019-04-26 22:38:03 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							df52004fe6 
							
						 
					 
					
						
						
							
							Add suggestions in CW field  
						
						
						
						
					 
					
						2019-04-26 22:38:03 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							3a671470ec 
							
						 
					 
					
						
						
							
							Refactor selectComposeSuggestion so that different paths can be updated  
						
						
						
						
					 
					
						2019-04-26 22:38:03 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							852ccea676 
							
						 
					 
					
						
						
							
							Fix upload progressbar when image resizing is involved ( #10632 )  
						
						
						
						
					 
					
						2019-04-25 02:48:54 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							1c0402c103 
							
						 
					 
					
						
						
							
							Do not ask to register web intent handler  
						
						
						
						
					 
					
						2019-04-24 23:05:11 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							b13c90f3e3 
							
						 
					 
					
						
						
							
							Fix color of muted statuses content not wrapped in a p tag  
						
						
						
						
					 
					
						2019-04-24 22:40:17 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							e4b65e6349 
							
						 
					 
					
						
						
							
							Redesign blockquote styling  
						
						
						
						
					 
					
						2019-04-24 22:40:17 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							8753e5317f 
							
						 
					 
					
						
						
							
							Better distinguish titles from text  
						
						
						
						
					 
					
						2019-04-24 22:40:17 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							3631c3314a 
							
						 
					 
					
						
						
							
							Remove extra margin in paragraphs inside blockquotes  
						
						
						
						
					 
					
						2019-04-24 22:40:17 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							9b86707b1e 
							
						 
					 
					
						
						
							
							Make bold text bolder  
						
						
						
						
					 
					
						2019-04-24 22:40:17 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							5a8495dabe 
							
						 
					 
					
						
						
							
							Remove margins around p tags in lists  
						
						
						
						
					 
					
						2019-04-24 22:40:17 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							ef249a2718 
							
						 
					 
					
						
						
							
							Rename status__text to status__content__text for consistency with upstream  
						
						
						
						
					 
					
						2019-04-24 22:40:17 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							adbb174c9c 
							
						 
					 
					
						
						
							
							Fix status header display in toot mobile menu  
						
						
						
						
					 
					
						2019-04-24 20:21:19 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							ef1504d625 
							
						 
					 
					
						
						
							
							Fix upload progressbar when image resizing is involved  
						
						
						
						
					 
					
						2019-04-24 20:19:23 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							ffab9d626a 
							
						 
					 
					
						
						
							
							Hide media upload form if no media are attached  
						
						
						
						
					 
					
						2019-04-24 19:47:11 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							416aa832e5 
							
						 
					 
					
						
						
							
							Fix file upload  
						
						
						
						
					 
					
						2019-04-24 07:57:28 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							3d722b0c4e 
							
						 
					 
					
						
						
							
							Fix settings modal  
						
						
						
						
					 
					
						2019-04-23 18:31:13 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							27e8354914 
							
						 
					 
					
						
						
							
							Add support for lists in statuses  
						
						
						
						
					 
					
						2019-04-22 23:07:14 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							659f972bed 
							
						 
					 
					
						
						
							
							Do not switch to italic for status media buttons  
						
						
						
						
					 
					
						2019-04-22 23:07:14 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							2e3640ecbb 
							
						 
					 
					
						
						
							
							Accept richer text from remote statuses  
						
						... 
						
						
						
						Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS. 
						
						
					 
					
						2019-04-22 23:07:14 +02:00 
						 
				 
			
				
					
						
							
							
								kedama 
							
						 
					 
					
						
						
						
						
							
						
						
							039e35560c 
							
						 
					 
					
						
						
							
							[Glitch] Fix modal items cannot scroll on touch devices  
						
						... 
						
						
						
						Port d763d39d2628bef123cdc801b2a3a3922b7e37f2 to glitch-soc 
						
						
					 
					
						2019-04-22 22:57:39 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							a9eaa780f5 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						... 
						
						
						
						Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc 
						
						
					 
					
						2019-04-22 20:40:04 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							c3fa4e8e07 
							
						 
					 
					
						
						
							
							Fix ReferenceError in dropdown  
						
						
						
						
					 
					
						2019-04-22 20:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							d779ec1f0e 
							
						 
					 
					
						
						
							
							Fix broken reference to handleSubmit  
						
						
						
						
					 
					
						2019-04-22 20:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							e949861176 
							
						 
					 
					
						
						
							
							Cleanup  
						
						
						
						
					 
					
						2019-04-22 20:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							faff152ae5 
							
						 
					 
					
						
						
							
							Move ComposerPublisher to Compose  
						
						
						
						
					 
					
						2019-04-22 20:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							df951c319c 
							
						 
					 
					
						
						
							
							Add OptionsContainer  
						
						
						
						
					 
					
						2019-04-22 20:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							14028655df 
							
						 
					 
					
						
						
							
							Move composer Dropdown from features/composer to features/compose  
						
						
						
						
					 
					
						2019-04-22 20:15:47 +02:00