Thor Harald Johansen 
								
							 
						 
						
							
							
								
							
							
	1f5ff46fd9  
						 
						
							
							
								
								
								Working translation for Norwegian. ( #1611 )  
							
							
							
							
						 
						
							2017-04-12 17:07:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
							
							
	13528f50c3  
						 
						
							
							
								
								
								Params compact deprecation warning ( #1580 )  
							
							... 
							
							
							
							
							* Move filter_link_to class formation to separate method in admin/accounts helper
* Remove deprecated #compact method usage on strong parameters 
							
						 
						
							2017-04-12 16:12:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
							
							
	dd1ae3b109  
						 
						
							
							
								
								
								Simplify the way the embed view is created ( #1590 )  
							
							... 
							
							
							
							
							* Add coverage for embedded status view
* Refactor embed view to eliminate @external_links variable 
							
						 
						
							2017-04-12 16:12:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Koala Yeung 
								
							 
						 
						
							
							
								
							
							
	24eb45425e  
						 
						
							
							
								
								
								Add Traditional Chinese, Hong Kong translation (zh-HK) ( #1544 )  
							
							... 
							
							
							
							
							* Added Chinese Traditional Hong Kong (zh-HK) for Ruby
* Added translations for Ruby.
* Added Chinese Traditional Hong Kong (zh-HK) for JS
* Added translations for javascript code.
* Rearrange language references in mastodon.jsx
* Break `addLocaleData` into multiple lines. Make future commit more readable.
* Roughly re-sort the languages in alphabetical orders
  (only manually put English on top because it is default).
* Sort application.rb locale with alphabetical order
With exception that English (default language) goes first.
Improve code readability.
* Resort language selection box alphabetically
Sort HUMAN_LOCALES in the alphabetical order of display name
(except English, the default language, come first).
Improve usability. 
							
						 
						
							2017-04-12 08:50:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									pinfort 
								
							 
						 
						
							
							
								
							
							
	6f5268b02d  
						 
						
							
							
								
								
								Add Japanese translation ( #1552 )  
							
							... 
							
							
							
							
							* add device.ja.yml
* update device.ja.yml
* add file simple_form.ja.yml
* 👍 Added doorkeeper.ja.yml
* add ja.yml
* Update doorkeeper.ja.yml
fixed url to uri
* update ja.yml
* fix some translations
* fix japanese grammar of a translate
* fix some translates
* fix ja.yml
* add ja.jsx
* add Japanese user mail views
* Added japanese translate locales
* Added :ja to available_locales
こっちも
* Added "日本語" to HUMAN_LOCALES
* Imported/Added ja to addLocaleData
* update ja.jsx 
							
						 
						
							2017-04-11 21:52:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
							
							
	e60286a344  
						 
						
							
							
								
								
								Remove unused methods from StreamEntriesHelper ( #1365 )  
							
							... 
							
							
							
							
							Removes:
- avatar_for_status_url
- relative_time
- reblogged_by_me_class
- favourited_by_me_class 
							
						 
						
							2017-04-11 19:32:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
							
							
	53850bce93  
						 
						
							
							
								
								
								Remove unused AtomBuilderHelper ( #1364 )  
							
							... 
							
							
							
							
							This was used in the views/atom/user_stream.xml.ruby file, which no longer is
used. 
							
						 
						
							2017-04-11 19:31:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
							
							
	4ada50985a  
						 
						
							
							
								
								
								Pagination improvements ( #1445 )  
							
							... 
							
							
							
							
							* Replace will_paginate with kaminari
* Use #page instead of #paginate in controllers
* Replace will_paginate.page_gap with pagination.truncate in i18n
* Customize kaminari views to match prior styles
* Set kaminari options to match prior behavior
* Replace will_paginate with paginate in views 
							
						 
						
							2017-04-11 01:11:41 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
							
							
	0687ab8ae3  
						 
						
							
							
								
								
								Clean up generation of account webfinger string ( #1477 )  
							
							... 
							
							
							
							
							* Consolidate webfinger string creation under Account#to_webfinger_s
* Introduce Account#local_username_and_domain for consolidation 
							
						 
						
							2017-04-10 22:58:06 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ratmir Karabut 
								
							 
						 
						
							
							
								
							
							
	9043b32183  
						 
						
							
							
								
								
								Add Russian translation (ru) ( #1023 )  
							
							... 
							
							
							
							
							* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency 
							
						 
						
							2017-04-10 12:52:06 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
							
							
	ea6c930c04  
						 
						
							
							
								
								
								Helper cleanup ( #1348 )  
							
							... 
							
							
							
							
							* Remove unused helper files
* Add coverage for application helper
* Add coverage for StreamEntriesHelper #display_name 
							
						 
						
							2017-04-09 17:11:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
								
							
							
	ca44c13455  
						 
						
							
							
								
								
								Use Setting.site_title value for og:site_name occurrences ( #1194 )  
							
							... 
							
							
							
							
							* Add helper method to return Setting.site_title
* Use site_title helper in application layout
* Use site_title value for og:site_name 
							
						 
						
							2017-04-08 12:15:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Shel R 
								
							 
						 
						
							
							
								
							
							
	fef478781d  
						 
						
							
							
								
								
								Merge branch 'master' into master  
							
							
							
							
						 
						
							2017-04-07 22:21:21 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Joël Quenneville 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									André Lewin 
								
							 
						 
						
							
							
								
							
							
	bf7cefa516  
						 
						
							
							
								
								
								Merge branch 'master' into master  
							
							
							
							
						 
						
							2017-04-05 20:28:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									axolotl 
								
							 
						 
						
							
							
								
							
							
	0700521ef3  
						 
						
							
							
								
								
								added Esperanto (eo)  
							
							
							
							
						 
						
							2017-04-03 20:22:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									JantsoP 
								
							 
						 
						
							
							
								
							
							
	ae95f35fe6  
						 
						
							
							
								
								
								add finnish translation  
							
							... 
							
							
							
							
							add finnish translation 
							
						 
						
							2017-04-03 13:34:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	efbbd42216  
						 
						
							
							
								
								
								Fix style issue  
							
							
							
							
						 
						
							2017-03-26 13:13:41 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									leopku 
								
							 
						 
						
							
							
								
							
							
	d5d5afff9c  
						 
						
							
							
								
								
								🌐  add simplified chinese language  
							
							
							
							
						 
						
							2017-03-26 14:13:18 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	2816b1bf8e  
						 
						
							
							
								
								
								Federate header images, fix open-uri http->https redirection error  
							
							
							
							
						 
						
							2017-03-18 22:51:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	d180aaa2a7  
						 
						
							
							
								
								
								Fix   #186  - Add RTL support to the compose form textarea and statuses output  
							
							
							
							
						 
						
							2017-02-28 01:52:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	f722aa8c75  
						 
						
							
							
								
								
								Fix Salmon issue  
							
							
							
							
						 
						
							2017-02-16 01:59:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	2d8a4c4390  
						 
						
							
							
								
								
								Add "next" link to Atom feeds  
							
							
							
							
						 
						
							2017-02-13 15:38:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	720ff55262  
						 
						
							
							
								
								
								Adding more unit tests. Fixing Salmon slaps XML  
							
							
							
							
						 
						
							2017-02-12 17:30:15 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	50660d54e8  
						 
						
							
							
								
								
								Fix semantics of follow requests another slaps  
							
							
							
							
						 
						
							2017-02-11 17:13:11 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	149887a0ff  
						 
						
							
							
								
								
								Make follow requests federate  
							
							
							
							
						 
						
							2017-02-11 02:58:00 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
								
							
							
	942a2e7d68  
						 
						
							
							
								
								
								Fix reblogs not having content warnings forwarded  
							
							
							
							
						 
						
							2017-02-08 18:05:46 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	3beb24ad55  
						 
						
							
							
								
								
								Use <summary> to encode content warnings instead  
							
							
							
							
						 
						
							2017-01-25 16:53:30 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									blackle 
								
							 
						 
						
							
							
								
							
							
	bf0f6eb62d  
						 
						
							
							
								
								
								Implement a click-to-view spoiler system  
							
							
							
							
						 
						
							2017-01-23 21:07:40 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	23ebf60b95  
						 
						
							
							
								
								
								Improve initialState loading  
							
							
							
							
						 
						
							2017-01-09 12:37:53 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	1bfbce7b45  
						 
						
							
							
								
								
								Clean up h-card mess of divs  
							
							
							
							
						 
						
							2017-01-06 20:24:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	49834a6e7f  
						 
						
							
							
								
								
								Add API for retrieving blocked accounts  
							
							
							
							
						 
						
							2016-12-29 20:12:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	d7dc84439c  
						 
						
							
							
								
								
								Add ability to use remote follow function on other sites  
							
							
							
							
						 
						
							2016-12-29 16:54:54 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	3689c119f0  
						 
						
							
							
								
								
								Replacing follow requests in the settings area with in-UI column  
							
							
							
							
						 
						
							2016-12-26 21:33:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	004382e4d0  
						 
						
							
							
								
								
								Adding follow requests API  
							
							
							
							
						 
						
							2016-12-26 19:30:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	b302b9202b  
						 
						
							
							
								
								
								Add page for authorizing/rejecting follow requests  
							
							
							
							
						 
						
							2016-12-23 00:04:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	c4bc5c8930  
						 
						
							
							
								
								
								Federated profile bio now formatted  
							
							
							
							
						 
						
							2016-12-21 19:10:19 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	76ec907993  
						 
						
							
							
								
								
								Improved admin UI  
							
							
							
							
						 
						
							2016-12-13 13:42:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	e90fcb46e3  
						 
						
							
							
								
								
								Sensitive content federates using the "nsfw" hashtag  
							
							
							
							
						 
						
							2016-12-11 22:49:25 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Makar 
								
							 
						 
						
							
							
								
							
							
	d2ab41aea4  
						 
						
							
							
								
								
								Declare Ukrainian  
							
							... 
							
							
							
							
							Closes : #345  
						
							2016-12-08 18:57:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	f763e844e8  
						 
						
							
							
								
								
								Do not use expiring links after all  
							
							
							
							
						 
						
							2016-12-04 13:02:43 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	24e692b0cf  
						 
						
							
							
								
								
								Set a specific S3 expiration time so that files can be cached  
							
							
							
							
						 
						
							2016-12-04 12:58:35 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	6ff93845d5  
						 
						
							
							
								
								
								Add basic OEmbed provider API,  fix   #247  
							
							
							
							
						 
						
							2016-11-30 23:01:03 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	14bd46946d  
						 
						
							
							
								
								
								Per-status control for unlisted mode, also federation for unlisted mode  
							
							... 
							
							
							
							
							Fix  #233 , fix  #268  
						
							2016-11-30 21:34:59 +01:00