fef478781d 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						 
						
						
						
						
					 
					
						2017-04-07 22:21:21 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d4c94fa004 
					 
					
						
						
							
							DRY up reblog vs original status check  
						
						 
						
						... 
						
						
						
						Checking reblog vs original status was happening in multiple places
across the app. For views, this logic was encapsulated in a helper
method named `proper_status` but in the other layers of the app, the
logic was duplicated.
Because the logic is used at all layers of the app, we extracted it into
a `Status#proper` method on the model and changed all uses of the logic
to use this method. There is now a single source of truth for this
condition.
We added test coverage to untested methods that got refactored. 
						
						
					 
					
						2017-04-07 14:18:30 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bf7cefa516 
					 
					
						
						
							
							Merge branch 'master' into master  
						
						 
						
						
						
						
					 
					
						2017-04-05 20:28:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0700521ef3 
					 
					
						
						
							
							added Esperanto (eo)  
						
						 
						
						
						
						
					 
					
						2017-04-03 20:22:50 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ae95f35fe6 
					 
					
						
						
							
							add finnish translation  
						
						 
						
						... 
						
						
						
						add finnish translation 
						
						
					 
					
						2017-04-03 13:34:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						efbbd42216 
					 
					
						
						
							
							Fix style issue  
						
						 
						
						
						
						
					 
					
						2017-03-26 13:13:41 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d5d5afff9c 
					 
					
						
						
							
							🌐  add simplified chinese language  
						
						 
						
						
						
						
					 
					
						2017-03-26 14:13:18 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2816b1bf8e 
					 
					
						
						
							
							Federate header images, fix open-uri http->https redirection error  
						
						 
						
						
						
						
					 
					
						2017-03-18 22:51:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d180aaa2a7 
					 
					
						
						
							
							Fix   #186  - Add RTL support to the compose form textarea and statuses output  
						
						 
						
						
						
						
					 
					
						2017-02-28 01:52:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f2931af61e 
					 
					
						
						
							
							Quick fix for avatars with the same URL not being perceived as updated and in need of re-download  
						
						 
						
						
						
						
					 
					
						2017-02-17 01:50:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f722aa8c75 
					 
					
						
						
							
							Fix Salmon issue  
						
						 
						
						
						
						
					 
					
						2017-02-16 01:59:34 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2d8a4c4390 
					 
					
						
						
							
							Add "next" link to Atom feeds  
						
						 
						
						
						
						
					 
					
						2017-02-13 15:38:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						720ff55262 
					 
					
						
						
							
							Adding more unit tests. Fixing Salmon slaps XML  
						
						 
						
						
						
						
					 
					
						2017-02-12 17:30:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						50660d54e8 
					 
					
						
						
							
							Fix semantics of follow requests another slaps  
						
						 
						
						
						
						
					 
					
						2017-02-11 17:13:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						149887a0ff 
					 
					
						
						
							
							Make follow requests federate  
						
						 
						
						
						
						
					 
					
						2017-02-11 02:58:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						942a2e7d68 
					 
					
						
						
							
							Fix reblogs not having content warnings forwarded  
						
						 
						
						
						
						
					 
					
						2017-02-08 18:05:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3beb24ad55 
					 
					
						
						
							
							Use <summary> to encode content warnings instead  
						
						 
						
						
						
						
					 
					
						2017-01-25 16:53:30 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						999cde94a6 
					 
					
						
						
							
							Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text  
						
						 
						
						... 
						
						
						
						Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" />
Clean up schema file from accidental development migrations 
						
						
					 
					
						2017-01-25 01:29:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						bf0f6eb62d 
					 
					
						
						
							
							Implement a click-to-view spoiler system  
						
						 
						
						
						
						
					 
					
						2017-01-23 21:07:40 -05:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b11fdc3ae3 
					 
					
						
						
							
							Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings  
						
						 
						
						... 
						
						
						
						with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage 
						
						
					 
					
						2017-01-12 20:46:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						23ebf60b95 
					 
					
						
						
							
							Improve initialState loading  
						
						 
						
						
						
						
					 
					
						2017-01-09 12:37:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1bfbce7b45 
					 
					
						
						
							
							Clean up h-card mess of divs  
						
						 
						
						
						
						
					 
					
						2017-01-06 20:24:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						49834a6e7f 
					 
					
						
						
							
							Add API for retrieving blocked accounts  
						
						 
						
						
						
						
					 
					
						2016-12-29 20:12:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d7dc84439c 
					 
					
						
						
							
							Add ability to use remote follow function on other sites  
						
						 
						
						
						
						
					 
					
						2016-12-29 16:54:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3689c119f0 
					 
					
						
						
							
							Replacing follow requests in the settings area with in-UI column  
						
						 
						
						
						
						
					 
					
						2016-12-26 21:33:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						004382e4d0 
					 
					
						
						
							
							Adding follow requests API  
						
						 
						
						
						
						
					 
					
						2016-12-26 19:30:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b302b9202b 
					 
					
						
						
							
							Add page for authorizing/rejecting follow requests  
						
						 
						
						
						
						
					 
					
						2016-12-23 00:04:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c4bc5c8930 
					 
					
						
						
							
							Federated profile bio now formatted  
						
						 
						
						
						
						
					 
					
						2016-12-21 19:10:19 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5ae1b39ec9 
					 
					
						
						
							
							Adjusting public display of statuses to look similar to logged-in UI,  
						
						 
						
						... 
						
						
						
						fix  #361  with rich OEmbed display via iframe, fix  #237  by hiding sensitive
content behind a spoiler on public pages 
						
						
					 
					
						2016-12-18 19:47:11 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						76ec907993 
					 
					
						
						
							
							Improved admin UI  
						
						 
						
						
						
						
					 
					
						2016-12-13 13:42:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e90fcb46e3 
					 
					
						
						
							
							Sensitive content federates using the "nsfw" hashtag  
						
						 
						
						
						
						
					 
					
						2016-12-11 22:49:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d2ab41aea4 
					 
					
						
						
							
							Declare Ukrainian  
						
						 
						
						... 
						
						
						
						Closes : #345  
						
						
					 
					
						2016-12-08 18:57:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						f763e844e8 
					 
					
						
						
							
							Do not use expiring links after all  
						
						 
						
						
						
						
					 
					
						2016-12-04 13:02:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						24e692b0cf 
					 
					
						
						
							
							Set a specific S3 expiration time so that files can be cached  
						
						 
						
						
						
						
					 
					
						2016-12-04 12:58:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						80c44ed9c1 
					 
					
						
						
							
							Do not autoplay videos, display play button instead. Use expiring links when using S3. Do not keep originals  
						
						 
						
						... 
						
						
						
						for avatars/headers, resize avatars down to 120x120 instead of 300x300. Set cache headers on S3 stuff, also
make it private (aka only accessible via expiring links to prevent hotlinking) 
						
						
					 
					
						2016-12-04 12:28:10 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1d0321fc45 
					 
					
						
						
							
							Fix pt translations, improve pre-cache queries, removing will_paginate  
						
						 
						
						... 
						
						
						
						from accounts/tags because it's a terribly inefficient way to paginate
large sets of data 
						
						
					 
					
						2016-12-01 16:26:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6ff93845d5 
					 
					
						
						
							
							Add basic OEmbed provider API,  fix   #247  
						
						 
						
						
						
						
					 
					
						2016-11-30 23:01:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						14bd46946d 
					 
					
						
						
							
							Per-status control for unlisted mode, also federation for unlisted mode  
						
						 
						
						... 
						
						
						
						Fix  #233 , fix  #268  
						
						
					 
					
						2016-11-30 21:34:59 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						356d3874eb 
					 
					
						
						
							
							Normalize localizations, add stub for admin/accounts  
						
						 
						
						
						
						
					 
					
						2016-11-30 15:32:26 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ff21ff1489 
					 
					
						
						
							
							Make User#current_sign_in_at actually track when user was last active,  
						
						 
						
						... 
						
						
						
						by updating it at least every 24h if the user visits the site 
						
						
					 
					
						2016-11-30 15:17:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5973ca3d11 
					 
					
						
						
							
							Upgrade Paperclip to 5, AWS-SDK to 2, do not generate medium/small versions of avatars  
						
						 
						
						
						
						
					 
					
						2016-11-29 14:20:15 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						27fc49d745 
					 
					
						
						
							
							Add simple admin overview of PuSH subscriptions  
						
						 
						
						
						
						
					 
					
						2016-11-28 18:45:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						66ab0d0d56 
					 
					
						
						
							
							Enabling portuguese and hungarian translations, which are awfully incomplete  
						
						 
						
						
						
						
					 
					
						2016-11-28 13:55:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						115ce90578 
					 
					
						
						
							
							Adding French locale to settings_helper.rb  
						
						 
						
						
						
						
					 
					
						2016-11-22 10:20:28 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						39533190c2 
					 
					
						
						
							
							Display human names of locales in dropdown  
						
						 
						
						
						
						
					 
					
						2016-11-19 00:19:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						01e43c3e57 
					 
					
						
						
							
							Adding react-intl i18n to the frontend. No translations yet  
						
						 
						
						
						
						
					 
					
						2016-11-16 17:20:52 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3ce6ac0ce2 
					 
					
						
						
							
							Adding some localizations  
						
						 
						
						
						
						
					 
					
						2016-11-15 23:02:57 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						fdc17bea58 
					 
					
						
						
							
							Fix rubocop issues, introduce usage of frozen literal to improve performance  
						
						 
						
						
						
						
					 
					
						2016-11-15 16:56:29 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d14967e1c8 
					 
					
						
						
							
							Fix URL configuration when S3 is enabled  
						
						 
						
						
						
						
					 
					
						2016-11-06 20:43:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						48b9619439 
					 
					
						
						
							
							Adding hashtags  
						
						 
						
						
						
						
					 
					
						2016-11-05 17:13:14 +01:00