Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bc97fd641f 
								
							 
						 
						
							
							
								
								[Glitch] Add button to view context to media modal  
							
							... 
							
							
							
							Port eb63217210 
							
						 
						
							2019-05-04 19:10:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								209c080280 
								
							 
						 
						
							
							
								
								[Glitch] Fix alignment of items in the account gallery in web UI and load more per page  
							
							... 
							
							
							
							Port 967e419f8f 
							
						 
						
							2019-05-04 18:59:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a5da59f140 
								
							 
						 
						
							
							
								
								[Glitch] Change account gallery in web UI  
							
							... 
							
							
							
							Port 3f143606fa 
							
						 
						
							2019-05-04 18:54:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								373dd1fdf1 
								
							 
						 
						
							
							
								
								Minor CSS fixes  
							
							
							
						 
						
							2019-05-04 18:18:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ccf4f3240a 
								
							 
						 
						
							
							
								
								[Glitch] Add blurhash  
							
							... 
							
							
							
							Port front-end changes from fba96c808d 
							
						 
						
							2019-05-04 18:07:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								7aa749ab46 
								
							 
						 
						
							
							
								
								Fix transition: all ( #10699 )  
							
							
							
						 
						
							2019-05-04 17:39:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								4f73cde4e1 
								
							 
						 
						
							
							
								
								Minor account media gallery fixes ( #10695 )  
							
							... 
							
							
							
							* Make the cursor icon consistant across media types in account media gallery
* Fix the video player modal causing scroll position to reset 
							
						 
						
							2019-05-04 17:36:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								1149ddd3da 
								
							 
						 
						
							
							
								
								Fix glitch SCSS for links in error messages in admin interface  
							
							... 
							
							
							
							Port SCSS changes from 011b032300 
							
						 
						
							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 d763d39d26 
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4c6221929f 
								
							 
						 
						
							
							
								
								Move ComposerTextareaIcons to TextareaIcons  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								47faf47ed5 
								
							 
						 
						
							
							
								
								ComposerTextarea → AutosuggestTextarea  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a243567a3e 
								
							 
						 
						
							
							
								
								ComposerUploadForm → UploadForm + UploadFormContainer  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c5f49a92dc 
								
							 
						 
						
							
							
								
								Move PollForm from features/composer to features/compose  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f1a22e33e2 
								
							 
						 
						
							
							
								
								Inline spoiler input  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8fd599fb40 
								
							 
						 
						
							
							
								
								ComposerReply → ReplyIndicator  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f72af5794d 
								
							 
						 
						
							
							
								
								Refactor Compose*Warning → ContainerWarning  
							
							... 
							
							
							
							Regression: only one warning at a time 
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1bc4b8a0a5 
								
							 
						 
						
							
							
								
								features/composer/index.js → ComposeForm  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								281a82d878 
								
							 
						 
						
							
							
								
								DrawerHeader → Header + HeaderContainer  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								9a2f10fe8b 
								
							 
						 
						
							
							
								
								DrawerAccount → NavigationBar + NavigationContainer  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9b9816aba6 
								
							 
						 
						
							
							
								
								[Glitch] Show suggested follows on search screen in mobile layout  
							
							... 
							
							
							
							Port ad510db3a1 
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								149aa07409 
								
							 
						 
						
							
							
								
								DrawerResults → SearchResults + SearchResultsContainer  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								67771e6d65 
								
							 
						 
						
							
							
								
								Rework DrawerResults to make them closer to upstream  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ab3e8fc542 
								
							 
						 
						
							
							
								
								Move DrawerSearch to Search + SearchContainer  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c92ab35b19 
								
							 
						 
						
							
							
								
								Inline DrawerSearchPopout in DrawerSearch  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c19b983986 
								
							 
						 
						
							
							
								
								Refactor a bit DrawerSearch to make it closer to upstream  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								eed2c9dd44 
								
							 
						 
						
							
							
								
								Rename flavours/glitch/features/drawer to flavours/glitch/features/compose  
							
							
							
						 
						
							2019-04-22 20:15:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								0e78862b61 
								
							 
						 
						
							
							
								
								Allow switching between singe-option and multiple-option polls ( #10603 )  
							
							
							
						 
						
							2019-04-22 14:56:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kedama 
								
							 
						 
						
							
							
							
							
								
							
							
								d763d39d26 
								
							 
						 
						
							
							
								
								Fix modal items cannot scroll on touch devices ( #10605 )  
							
							
							
						 
						
							2019-04-22 14:55:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								bdec58b514 
								
							 
						 
						
							
							
								
								Minor code cleanup ( #10613 )  
							
							
							
						 
						
							2019-04-22 14:55:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								80c9cb0eb3 
								
							 
						 
						
							
							
								
								Add hi.json ( #10573 )  
							
							
							
						 
						
							2019-04-21 04:52:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									partev 
								
							 
						 
						
							
							
							
							
								
							
							
								d210d0a655 
								
							 
						 
						
							
							
								
								Update hy.json ( #10591 )  
							
							
							
						 
						
							2019-04-21 04:48:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jessica 
								
							 
						 
						
							
							
							
							
								
							
							
								01b1c377b1 
								
							 
						 
						
							
							
								
								Animate avatar GIFs on-hover on public profiles ( #10549 )  
							
							... 
							
							
							
							* Third time is the charm?
* Use full asset URL for data-static and data-original
̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host 
							
						 
						
							2019-04-21 04:47:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									jeroenpraat 
								
							 
						 
						
							
							
							
							
								
							
							
								951f8d5b44 
								
							 
						 
						
							
							
								
								Update NL (Dutch) translation ( #10601 )  
							
							... 
							
							
							
							* Update NL language strings
Have to do it this way, cause this file is locked on Weblate
* fix
* Update simple_form.nl.yml
* Update nl.yml 
							
						 
						
							2019-04-21 04:46:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6e620dcab1 
								
							 
						 
						
							
							
								
								Use correct local names for fonts ( #10594 )  
							
							
							
						 
						
							2019-04-21 04:42:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sho Kusano 
								
							 
						 
						
							
							
							
							
								
							
							
								3e6c7f3617 
								
							 
						 
						
							
							
								
								Configrationable repository url ( #10600 )  
							
							... 
							
							
							
							* config: Add GITHUB_REPOSITORY for repository name
* config: Add SOURCE_BASE_URL for repository url
* Show source_url and repository name on getting started 
							
						 
						
							2019-04-21 04:41:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8b7b65e995 
								
							 
						 
						
							
							
								
								[Glitch] Allow modal secondary button to shrink and allow wider confirmation modals  
							
							... 
							
							
							
							Port 7f75792bf3 
							
						 
						
							2019-04-19 10:48:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								268417daf3 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-04-19 10:44:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								e3c1472040 
								
							 
						 
						
							
							
								
								Shift+click on column Back button to return to last pinable column  
							
							
							
						 
						
							2019-04-17 18:40:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8d57c0e70e 
								
							 
						 
						
							
							
								
								When selecting a toot via keyboard, ensure it is scrolled into view  
							
							
							
						 
						
							2019-04-17 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								fbec0edf08 
								
							 
						 
						
							
							
								
								Fix opening/closing gifv sometimes making the timeline scroll  
							
							
							
						 
						
							2019-04-16 22:20:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								7f75792bf3 
								
							 
						 
						
							
							
								
								Allow modal secondary button to shrink and allow wider confirmation modals ( #10586 )  
							
							... 
							
							
							
							Fixes  #10531  
						
							2019-04-16 08:23:07 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Renato "Lond" Cerqueira 
								
							 
						 
						
							
							
							
							
								
							
							
								d305d8747d 
								
							 
						 
						
							
							
								
								Add new pt-br translations ( #10564 )  
							
							
							
						 
						
							2019-04-13 21:23:41 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2f422b708f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							
							
						 
						
							2019-04-10 21:19:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Evgeny Petrov 
								
							 
						 
						
							
							
							
							
								
							
							
								5dd14dfded 
								
							 
						 
						
							
							
								
								i18n: Russian localization update ( #10515 )  
							
							... 
							
							
							
							* i18n: Updated ru.json for Russian language
* i18n: Updated ru.yml
* Normalize ru.yml
* i18n: Updated simple_form.ru.yml
* i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings
* Added new strings to ru.json
* Deleted unused (?) string
* i18n: Added recent strings (Settings refactor) 
							
						 
						
							2019-04-10 20:43:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								793b0513eb 
								
							 
						 
						
							
							
								
								Weblate translations (2019-04-10) ( #10545 )  
							
							... 
							
							
							
							* Translated using Weblate (Occitan)
Currently translated at 95.7% (780 of 815 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ 
* Translated using Weblate (Greek)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (Greek)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/ 
* Translated using Weblate (Greek)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ 
* Translated using Weblate (French)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (French)
Currently translated at 100.0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/ 
* Translated using Weblate (French)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ 
* Translated using Weblate (Galician)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ 
* Translated using Weblate (Dutch)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ 
* Translated using Weblate (Galician)
Currently translated at 100,0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ 
* Translated using Weblate (Arabic)
Currently translated at 97.4% (372 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ 
* Translated using Weblate (French)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ 
* Translated using Weblate (Thai)
Currently translated at 75.4% (288 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/ 
* Translated using Weblate (Slovak)
Currently translated at 100.0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ 
* Translated using Weblate (German)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ 
* Translated using Weblate (Slovak)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/ 
* Translated using Weblate (Kazakh)
Currently translated at 100,0% (4 of 4 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/ 
* Translated using Weblate (Persian)
Currently translated at 100.0% (382 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ 
* Translated using Weblate (Kazakh)
Currently translated at 99.0% (378 of 382 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/ 
* i18n-tasks normalize
* yarn manage:translations
* Fix empty string in Occitan 
							
						 
						
							2019-04-10 18:17:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aditoo17 
								
							 
						 
						
							
							
							
							
								
							
							
								4e59f709aa 
								
							 
						 
						
							
							
								
								I18n: Final Czech translation  🇨🇿  ( #10542 )  
							
							... 
							
							
							
							* I18n: Update Czech translation
* I18n: Why do you want to join translation
* I18n: Translating a bunch of more stuff 
							
						 
						
							2019-04-10 14:52:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marek Ľach 
								
							 
						 
						
							
							
							
							
								
							
							
								3dea62bfa2 
								
							 
						 
						
							
							
								
								Updates the grammar of the SK translation ( #10541 )  
							
							
							
						 
						
							2019-04-10 14:50:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								92e1950194 
								
							 
						 
						
							
							
								
								[Glitch] Fix glitched out "not found" message for non-existing profiles in web UI  
							
							... 
							
							
							
							Port 56f29c38b6 
							
						 
						
							2019-04-10 09:33:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								fa4b51a110 
								
							 
						 
						
							
							
								
								[Glitch] Add "why do you want to join" field to invite requests  
							
							... 
							
							
							
							Port SCSS changes from 8b69a66380 
							
						 
						
							2019-04-10 09:22:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								5085559b15 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu. 
							
						 
						
							2019-04-10 09:16:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yağızhan 
								
							 
						 
						
							
							
							
							
								
							
							
								2cb16c20a6 
								
							 
						 
						
							
							
								
								Fixed terrible grammar and translated the most ( #10527 )  
							
							... 
							
							
							
							The translation was written in bad Turkish grammar. I fixed those terrible phrases and translated %93 of Mastodon.
I'll come back and finish the translation. 
							
						 
						
							2019-04-09 20:42:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8b69a66380 
								
							 
						 
						
							
							
								
								Add "why do you want to join" field to invite requests ( #10524 )  
							
							... 
							
							
							
							* Add "why do you want to join" field to invite requests
Fix  #10512 
* Remove unused translations
* Fix broken registrations when no invite request text is submitted 
							
						 
						
							2019-04-09 23:06:30 +09:00