356df7ae6b 
					 
					
						
						
							
							Update fabricator for MediaAttachment to attach a file according to type ( #3862 )  
						
						... 
						
						
						
						This fixes a random spec failures since commit
d55f207274 
						
						
					 
					
						2017-06-20 20:40:45 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8f03fdce7f 
					 
					
						
						
							
							Upgrade React Router ( #3677 )  
						
						... 
						
						
						
						* chore(yarn): Remove react-router
* chore(yarn): Remove react-router-scroll
* chore(yarn): Remove history
* chore(yarn): Add react-router-dom
* chore: Remove usages of react-router-scroll
* refactor: Upgrade to react-router-web
* refactor: Use fork of react-router-scroll
This reverts commit 2ddea9a6c8d39fc64b7d0b587f3fbda7a45a7fa2.
* fix: Issues mentions in the PR feedback 
						
						
					 
					
						2017-06-20 20:40:03 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1fc6cb4997 
					 
					
						
						
							
							Do not call setState from unmounted component ( #3853 )  
						
						... 
						
						
						
						Stop an executing task if the component already unmounted. 
						
						
					 
					
						2017-06-20 20:37:09 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						eb832e88f4 
					 
					
						
						
							
							Replace TextIconButton for SensitiveButton to IconButton ( #3759 )  
						
						... 
						
						
						
						* Replace TextIconButton for SensitiveButton to IconButton
* line-height 
						
						
					 
					
						2017-06-20 19:43:09 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b16b69350e 
					 
					
						
						
							
							Fix RTL detection on Ruby side ( #3867 )  
						
						... 
						
						
						
						This fixes below bugs:
* pipe characters being counted as RTL character
* only first word being checked 
						
						
					 
					
						2017-06-20 18:45:09 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						da6fa029f6 
					 
					
						
						
							
							i18n: Fixed typo in Polish translation ( #3864 )  
						
						
						
						
					 
					
						2017-06-20 18:34:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						94ad0706f5 
					 
					
						
						
							
							Don't attach IntersectionObserver for wrapped statuses ( #3863 )  
						
						... 
						
						
						
						This fixes a bug that sometimes boosted statuses being hidden on scrolling.
Previously, we've attached IntersectionObserver twice for boosted statuses:
wrapper Status and wrapped Status. This will call intersection handler twice,
so this may results race condition...probably. 
						
						
					 
					
						2017-06-20 04:12:51 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bf8c2c4348 
					 
					
						
						
							
							Clicking on the CW text should expand the status ( #3855 )  
						
						
						
						
					 
					
						2017-06-20 01:34:10 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						aa58cca040 
					 
					
						
						
							
							Set cursor:pointer only when necessary ( #3857 )  
						
						
						
						
					 
					
						2017-06-19 18:27:07 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5cc7cd8518 
					 
					
						
						
							
							Add Japanese translation "Action taken by" ( #3850 )  
						
						
						
						
					 
					
						2017-06-19 15:12:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ff142eb64d 
					 
					
						
						
							
							setting-for-account-deletable ( #3852 )  
						
						
						
						
					 
					
						2017-06-19 15:12:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						500e28442f 
					 
					
						
						
							
							Re-add disableHostCheck (regression  #3729 ) ( #3854 )  
						
						... 
						
						
						
						ref #2790  
						
						
					 
					
						2017-06-19 14:01:31 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3d13f6ea0c 
					 
					
						
						
							
							Cover Block more ( #3837 )  
						
						
						
						
					 
					
						2017-06-19 11:31:37 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6eefccdacc 
					 
					
						
						
							
							Cover DomainBlock more ( #3838 )  
						
						
						
						
					 
					
						2017-06-19 11:31:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d55f207274 
					 
					
						
						
							
							Cover Export more ( #3840 )  
						
						
						
						
					 
					
						2017-06-19 11:30:27 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cf6fe4f8cb 
					 
					
						
						
							
							Unobserve status on unmount ( #3851 )  
						
						
						
						
					 
					
						2017-06-19 11:29:57 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8d2b3ada80 
					 
					
						
						
							
							Fixes streaming callbacks of HashtagTimeline ( #3849 )  
						
						
						
						
					 
					
						2017-06-19 10:28:35 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f3be605286 
					 
					
						
						
							
							Rename FollowRemoteAccountService to ResolveRemoteAccountService ( #3847 )  
						
						... 
						
						
						
						Rename Activitypub to ActivityPub 
						
						
					 
					
						2017-06-19 01:51:04 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						aebebdc5d1 
					 
					
						
						
							
							Debounce autosuggestions ( #3836 )  
						
						... 
						
						
						
						* Debounce autosuggestions
* Remove duplicate import 
						
						
					 
					
						2017-06-19 01:50:56 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						05e4728de7 
					 
					
						
						
							
							Cover Favourite more ( #3841 )  
						
						
						
						
					 
					
						2017-06-19 01:38:50 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b51945f096 
					 
					
						
						
							
							Spec AccountDomainBlock ( #3816 )  
						
						
						
						
					 
					
						2017-06-18 02:59:49 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1f2abd8d67 
					 
					
						
						
							
							Fix jittery scrolling for Chromium browsers ( #3776 ) ( #3832 )  
						
						
						
						
					 
					
						2017-06-18 02:59:29 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1d9f9352a6 
					 
					
						
						
							
							handle resize in a debounce() ( #3834 )  
						
						
						
						
					 
					
						2017-06-18 02:57:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						53e42bf91e 
					 
					
						
						
							
							Upgrade Webpacker to version 2.0 ( #3729 )  
						
						
						
						
					 
					
						2017-06-18 02:57:09 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						74d10b9b9d 
					 
					
						
						
							
							Spec UserMailer ( #3757 )  
						
						
						
						
					 
					
						2017-06-17 01:15:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2356580cee 
					 
					
						
						
							
							Use cross-env for npm run on Windows ( #3789 )  
						
						
						
						
					 
					
						2017-06-17 01:14:42 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1840a352f5 
					 
					
						
						
							
							Fix ogp url ( #3802 )  
						
						
						
						
					 
					
						2017-06-16 22:38:26 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c93d0978f2 
					 
					
						
						
							
							Upgrade react-immutable-pure-component to version 1.0.0 ( #3786 )  
						
						
						
						
					 
					
						2017-06-16 01:46:12 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						df4f4e94b3 
					 
					
						
						
							
							Add alt attribute to ImageLoader ( #3765 )  
						
						
						
						
					 
					
						2017-06-15 14:10:41 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						51b2f789bd 
					 
					
						
						
							
							Fix   #3633  by not spawning RemoteProfileUpdateWorker from FetchRemoteAccountService ( #3642 )  
						
						
						
						
					 
					
						2017-06-15 11:04:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						947887f261 
					 
					
						
						
							
							Bump version to 1.4.3  
						
						
						
						
					 
					
						2017-06-15 03:03:42 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6f34fdb616 
					 
					
						
						
							
							updated Polish translation ( #3751 )  
						
						... 
						
						
						
						Signed-off-by: Marcin Mikołajczak <me@m4sk.in > 
						
						
					 
					
						2017-06-15 02:00:23 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bb911043de 
					 
					
						
						
							
							Fix regression from  #3748  - properly set defaultColumns ( #3750 )  
						
						
						
						
					 
					
						2017-06-14 23:07:06 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						da0333f1cb 
					 
					
						
						
							
							Add Japanese translation for Account deletion ( #3747 )  
						
						
						
						
					 
					
						2017-06-14 22:00:08 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						98eacb2238 
					 
					
						
						
							
							i18n: updated Polish translation ( #3744 )  
						
						
						
						
					 
					
						2017-06-14 20:08:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						80c13bf0ef 
					 
					
						
						
							
							Save settings when they are changed ( #3743 )  
						
						
						
						
					 
					
						2017-06-14 18:59:02 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a208e7d655 
					 
					
						
						
							
							Update React to version v15.6 ( #3736 )  
						
						
						
						
					 
					
						2017-06-14 16:16:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c1b9ae7fc2 
					 
					
						
						
							
							Enable useBuiltIns option of transform-object-rest-spread ( #3737 )  
						
						
						
						
					 
					
						2017-06-14 13:42:00 +02:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0f52e42c2d 
					 
					
						
						
							
							fix(status): Content jump due to height changes ( #3734 )  
						
						
						
						
					 
					
						2017-06-13 20:46:21 +02:00