masarakki 
								
							 
						 
						
							
							
							
							
								
							
							
								ff142eb64d 
								
							 
						 
						
							
							
								
								setting-for-account-deletable ( #3852 )  
							
							
							
						 
						
							2017-06-19 15:12:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								500e28442f 
								
							 
						 
						
							
							
								
								Re-add disableHostCheck (regression  #3729 ) ( #3854 )  
							
							... 
							
							
							
							ref #2790  
							
						 
						
							2017-06-19 14:01:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daigo 3 Dango 
								
							 
						 
						
							
							
							
							
								
							
							
								5bd3715a4c 
								
							 
						 
						
							
							
								
								Link to /about from public page on a single user instance ( #3814 )  
							
							... 
							
							
							
							There was no link for visitors to follow to see the about page. 
							
						 
						
							2017-06-19 11:32:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki (@fn_aki@pawoo.net) 
								
							 
						 
						
							
							
							
							
								
							
							
								3d13f6ea0c 
								
							 
						 
						
							
							
								
								Cover Block more ( #3837 )  
							
							
							
						 
						
							2017-06-19 11:31:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki (@fn_aki@pawoo.net) 
								
							 
						 
						
							
							
							
							
								
							
							
								6eefccdacc 
								
							 
						 
						
							
							
								
								Cover DomainBlock more ( #3838 )  
							
							
							
						 
						
							2017-06-19 11:31:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Gô Shoemake 
								
							 
						 
						
							
							
							
							
								
							
							
								29a22691d2 
								
							 
						 
						
							
							
								
								Fix character/grapheme count stuff ( #3839 )  
							
							... 
							
							
							
							* Bring Toot button in line with counter
Both should use stringz I guess
* Use grapheme_length for character count 
							
						 
						
							2017-06-19 11:31:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki (@fn_aki@pawoo.net) 
								
							 
						 
						
							
							
							
							
								
							
							
								d55f207274 
								
							 
						 
						
							
							
								
								Cover Export more ( #3840 )  
							
							
							
						 
						
							2017-06-19 11:30:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alpaca-tc 
								
							 
						 
						
							
							
							
							
								
							
							
								cf6fe4f8cb 
								
							 
						 
						
							
							
								
								Unobserve status on unmount ( #3851 )  
							
							
							
						 
						
							2017-06-19 11:29:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									spla 
								
							 
						 
						
							
							
							
							
								
							
							
								4367443287 
								
							 
						 
						
							
							
								
								Added new Catalan strings ( #3843 )  
							
							... 
							
							
							
							* Add Catalan language
* Add Catalan language
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update settings_helper.rb
* Update mastodon.js
* Update index.js
* Update application.rb
* Update ca.yml
* removed extra spaces at line 225
* Catalan translation update
added activerecord.ca.yml
* Update activerecord.ca.yml
Done
* Updated activerecord.ca.yml
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Update ca.json
Removed :
<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master 
							
						 
						
							2017-06-19 10:29:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									alpaca-tc 
								
							 
						 
						
							
							
							
							
								
							
							
								8d2b3ada80 
								
							 
						 
						
							
							
								
								Fixes streaming callbacks of HashtagTimeline ( #3849 )  
							
							
							
						 
						
							2017-06-19 10:28:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f3be605286 
								
							 
						 
						
							
							
								
								Rename FollowRemoteAccountService to ResolveRemoteAccountService ( #3847 )  
							
							... 
							
							
							
							Rename Activitypub to ActivityPub 
							
						 
						
							2017-06-19 01:51:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								aebebdc5d1 
								
							 
						 
						
							
							
								
								Debounce autosuggestions ( #3836 )  
							
							... 
							
							
							
							* Debounce autosuggestions
* Remove duplicate import 
							
						 
						
							2017-06-19 01:50:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki (@fn_aki@pawoo.net) 
								
							 
						 
						
							
							
							
							
								
							
							
								05e4728de7 
								
							 
						 
						
							
							
								
								Cover Favourite more ( #3841 )  
							
							
							
						 
						
							2017-06-19 01:38:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki (@fn_aki@pawoo.net) 
								
							 
						 
						
							
							
							
							
								
							
							
								b51945f096 
								
							 
						 
						
							
							
								
								Spec AccountDomainBlock ( #3816 )  
							
							
							
						 
						
							2017-06-18 02:59:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								1f2abd8d67 
								
							 
						 
						
							
							
								
								Fix jittery scrolling for Chromium browsers ( #3776 ) ( #3832 )  
							
							
							
						 
						
							2017-06-18 02:59:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								1d9f9352a6 
								
							 
						 
						
							
							
								
								handle resize in a debounce() ( #3834 )  
							
							
							
						 
						
							2017-06-18 02:57:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								53e42bf91e 
								
							 
						 
						
							
							
								
								Upgrade Webpacker to version 2.0 ( #3729 )  
							
							
							
						 
						
							2017-06-18 02:57:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									nightpool 
								
							 
						 
						
							
							
							
							
								
							
							
								94d0e012de 
								
							 
						 
						
							
							
								
								Whitelist allowed classes for federated statuses ( #3810 )  
							
							... 
							
							
							
							* Whitelist allowed classes for federated statuses
Allowed classes are currently:
 - Any microformats class (h/p/u/dt/e-*)
 - the classes mention, hashtag, ellipses and invisible.
this last one is somewhat suspect, but Mastodon currently uses it to render hidden link text.
resolved  #3790 
* Fix code style 
							
						 
						
							2017-06-17 20:26:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Quent-in 
								
							 
						 
						
							
							
							
							
								
							
							
								8fd931dc12 
								
							 
						 
						
							
							
								
								l10n update for account deletion  ( #3820 )  
							
							... 
							
							
							
							* l10n update for acount deletion
* l10n little change
* l10n little changes
Less passive voice, more natural.
* Update oc.yml
Correction, " added 
							
						 
						
							2017-06-17 20:21:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki (@fn_aki@pawoo.net) 
								
							 
						 
						
							
							
							
							
								
							
							
								74d10b9b9d 
								
							 
						 
						
							
							
								
								Spec UserMailer ( #3757 )  
							
							
							
						 
						
							2017-06-17 01:15:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								2356580cee 
								
							 
						 
						
							
							
								
								Use cross-env for npm run on Windows ( #3789 )  
							
							
							
						 
						
							2017-06-17 01:14:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									abcang 
								
							 
						 
						
							
							
							
							
								
							
							
								1840a352f5 
								
							 
						 
						
							
							
								
								Fix ogp url ( #3802 )  
							
							
							
						 
						
							2017-06-16 22:38:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								c93d0978f2 
								
							 
						 
						
							
							
								
								Upgrade react-immutable-pure-component to version 1.0.0 ( #3786 )  
							
							
							
						 
						
							2017-06-16 01:46:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								df4f4e94b3 
								
							 
						 
						
							
							
								
								Add alt attribute to ImageLoader ( #3765 )  
							
							
							
						 
						
							2017-06-15 14:10:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
							
							
								
							
							
								51b2f789bd 
								
							 
						 
						
							
							
								
								Fix   #3633  by not spawning RemoteProfileUpdateWorker from FetchRemoteAccountService ( #3642 )  
							
							
							
						 
						
							2017-06-15 11:04:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								947887f261 
								
							 
						 
						
							
							
								
								Bump version to 1.4.3  
							
							
							
						 
						
							2017-06-15 03:03:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								6f34fdb616 
								
							 
						 
						
							
							
								
								updated Polish translation ( #3751 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-06-15 02:00:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8518d005fd 
								
							 
						 
						
							
							
								
								Fix regression from  #3490  - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous ( #3752 )  
							
							
							
						 
						
							2017-06-15 02:00:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								bb911043de 
								
							 
						 
						
							
							
								
								Fix regression from  #3748  - properly set defaultColumns ( #3750 )  
							
							
							
						 
						
							2017-06-14 23:07:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								da0333f1cb 
								
							 
						 
						
							
							
								
								Add Japanese translation for Account deletion ( #3747 )  
							
							
							
						 
						
							2017-06-14 22:00:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								d8a0ee1956 
								
							 
						 
						
							
							
								
								Fix merge default columns ( #3748 )  
							
							... 
							
							
							
							mergeDeep also merges columns, but it should be replaced simply.
So in the new function, first apply mergeDeep except columns, and set default columns if columns unset. 
							
						 
						
							2017-06-14 21:59:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								91c71471ab 
								
							 
						 
						
							
							
								
								Fix account delete form not accepting password, update suspended ( #3745 )  
							
							... 
							
							
							
							account before removing content for quicker feedback to end-users 
							
						 
						
							2017-06-14 20:30:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								98eacb2238 
								
							 
						 
						
							
							
								
								i18n: updated Polish translation ( #3744 )  
							
							
							
						 
						
							2017-06-14 20:08:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								80c13bf0ef 
								
							 
						 
						
							
							
								
								Save settings when they are changed ( #3743 )  
							
							
							
						 
						
							2017-06-14 18:59:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e17c2e5da5 
								
							 
						 
						
							
							
								
								Batched remove status service ( #3735 )  
							
							... 
							
							
							
							* Make Pubsubhubbub::DistributionWorker handle both single stream entry
arguments, as well as arrays of stream entries
* Add BatchedRemoveStatusService, make SuspendAccountService use it
* Improve method names
* Add test
* Add more tests
* Use PuSH payloads of 100 to have a clear mapping of
1000 input statuses -> 10 PuSH payloads
It was nice while it lasted 
							
						 
						
							2017-06-14 18:01:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4a618908e8 
								
							 
						 
						
							
							
								
								Account deletion ( #3728 )  
							
							... 
							
							
							
							* Add form for account deletion
* If avatar or header are gone from source, remove them
* Add option to have SuspendAccountService remove user record, add tests
* Exclude suspended accounts from search 
							
						 
						
							2017-06-14 18:01:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								a208e7d655 
								
							 
						 
						
							
							
								
								Update React to version v15.6 ( #3736 )  
							
							
							
						 
						
							2017-06-14 16:16:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								c1b9ae7fc2 
								
							 
						 
						
							
							
								
								Enable useBuiltIns option of transform-object-rest-spread ( #3737 )  
							
							
							
						 
						
							2017-06-14 13:42:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								dc8a6244fc 
								
							 
						 
						
							
							
								
								Fix   #2619  - When redis feed is empty, fall back to database ( #3721 )  
							
							... 
							
							
							
							* Fix  #2619  - When redis feed is empty, fall back to database
* Use redis value to return feed from database only while RegenerationWorker
hasn't finished running
* Fix specs
* Replace usage of reject! 
							
						 
						
							2017-06-14 13:37:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
							
							
								
							
							
								0f52e42c2d 
								
							 
						 
						
							
							
								
								fix(status): Content jump due to height changes ( #3734 )  
							
							
							
						 
						
							2017-06-13 20:46:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								85af2405cf 
								
							 
						 
						
							
							
								
								Exclude packs/custom.js from webpack compilation to prevent breakage ( #3719 )  
							
							... 
							
							
							
							due to the change in #3373  
							
						 
						
							2017-06-13 03:55:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								47ace633dc 
								
							 
						 
						
							
							
								
								Simplify getting started links localization. Link "powered by Mastodon" to joinmastodon.org ( #3725 )  
							
							
							
						 
						
							2017-06-13 03:55:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								85d5518b6b 
								
							 
						 
						
							
							
								
								Fix   #3675  - Adjust quality settings of converted GIFs to reduce filesize ( #3723 )  
							
							
							
						 
						
							2017-06-13 00:51:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5104bd7988 
								
							 
						 
						
							
							
								
								Fix unclickable onboardin modal regression ( #3724 )  
							
							
							
						 
						
							2017-06-13 00:39:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								3e425b51fd 
								
							 
						 
						
							
							
								
								i18n: minor fix in Polish translation ( #3726 )  
							
							... 
							
							
							
							* i18n: minor fix in Polish translation
* i18n 
							
						 
						
							2017-06-12 23:55:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								37dbfa4cd7 
								
							 
						 
						
							
							
								
								Unread indicator was invisible behind column header, adjusted ( #3720 )  
							
							... 
							
							
							
							* Unread indicator was invisible behind column header, adjusted
* Unread indicator now a CSS pseudo-element
* Adjust flex 
							
						 
						
							2017-06-12 20:02:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ratmir Karabut 
								
							 
						 
						
							
							
							
							
								
							
							
								0d23c81662 
								
							 
						 
						
							
							
								
								Update Russian translation (pin) ( #3712 )  
							
							... 
							
							
							
							* Update Russian translation (pin) 
							
						 
						
							2017-06-12 12:53:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								b436b31d5a 
								
							 
						 
						
							
							
								
								Regenerate defaultMessages.json ( #3709 )  
							
							... 
							
							
							
							follow up #3564  
							
						 
						
							2017-06-12 12:41:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								72133fbed6 
								
							 
						 
						
							
							
								
								Re-add clear notifications button ( #3708 )  
							
							... 
							
							
							
							* Re-add clear notifications button
* remove connect() in column_settings
* one line
* remove unused props 
							
						 
						
							2017-06-12 12:26:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								abbdacedc5 
								
							 
						 
						
							
							
								
								Fix locale related specs ( #3707 )  
							
							... 
							
							
							
							* Use I18n.locale instead of ":en"
* Reset I18n.locale value after locale changing tests 
							
						 
						
							2017-06-12 10:58:03 +02:00