Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								604eae1677 
								
							 
						 
						
							
							
								
								Bump version to 2.4.0rc4  
							
							
							
						 
						
							2018-05-19 18:38:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ef4a35cb62 
								
							 
						 
						
							
							
								
								Improve direct message warning again ( #7546 )  
							
							
							
						 
						
							2018-05-19 18:37:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								95385ebe3e 
								
							 
						 
						
							
							
								
								In footer, replace text "Mastodon" with logo ( #7545 )  
							
							
							
						 
						
							2018-05-19 16:10:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									takayamaki 
								
							 
						 
						
							
							
							
							
								
							
							
								1f83fdff89 
								
							 
						 
						
							
							
								
								checking http status code with range ( #7544 )  
							
							
							
						 
						
							2018-05-19 14:47:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								70e678da43 
								
							 
						 
						
							
							
								
								Improve payload format of Web Push API now that it's open ( #7521 )  
							
							... 
							
							
							
							> Good lord what is happening in there
Previously the contents of the Web Push API payloads closely resembled the structure of JavaScript's [Notification](https://developer.mozilla.org/en-US/docs/Web/API/Notification ). But now that the API is open to non-browser apps, and given that there is no required coupling between contents of the payload and a Notification object, here is how I changed the payload:
```json
{ 
  "access_token": "...",
  "preferred_locale": "en",
  "notification_id": "12345",
  "notification_type": "follow",
  "title": "So and so followed you",
  "body": "This is my bio",
  "icon": "https://example.com/avatar.png "
}
```
The title, body and icon attributes are included as a fallback so you can construct a minimal notification if you cannot perform a network request to the API to get more data. 
							
						 
						
							2018-05-19 14:46:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								6bee19117f 
								
							 
						 
						
							
							
								
								Do not override the default push notification settings ( #6037 )  
							
							
							
						 
						
							2018-05-19 14:45:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									bsky 
								
							 
						 
						
							
							
							
							
								
							
							
								097339b58a 
								
							 
						 
						
							
							
								
								Remove outline ( #7543 )  
							
							
							
						 
						
							2018-05-19 12:16:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f69cb76bf8 
								
							 
						 
						
							
							
								
								Skip pagination logic for pinned account timelines in reducer ( #7540 )  
							
							... 
							
							
							
							Fix  #7516  
						
							2018-05-19 02:51:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MIYAGI Hikaru 
								
							 
						 
						
							
							
							
							
								
							
							
								f291907ae5 
								
							 
						 
						
							
							
								
								Upgrade posix-spawn to master ( #7542 )  
							
							
							
						 
						
							2018-05-19 02:20:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c3fbb857a0 
								
							 
						 
						
							
							
								
								Do not raise delivery failure on 4xx errors, increase stoplight threshold ( #7541 )  
							
							... 
							
							
							
							* Do not raise delivery failure on 4xx errors, increase stoplight threshold
Stoplight failure threshold from 3 to 10
Status code 429 will raise a failure/get retried
* Oops 
							
						 
						
							2018-05-19 00:23:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								72c5d3dd80 
								
							 
						 
						
							
							
								
								Prevent click on video from opening detailed toot  
							
							
							
						 
						
							2018-05-18 17:49:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								b6133837ad 
								
							 
						 
						
							
							
								
								Widen clickable area of toots  
							
							
							
						 
						
							2018-05-18 17:33:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								6a831cd957 
								
							 
						 
						
							
							
								
								Merge pull request  #490  from glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge with tootsuite @ 1de7400dfc 
							
						 
						
							2018-05-18 17:20:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								38117daaa3 
								
							 
						 
						
							
							
								
								ci: Hack around a Travis condition, I guess  
							
							
							
						 
						
							2018-05-18 09:51:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								48d2312c1a 
								
							 
						 
						
							
							
								
								Fix double-encoding of display name in title and e-mails ( #7534 )  
							
							
							
						 
						
							2018-05-18 15:56:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								7ca6a2437c 
								
							 
						 
						
							
							
								
								ci: Bump .travis.yml to 2.5.1  
							
							
							
						 
						
							2018-05-18 08:47:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								3c3e6d0e9b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into merge-upstream  
							
							... 
							
							
							
							Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/controllers/settings/preferences_controller.rb
 	app/lib/user_settings_decorator.rb
 	app/models/user.rb
 	config/locales/simple_form.en.yml 
							
						 
						
							2018-05-18 08:47:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								d6aa91f87d 
								
							 
						 
						
							
							
								
								Merge pull request  #487  from ThibG/glitch-soc/cleanup  
							
							... 
							
							
							
							Remove service worker code that has never been used 
							
						 
						
							2018-05-18 08:37:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								d8666dc595 
								
							 
						 
						
							
							
								
								Change Japanese translation for privacy.private.short ( #7535 )  
							
							... 
							
							
							
							The old translation means "hidden," but it is vague in terms that it does
not specify the scope status is hidden. The new translation is a literal
translation of "Followers-only," without such ambiguity. 
							
						 
						
							2018-05-18 22:30:45 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								7deaadb048 
								
							 
						 
						
							
							
								
								Merge pull request  #488  from ThibG/glitch-soc/features/accounts-custom-emoji  
							
							... 
							
							
							
							[Glitch] Enable custom emojis in profiles 
							
						 
						
							2018-05-18 07:55:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								e6e5d6ca4d 
								
							 
						 
						
							
							
								
								Merge pull request  #489  from ThibG/glitch-soc/features/port-public-ui-changes  
							
							... 
							
							
							
							Port public UI changes from upstream 
							
						 
						
							2018-05-18 07:53:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1de7400dfc 
								
							 
						 
						
							
							
								
								Resolve unknown status from Add activity, skip Remove if unknown ( #7526 )  
							
							... 
							
							
							
							Fix  #7518  
						
							2018-05-18 11:33:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4b5cde3f2d 
								
							 
						 
						
							
							
								
								Use randomized setTimeout when fallback-polling and re-add since_id ( #7522 )  
							
							
							
						 
						
							2018-05-18 02:32:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aeceb63275 
								
							 
						 
						
							
							
								
								Add preference to hide following/followers lists ( #7532 )  
							
							... 
							
							
							
							* Add preference to hide following/followers lists
- Public pages
- ActivityPub collections (does not return pages but does give total)
- REST API (unless it's your own) (does not federate)
Fix  #6901 
* Add preference
* Add delegation
* Fix issue
* Fix issue 
							
						 
						
							2018-05-18 02:26:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								4a3872d26e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-05-18 00:17:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MIYAGI Hikaru 
								
							 
						 
						
							
							
							
							
								
							
							
								7dbf83d6b8 
								
							 
						 
						
							
							
								
								User agent for WebFinger ( #7531 )  
							
							... 
							
							
							
							* User agent for WebFinger
* local_domain → web_domain
* 'http' is away accidentally... 
							
						 
						
							2018-05-18 01:47:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								4c835854d6 
								
							 
						 
						
							
							
								
								[Glitch] Open video modal on public UI  
							
							... 
							
							
							
							Port efc482361b 
							
						 
						
							2018-05-17 18:37:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								1ea94fdaee 
								
							 
						 
						
							
							
								
								[Glitch] Combine similar components into one on public UI  
							
							... 
							
							
							
							Port fa7cdbeb67 
							
						 
						
							2018-05-17 18:37:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								ef620dfadd 
								
							 
						 
						
							
							
								
								[Glitch] Show card modal on public pages  
							
							... 
							
							
							
							Port d006271514 
							
						 
						
							2018-05-17 18:37:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								f4a64b8091 
								
							 
						 
						
							
							
								
								[Glitch] Enable custom emojis in profiles  
							
							... 
							
							
							
							Port 4055ce490c 
							
						 
						
							2018-05-17 15:57:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								717e7d8872 
								
							 
						 
						
							
							
								
								Remove service worker code that has never been used  
							
							
							
						 
						
							2018-05-17 15:39:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								c91bd06fa5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-05-17 11:17:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								db96a5ca80 
								
							 
						 
						
							
							
								
								Ensure unfilled fields are shown when errors are shown ( #7523 )  
							
							... 
							
							
							
							Fix  #7486  
						
							2018-05-17 13:00:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Shuhei Kitagawa 
								
							 
						 
						
							
							
							
							
								
							
							
								6800e195a4 
								
							 
						 
						
							
							
								
								Add tests for account_moderation_notes_controller ( #7524 )  
							
							
							
						 
						
							2018-05-17 04:26:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								71399bf1d5 
								
							 
						 
						
							
							
								
								HTTP signatures spec no longer requires algorithms field ( #7525 )  
							
							... 
							
							
							
							Fix  #7520  
						
							2018-05-17 04:03:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								71a8e10275 
								
							 
						 
						
							
							
								
								Merge pull request  #486  from ThibG/glitch-soc/merge-upstream  
							
							... 
							
							
							
							Merge changes from upstream 
							
						 
						
							2018-05-16 23:10:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								7d5dbed502 
								
							 
						 
						
							
							
								
								Merge branch 'master' into glitch-soc/merge-upstream  
							
							... 
							
							
							
							Conflicts:
	Gemfile
Solved conflicts by using upstream's line for posix-spawn 
							
						 
						
							2018-05-16 21:52:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								d3117e444d 
								
							 
						 
						
							
							
								
								Merge pull request  #405  from ThibG/glitch-soc/features/dm-from-menu  
							
							... 
							
							
							
							[Glitch] Feature: Direct message from menu 
							
						 
						
							2018-05-16 20:17:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								ec8a7b4164 
								
							 
						 
						
							
							
								
								Merge pull request  #485  from ThibG/glitch-soc/fixes/light-theme-textarea-color  
							
							... 
							
							
							
							Fix mastodon-light background color of the composer textarea when posting 
							
						 
						
							2018-05-16 20:16:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								04eeaa0fa4 
								
							 
						 
						
							
							
								
								[Glitch] Reword the direct message warning  
							
							... 
							
							
							
							Port 53c2164e9c 
							
						 
						
							2018-05-16 19:45:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c77a4d8c51 
								
							 
						 
						
							
							
								
								[Glitch] Feature: Direct message from Statuses  
							
							... 
							
							
							
							Port 7a06bd7085 
							
						 
						
							2018-05-16 19:45:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								a8d5a4a74e 
								
							 
						 
						
							
							
								
								[Glitch] Fix issues with sending direct messages from user profile  
							
							... 
							
							
							
							Port 4be5383b91 
							
						 
						
							2018-05-16 19:45:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								c5d2dcb562 
								
							 
						 
						
							
							
								
								[Glitch] Feature: Direct message from menu  
							
							... 
							
							
							
							Port df62fc20bf 
							
						 
						
							2018-05-16 19:45:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thibaut Girka 
								
							 
						 
						
							
							
							
							
								
							
							
								8567ffd27d 
								
							 
						 
						
							
							
								
								Fix mastodon-light background color of the composer textarea when posting  
							
							
							
						 
						
							2018-05-16 19:37:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MIYAGI Hikaru 
								
							 
						 
						
							
							
							
							
								
							
							
								a922fb60f5 
								
							 
						 
						
							
							
								
								Fix posix-spawn to version 0.3.12 ( #7517 )  
							
							... 
							
							
							
							Because 0.3.13 causes build error in x86 or other ILP32 environments.
closes  #7453  
							
						 
						
							2018-05-16 16:52:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Evgeny Petrov 
								
							 
						 
						
							
							
							
							
								
							
							
								e503a61a5a 
								
							 
						 
						
							
							
								
								Russian language for 2.4.0 ( #7512 )  
							
							... 
							
							
							
							* Russian language for 2.4.0
* Russian language for 2.4.0
* bundle exec i18n-tasks normalize
* RU: Updated some strings after new commits appeared 
							
						 
						
							2018-05-16 16:25:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8adcc1d806 
								
							 
						 
						
							
							
								
								Fix images resized in browser getting cropped ( #7514 )  
							
							... 
							
							
							
							Fix  #7487  
						
							2018-05-16 16:24:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Technowix 
								
							 
						 
						
							
							
							
							
								
							
							
								f98e09bfaf 
								
							 
						 
						
							
							
								
								French translation tweaks ( #7513 )  
							
							... 
							
							
							
							- Use more neutral terminology for readability.
- Maintains the use of "Personne" instead of "Utilisateur⋅ice" to emphasis on the "You're not the product".
- Some fixes for accounts. 
							
						 
						
							2018-05-16 23:21:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Quentí 
								
							 
						 
						
							
							
							
							
								
							
							
								b64100c049 
								
							 
						 
						
							
							
								
								[l10n] Occitan update ( #7505 )  
							
							... 
							
							
							
							* Update oc.json
* Update doorkeeper.oc.yml
* Update oc.yml
* Update simple_form.oc.yml
* Update oc.json
Accept is the opp. of reject, I think it's better like this.
* bundle exec i18n-tasks normalize 
							
						 
						
							2018-05-16 23:18:32 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nightpool 
								
							 
						 
						
							
							
							
							
								
							
							
								ebce199209 
								
							 
						 
						
							
							
								
								Update bot preference text ( #7507 )  
							
							... 
							
							
							
							* Update simple_form.en.yml
* fix  #2  
							
						 
						
							2018-05-16 14:47:29 +02:00