Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4bd1403368 
								
							 
						 
						
							
							
								
								Bump version to 2.3.0rc1  
							
							
							
						 
						
							2018-03-01 20:50:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c421ad685d 
								
							 
						 
						
							
							
								
								Add contact_account and languages to instance API ( #6574 )  
							
							
							
						 
						
							2018-03-01 20:48:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								a6d10b05f6 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #6578 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-03-01 18:26:51 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								1a6e6a23a9 
								
							 
						 
						
							
							
								
								Add only_media param to public and hashtag timelines API ( #6576 )  
							
							
							
						 
						
							2018-03-01 03:21:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ca9d8402c3 
								
							 
						 
						
							
							
								
								Add "Toots/Toots with replies/Media" tab below profile header ( #6572 )  
							
							... 
							
							
							
							* Add "Toots/Toots with replies/Media" tab below profile header
* Add focal point display to account gallery timeline
* Fix visual glitch of standalone GIFV 
							
						 
						
							2018-03-01 02:48:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								d60ae00b8e 
								
							 
						 
						
							
							
								
								Fix margin on top action button, fix width of counters on frontpage ( #6573 )  
							
							
							
						 
						
							2018-03-01 02:48:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f410afe59e 
								
							 
						 
						
							
							
								
								Ensure that boolean params in the API are parsed for truthiness ( #6575 )  
							
							... 
							
							
							
							Use Rails smart boolean cast to account for values such as "f",
"0", "false", etc. Previously, if a param was present in the request,
it would count as true. 
							
						 
						
							2018-03-01 02:47:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9721b7746a 
								
							 
						 
						
							
							
								
								Fix   #942 : Seamless LDAP login ( #6556 )  
							
							
							
						 
						
							2018-02-28 19:04:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								5f70533e8a 
								
							 
						 
						
							
							
								
								Fix   #5708 : Reject->Follow will remove the follow if it exists ( #6571 )  
							
							
							
						 
						
							2018-02-28 06:55:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0ebd2a1718 
								
							 
						 
						
							
							
								
								Federated reports ( #6570 )  
							
							... 
							
							
							
							* Fix  #2176 : Federated reports
* UI for federated reports
* Add spec for ActivityPub Flag handler
* Add spec for ReportService 
							
						 
						
							2018-02-28 06:54:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								caa0e2e2f8 
								
							 
						 
						
							
							
								
								remove Uglifier call from production.rb ( #6568 )  
							
							
							
						 
						
							2018-02-27 05:48:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									TrashMacNugget 
								
							 
						 
						
							
							
							
							
								
							
							
								d73bbd5830 
								
							 
						 
						
							
							
								
								Specify AGPLv3+ ( #6546 )  
							
							... 
							
							
							
							* Specify AGPLv3+
Since the documentation doesn't specify you can use Mastodon as AGPLv3 or any later version.
* Use newest version of SPDX AGPLv3+ identifier 
							
						 
						
							2018-02-27 01:52:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Paul Woolcock 
								
							 
						 
						
							
							
							
							
								
							
							
								fee184c0fd 
								
							 
						 
						
							
							
								
								Some images can cause convert to fail, which crashes this whole task ( #6565 )  
							
							... 
							
							
							
							* Some images can cause `convert` to fail, which crashes this whole task
* Add more specific exception 
							
						 
						
							2018-02-26 22:01:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								05ad870f18 
								
							 
						 
						
							
							
								
								Merge pull request  #372  from KnzkDev/fix/ja-translation  
							
							... 
							
							
							
							Add missing Japanese translate 
							
						 
						
							2018-02-26 11:38:53 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								da24f2fdc1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master  
							
							
							
						 
						
							2018-02-26 11:35:34 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								527210fd7b 
								
							 
						 
						
							
							
								
								Grid layout for tag pages ( #6545 )  
							
							... 
							
							
							
							* Use grid layout for the landing page
* Use grid layout for tag pages
* Set 2 columns width as explicit percentage for tag pages 
							
						 
						
							2018-02-26 17:43:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								cfa4c40e04 
								
							 
						 
						
							
							
								
								Add Liberapay link to README.md ( #6563 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-02-26 16:20:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									masarakki 
								
							 
						 
						
							
							
							
							
								
							
							
								eed7c16ab0 
								
							 
						 
						
							
							
								
								remove-uglifier ( #6561 )  
							
							
							
						 
						
							2018-02-26 16:19:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lynx Kotoura 
								
							 
						 
						
							
							
							
							
								
							
							
								8050d02e86 
								
							 
						 
						
							
							
								
								Better grid layout for the landing page ( #6543 )  
							
							... 
							
							
							
							* Use grid layout for the landing page
* Fix column settings
Set the ratio explicitly
* Improve information board 
							
						 
						
							2018-02-26 16:19:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								058b96ddf4 
								
							 
						 
						
							
							
								
								Improve public account cards ( #6559 )  
							
							... 
							
							
							
							- Add follow/unfollow/remote follow buttons
- Format the bio properly
- Always show username@domain, even for local accounts 
							
						 
						
							2018-02-26 16:18:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								76aef54e8e 
								
							 
						 
						
							
							
								
								i18n normalize data  
							
							
							
						 
						
							2018-02-26 12:53:02 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ian McCowan 
								
							 
						 
						
							
							
							
							
								
							
							
								88461c1abe 
								
							 
						 
						
							
							
								
								Fix prev/next links on public profile page ( #6497 )  
							
							... 
							
							
							
							* Fix prev/next links on public profile page
* Don't make pagination urls if no available statuses
* Fix empty check method
* Put left chevron before prev page link
* Add scope for pagination "starting at" a given id
* Status pagination try 2:
s/prev/older and s/next/newer
"older" on left, "newer" on right
Use new scope for "newer" link
Extract magic 20 page size to constant
Remove max_id from feed pagination as it's not respected
* Reinstate max_id for accounts atom stream
* normalize 
							
						 
						
							2018-02-26 03:31:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								76e0b69e02 
								
							 
						 
						
							
							
								
								Add missing Japanese translate  
							
							
							
						 
						
							2018-02-26 11:12:55 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f35356609b 
								
							 
						 
						
							
							
								
								Ensure the app does not even start if OTP_SECRET is not set ( #6557 )  
							
							... 
							
							
							
							* Ensure the app does not even start if OTP_SECRET is not set
* Remove PAPERCLIP_SECRET (it's not used by anything, actually)
Imports are for internal consumption and the url option isn't even
used correctly, so we can remove the hash stuff from them 
							
						 
						
							2018-02-26 01:31:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b5105e6898 
								
							 
						 
						
							
							
								
								Fix   #6536  ( #6558 )  
							
							
							
						 
						
							2018-02-26 00:24:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								ad158b4dd1 
								
							 
						 
						
							
							
								
								Merge pull request  #370  from KnzkDev/fix/border-radius  
							
							... 
							
							
							
							Fix border-radius of owner avatar in /about/more 
							
						 
						
							2018-02-25 16:41:47 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									yuzulabo 
								
							 
						 
						
							
							
							
							
								
							
							
								af8aa1a5b9 
								
							 
						 
						
							
							
								
								Fix border-radius of owner avatar in /about/more  
							
							
							
						 
						
							2018-02-25 23:27:32 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								a5a434a8f6 
								
							 
						 
						
							
							
								
								Raise Mastodon::HostValidationError when host for HTTP request is private ( #6410 )  
							
							
							
						 
						
							2018-02-24 19:16:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								2187a87f3a 
								
							 
						 
						
							
							
								
								Do not use function name to track components ( #6542 )  
							
							... 
							
							
							
							UglifyJS2 is allowed to mangle function names, and function names can also
be duplicate if they are from different scopes. Therefore function names
are not reliable as identifiers.
Functions as keys for Map object is a cheaper and more reliable
alternative. 
							
						 
						
							2018-02-24 19:10:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									mayaeh 
								
							 
						 
						
							
							
							
							
								
							
							
								8995e9238a 
								
							 
						 
						
							
							
								
								i18n: Update Japanese translations ( #6550 )  
							
							... 
							
							
							
							* Update Japanese translations.
* Add quotation marks. 
							
						 
						
							2018-02-25 01:27:03 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jenkins 
								
							 
						 
						
							
							
							
							
								
							
							
								b4f099ac0a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
							
							
							
						 
						
							2018-02-24 05:17:10 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki 
								
							 
						 
						
							
							
							
							
								
							
							
								7ac6e09dde 
								
							 
						 
						
							
							
								
								Do not push status to feed if its reblog is already inserted ( #6488 )  
							
							... 
							
							
							
							A complemental change for precompute_feed_service_spec.rb also fixes its
random failure which is caused by the Snowlake randomization of the order
of an original status and its reblog. 
							
						 
						
							2018-02-24 05:40:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									David Yip 
								
							 
						 
						
							
							
							
							
								
							
							
								c840346355 
								
							 
						 
						
							
							
								
								Merge pull request  #369  from KnzkDev/merge-upstream  
							
							... 
							
							
							
							Merge with upstream @ d1806f5dc4 
							
						 
						
							2018-02-23 15:05:00 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								9d28dc6c34 
								
							 
						 
						
							
							
								
								Update SCSS  
							
							
							
						 
						
							2018-02-24 03:22:58 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								90765d1e99 
								
							 
						 
						
							
							
								
								Update columns.scss  
							
							
							
						 
						
							2018-02-24 01:45:15 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								a6138cc1e9 
								
							 
						 
						
							
							
								
								Update containers.scss  
							
							
							
						 
						
							2018-02-24 01:26:48 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								51ff35b344 
								
							 
						 
						
							
							
								
								Update index.scss  
							
							
							
						 
						
							2018-02-24 01:25:49 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								1e64435374 
								
							 
						 
						
							
							
								
								Fix data export page error  
							
							
							
						 
						
							2018-02-24 00:29:26 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								3419c8e2ac 
								
							 
						 
						
							
							
								
								Update about.scss  
							
							
							
						 
						
							2018-02-24 00:22:05 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								5d8e29ba27 
								
							 
						 
						
							
							
								
								Use absolute URL for focus reticle  
							
							
							
						 
						
							2018-02-23 23:50:25 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									imncls 
								
							 
						 
						
							
							
							
							
								
							
							
								c0aabbec0f 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/tootsuite/mastodon  
							
							... 
							
							
							
							# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb 
							
						 
						
							2018-02-23 23:28:31 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ghislain Loaec 
								
							 
						 
						
							
							
							
							
								
							
							
								d1806f5dc4 
								
							 
						 
						
							
							
								
								New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref  #6538  (not only SAML strategies) ( #6540 )  
							
							
							
						 
						
							2018-02-23 01:16:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander 
								
							 
						 
						
							
							
							
							
								
							
							
								32cc2d8c9b 
								
							 
						 
						
							
							
								
								Update pam documentation ( #6518 )  
							
							... 
							
							
							
							* document pam email extraction
* remove superfluous newline 
							
						 
						
							2018-02-22 23:41:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marcin Mikołajczak 
								
							 
						 
						
							
							
							
							
								
							
							
								21da2f420e 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #6539 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2018-02-22 23:31:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ghislain Loaec 
								
							 
						 
						
							
							
							
							
								
							
							
								deea524052 
								
							 
						 
						
							
							
								
								New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED +  fixes   #6533  ( #6538 )  
							
							
							
						 
						
							2018-02-22 23:31:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								692dfd9a93 
								
							 
						 
						
							
							
								
								Fix nil error in focal_point? ( #6537 )  
							
							
							
						 
						
							2018-02-22 17:42:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								51e1e65c84 
								
							 
						 
						
							
							
								
								Fix container regression ( #6531 )  
							
							... 
							
							
							
							* Update public.html.haml
* Update auth.html.haml
* Update modal.html.haml 
							
						 
						
							2018-02-22 03:04:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									beatrix 
								
							 
						 
						
							
							
							
							
								
							
							
								9184d588c1 
								
							 
						 
						
							
							
								
								fix typo in image serializer ( #6530 )  
							
							... 
							
							
							
							respond to! 
							
						 
						
							2018-02-22 02:47:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ad1f541bd7 
								
							 
						 
						
							
							
								
								Redesign landing page (again) ( #6486 )  
							
							... 
							
							
							
							* Redesign landing page (again)
* Move login form in small version to the right column
* Display closed registrations message
* Add site setting for the hero image
* Fix test
* Increase spacing, maximum width, change call to action section 
							
						 
						
							2018-02-22 01:03:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								eb5b1b45d9 
								
							 
						 
						
							
							
								
								Fix   #6526 : Only store redirect location if not in JSON format ( #6528 )  
							
							
							
						 
						
							2018-02-22 00:51:30 +01:00