beatrix 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77b650b69c 
								
							 
						 
						
							
							
								
								Merge pull request  #412  from ThibG/glitch-soc/cleanup  
							
							... 
							
							
							
							Remove duplicate message entries (minor code cleanup) 
							
						 
						
							2018-04-04 11:36:54 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								d0e792e231 
								
							 
						 
						
							
							
								
								Update accounts SCSS for public pages  
							
							
							
						 
						
							2018-04-04 15:40:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								75f2e9fd97 
								
							 
						 
						
							
							
								
								Remove duplicate message entries  
							
							
							
						 
						
							2018-04-04 12:19:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ca9f022a80 
								
							 
						 
						
							
							
								
								[Glitch] Fix: Prevent submission using same logic as submit button disabling.  
							
							... 
							
							
							
							Port 6a895e1ab3 
							
						 
						
							2018-04-02 20:04:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								eb39db7f93 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	app/javascript/mastodon/locales/en.json
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json
 	app/views/accounts/_header.html.haml 
							
						 
						
							2018-04-01 20:24:50 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								6a895e1ab3 
								
							 
						 
						
							
							
								
								Fix: Prevent submission using same logic as submit button disabling. ( #6993 )  
							
							... 
							
							
							
							This prevents submission through ctrl/cmd+enter when the submit button is disabled. 
							
						 
						
							2018-04-01 22:19:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								929f58f180 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #6985 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-04-01 10:31:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								b7d633c1bb 
								
							 
						 
						
							
							
								
								i18n: Add Japanese translations for domain blocks ( #6979 )  
							
							... 
							
							
							
							* run yarn manage:translations
* Update Japanese translations for domain blocks. 
							
						 
						
							2018-03-31 21:09:39 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								fb3dc00dda 
								
							 
						 
						
							
							
								
								Ignore AbortError when cancelled sharing ( #6978 )  
							
							... 
							
							
							
							`navigator.share()` rejects Promise if user cancelled sharing, and it may
print it as an error on JavaScript console.
This patch ignores it and prints other errors on the console. 
							
						 
						
							2018-03-31 13:16:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								f0bb3ff533 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-03-30 19:17:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3304cb681d 
								
							 
						 
						
							
							
								
								Merge pull request  #380  from ThibG/glitch-soc/features/domain-block-ui  
							
							... 
							
							
							
							Port #6628  to glitch-soc flavour 
							
						 
						
							2018-03-30 14:50:02 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								48bcf4d6e8 
								
							 
						 
						
							
							
								
								[Glitch] Remove pointer events on the entire UI when a dropdown menu is open  
							
							... 
							
							
							
							Port 913a38111f 
							
						 
						
							2018-03-30 12:45:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								a6c129ddbd 
								
							 
						 
						
							
							
								
								Add some UI for user-defined domain blocks ( #6628 )  
							
							... 
							
							
							
							* Keep list of blocked domains
Might be overkill, but I'm trying to follow the same logic as for blocked users
* Add basic domain block UI
* Add the domain blocks UI to Getting Started
* Fix undefined URL in `fetchDomainBlocks`
* Update all known users' domain_blocking relationship instead of just one's 
							
						 
						
							2018-03-30 12:38:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								2871a82fcc 
								
							 
						 
						
							
							
								
								[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport  
							
							... 
							
							
							
							Port f6a8d835d3 
							
						 
						
							2018-03-30 12:31:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								218cc261d1 
								
							 
						 
						
							
							
								
								Add the domain blocks UI to Getting Started Misc  
							
							
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								afa813d71f 
								
							 
						 
						
							
							
								
								Add basic domain block UI  
							
							
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								482ad7d7c4 
								
							 
						 
						
							
							
								
								Keep list of blocked domains  
							
							... 
							
							
							
							Might be overkill, but I'm trying to follow the same logic as for blocked users 
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								79da0ad7a2 
								
							 
						 
						
							
							
								
								Update all known users' domain_blocking relationship instead of just one's  
							
							
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								937ace10d9 
								
							 
						 
						
							
							
								
								Fix undefined URL in fetchDomainBlocks  
							
							
							
						 
						
							2018-03-30 10:07:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								947eedcab2 
								
							 
						 
						
							
							
								
								update ja locale ( #6965 )  
							
							... 
							
							
							
							related https://github.com/tootsuite/mastodon/pull/6956  
							
						 
						
							2018-03-30 10:04:04 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Emelia Smith 
								
							 
						 
						
							
							
							
							
								
							
							
								d1f34151ae 
								
							 
						 
						
							
							
								
								Feature: Direct message from menu ( #6956 )  
							
							... 
							
							
							
							* Implement ability to send direct messages from the user menu
* Implement message warning users that direct messages are visible to all mentioned users
* Update locales 
							
						 
						
							2018-03-29 19:08:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b5948044b3 
								
							 
						 
						
							
							
								
								[Glitch] Display unfollow button even if account moved  
							
							... 
							
							
							
							Backport 3987bd18a4 
							
						 
						
							2018-03-29 14:59:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a59c146bf8 
								
							 
						 
						
							
							
								
								[Glitch] Profile redirect notes  
							
							... 
							
							
							
							Port WebUI changes from 58cede4808 
							
						 
						
							2018-03-29 14:59:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								f1f846045f 
								
							 
						 
						
							
							
								
								Fix ReferenceError when Cache API is missing ( #6953 )  
							
							... 
							
							
							
							Cache API is not supported on Safari 11.0 / iOS 11.
Since those caching is optional, this patch simply ignores it. 
							
						 
						
							2018-03-29 14:57:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								41452e8302 
								
							 
						 
						
							
							
								
								Fix TypeError on follow notification ( #6950 )  
							
							... 
							
							
							
							`notification.status` may not be present, e.g. follow notification. 
							
						 
						
							2018-03-29 12:59:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4e45954280 
								
							 
						 
						
							
							
								
								Merge pull request  #402  from ThibG/glitch-soc/fixes/accept-empty-toot-contents  
							
							... 
							
							
							
							Render toots with empty contents 
							
						 
						
							2018-03-28 16:39:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7db431eac6 
								
							 
						 
						
							
							
								
								Fix attachment lists  
							
							
							
						 
						
							2018-03-28 22:19:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								53eab4470d 
								
							 
						 
						
							
							
								
								Render toots with empty contents  
							
							... 
							
							
							
							This is necessary to display toots with media but otherwise no contents,
as glitch-soc displays the media as a child of StatusContent, unlike
Mastodon. 
							
						 
						
							2018-03-28 21:13:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yuto Tokunaga 
								
							 
						 
						
							
							
							
							
								
							
							
								5021c4e9ca 
								
							 
						 
						
							
							
								
								Add double-tap zoom functionary to ZoomableImage ( #6944 )  
							
							... 
							
							
							
							add <div.zoomable-image__margin/> to keep margin of the image on zooming
move setting `scrollLeft` and `scrollTop` of container from callback of
`setState` to `componentDidUpdate`
add 'hammerjs' package for touch gesture detection
rewrite `ZoomableImage` using 'hammerjs' 
							
						 
						
							2018-03-28 20:40:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d2cdc2b5a3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							
							
						 
						
							2018-03-27 10:44:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f61aa8e0f7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into gs-master  
							
							... 
							
							
							
							Conflicts:
 	app/javascript/styles/mastodon/components.scss
 	app/models/media_attachment.rb 
							
						 
						
							2018-03-27 10:26:47 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								3523aa440b 
								
							 
						 
						
							
							
								
								Fix LoadMore on account media gallery ( #6933 )  
							
							... 
							
							
							
							max_id in the fetch request should be a status id, but media attachment id was used. 
							
						 
						
							2018-03-27 16:53:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								88790b91de 
								
							 
						 
						
							
							
								
								[Glitch] Display AttachmentList in notifications  
							
							... 
							
							
							
							Port 77406d3a09 
							
						 
						
							2018-03-27 16:09:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								3bc5452449 
								
							 
						 
						
							
							
								
								[Glitch] Display AttachmentList in timelines in compact style when media missing  
							
							... 
							
							
							
							Port 86a9de6753 
							
						 
						
							2018-03-27 16:09:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								f5ed5f3860 
								
							 
						 
						
							
							
								
								Clone response before put it to the cache ( #6932 )  
							
							... 
							
							
							
							`Response.prototype.clone()` must be called before the response used.
This fixes an error from ServiceWorker and failing to load image when the
image is not cached. 
							
						 
						
							2018-03-27 15:18:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								2f3ac14a43 
								
							 
						 
						
							
							
								
								Add missing null handling in notification reducer ( #6930 )  
							
							... 
							
							
							
							This patch adds null item (i.e. gap) handling on below functions to avoid TypeError.
* `filterNotifications` called on user mute/block
* `deleteByStatus` called on status deletion 
							
						 
						
							2018-03-27 13:05:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								ca42f9b0eb 
								
							 
						 
						
							
							
								
								Cache media ( #6902 )  
							
							
							
						 
						
							2018-03-27 12:32:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yuto Tokunaga 
								
							 
						 
						
							
							
							
							
								
							
							
								31e7b73084 
								
							 
						 
						
							
							
								
								fix   #6846  ( #6914 )  
							
							
							
						 
						
							2018-03-27 12:30:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stephen Burgess 
								
							 
						 
						
							
							
							
							
								
							
							
								18965cb0e6 
								
							 
						 
						
							
							
								
								feat(ShowMore): Add classname to show more/show less button ( #6904 )  
							
							
							
						 
						
							2018-03-26 13:59:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yuto Tokunaga 
								
							 
						 
						
							
							
							
							
								
							
							
								f691afaae9 
								
							 
						 
						
							
							
								
								Refactor scss ( #6913 )  
							
							... 
							
							
							
							* Refactoring scss
introduce scss variables for the media modal
fix css block structure corresponding to react components
fix flex layouts
remove background image of the loaded image on the media modal
* Fix typo 
							
						 
						
							2018-03-26 13:59:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								605a92b460 
								
							 
						 
						
							
							
								
								Fix moved account handling in IndexedDB feature ( #6915 )  
							
							... 
							
							
							
							* Fix stack overflow on importFetchedAccounts
  When the account has moved property, it should process destination
  account instead of source account itself.
* Set account id instead of account object for moved property
  This restores "foo has moved to" indication on account view, and
  fixes `reblog` index on `accounts` object store. 
							
						 
						
							2018-03-26 12:48:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								837b3804bf 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-03-25 15:17:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								85a395fab6 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #6903 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-03-25 23:33:07 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								cbf97c03bb 
								
							 
						 
						
							
							
								
								Allow clients to fetch notifications made while they were offline ( #6886 )  
							
							
							
						 
						
							2018-03-24 22:07:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								9a1a55ce52 
								
							 
						 
						
							
							
								
								Allow clients to fetch statuses made while they were offline ( #6876 )  
							
							
							
						 
						
							2018-03-24 15:25:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								59657e24b9 
								
							 
						 
						
							
							
								
								Rename variables to have semantic meanings in notifications reducer ( #6890 )  
							
							
							
						 
						
							2018-03-24 13:36:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								fe398a098e 
								
							 
						 
						
							
							
								
								Store objects to IndexedDB ( #6826 )  
							
							
							
						 
						
							2018-03-24 13:06:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								ff7941e652 
								
							 
						 
						
							
							
								
								Show media modal on public pages ( #6801 )  
							
							
							
						 
						
							2018-03-24 12:52:26 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								1c15329cce 
								
							 
						 
						
							
							
								
								Change “Toots with replies” to “Toots and replies” ( #6875 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-03-24 12:51:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								4e71b104e6 
								
							 
						 
						
							
							
								
								Internationalize unexpected error message ( #6887 )  
							
							
							
						 
						
							2018-03-24 10:54:19 +01:00