Midgard 
								
							 
						 
						
							
							
								
							
							
	16d0aed403  
						 
						
							
							
								
								
								Use instance name in email notifications instead of "Mastodon" ( #3763 )  
							
							... 
							
							
							
								
								
							
							
							* Use instance name in "password changed" mail
instead of "Mastodon".
Fixes tootsuite#2620.
* Use instance name in password reset mail
instead of "Mastodon". 
							
						 
						
							2017-06-27 14:22:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Debanshu Kundu 
								
							 
						 
						
							
							
								
							
							
	da9317fa56  
						 
						
							
							
								
								
								#1456  Added rake task to add a user. ( #1482 )  
							
							
							
								
								
							
							
						 
						
							2017-06-27 14:18:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
								
							
							
	be92babd00  
						 
						
							
							
								
								
								Responsive images in media gallery ( #3963 )  
							
							... 
							
							
							
								
								
							
							
							* feat(components/media_gallery): Responsive images
* fix(components/media_gallery): Link to image URL 
							
						 
						
							2017-06-27 13:46:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	e2dd576a1b  
						 
						
							
							
								
								
								Update dependencies for Node.js ( #3967 )  
							
							... 
							
							
							
								
								
							
							
							* Update @storybook/addon-actions to v3.1.6
* Update @storybook/react to v3.1.6
* Update babel-loader to v7.1.0
* Update babel-plugin-transform-react-remove-prop-types to v0.4.6
* Update enzyme to v2.9.1
* Update fsevents to v1.1.2
* Update intersection-observer to v0.3.2
* Update npmlog to v4.1.2
* Update pg to v6.4.0
* Update postcss-loader to v2.0.6
* Update rails-ujs to v5.1.2
* Update react to v15.6.1
* Update react-addons-shallow-compare to v15.6.0
* Update react-dom to v15.6.0
* Update react-notification to v6.7.1
* Update react-test-renderer to v15.6.1
* Update react-textarea-autosize to v5.0.7
* Update redux to v3.7.1
* Update resolve-url-loader to v2.1.0
* Update sass-loader to v6.0.6
* Update sinon to v2.3.5
* Update stringz to v0.2.2
* Update uuid to v3.1.0
* Update websocket.js to v0.1.12
* Update yargs to v8.0.2
* yarn upgrade 
							
						 
						
							2017-06-27 13:46:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	8f2c91568c  
						 
						
							
							
								
								
								Maintain aspect ratio for preview image ( #3966 )  
							
							
							
								
								
							
							
						 
						
							2017-06-27 13:43:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	98eaa2aa27  
						 
						
							
							
								
								
								Update Rails to v5.1.2 ( #3968 )  
							
							
							
								
								
							
							
						 
						
							2017-06-27 13:41:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	42b8220632  
						 
						
							
							
								
								
								Fix   #1624  - Send e-mail notifications to admins about new reports ( #3949 )  
							
							
							
								
								
							
							
						 
						
							2017-06-27 00:04:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									ThibG 
								
							 
						 
						
							
							
								
							
							
	a91d968cab  
						 
						
							
							
								
								
								Raise an error if salmon request response is unsatisfactory ( #3960 )  
							
							
							
								
								
							
							
						 
						
							2017-06-26 19:39:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
								
							
							
	646de92781  
						 
						
							
							
								
								
								i18n: Updated Polish translation ( #3956 )  
							
							... 
							
							
							
								
								
							
							
							* i18n: Updated Polish translation
* Update pl.yml 
							
						 
						
							2017-06-26 17:18:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
								
							
							
	ae2b722f55  
						 
						
							
							
								
								
								i18n: Warning to look into the spam folder (pl) ( #3955 )  
							
							
							
								
								
							
							
						 
						
							2017-06-26 17:10:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Hunsaker 
								
							 
						 
						
							
							
								
							
							
	7aeb9168b0  
						 
						
							
							
								
								
								Add .gitattributes file to avoid unwanted CRLF ( #3954 )  
							
							... 
							
							
							
								
								
							
							
							When Windows checks out files, it defaults to changing line endings to CRLF. If these files are then copied to a Linux system to be run, and the endings aren't changed at some point in that process, things break. This file forces git to use LF for all text files on all systems (except the request testing specfiles) to prevent issues everywhere. 
							
						 
						
							2017-06-26 13:15:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alda Marteau-Hardi 
								
							 
						 
						
							
							
								
							
							
	f53ed108b0  
						 
						
							
							
								
								
								Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )  
							
							
							
								
								
							
							
						 
						
							2017-06-26 13:04:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	285038972b  
						 
						
							
							
								
								
								Stop using Babel with streaming server ( #3950 )  
							
							
							
								
								
							
							
						 
						
							2017-06-26 04:49:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takuya Yoshida 
								
							 
						 
						
							
							
								
							
							
	e5563843a2  
						 
						
							
							
								
								
								Re-fix errorMiddleware ( #3922 )  
							
							
							
								
								
							
							
						 
						
							2017-06-26 01:46:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
								
							
							
	c972e1ee1f  
						 
						
							
							
								
								
								Ignore DB_NAME for development env on streaming as well as rails side ( #3948 )  
							
							
							
								
								
							
							
						 
						
							2017-06-26 01:45:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	5e8d037e27  
						 
						
							
							
								
								
								Fix   #3910  - Require OTP authentication to disable 2FA ( #3935 )  
							
							... 
							
							
							
								
								
							
							
							* Fix  #3910  - Require OTP authentication to disable 2FA. Also, remove ability
to generate new OTP backup codes *after* initial backup codes were handed
out during activation
* Restore recovery code re-generation
* Improve display of some 2FA elements 
							
						 
						
							2017-06-25 23:51:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	ed7dc1704d  
						 
						
							
							
								
								
								Bind web UI access tokens to sessions ( #3940 )  
							
							... 
							
							
							
								
								
							
							
							* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test
* Fix  #2347  - Bind web UI access token to session
When you logout, session also destroys the access token, so it's no longer
valid. If access token is destroyed some other way, the session is also
destroyed, requiring a re-login.
Fix  #1681  - Add scheduler to remove revoked access tokens and grants
* Fix test 
							
						 
						
							2017-06-25 23:51:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									amazedkoumei 
								
							 
						 
						
							
							
								
							
							
	436ce03772  
						 
						
							
							
								
								
								fix unnecessary  variable ( #3947 )  
							
							
							
								
								
							
							
						 
						
							2017-06-25 23:29:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	d821aba002  
						 
						
							
							
								
								
								Rename "Credentials" page to "Security" for clarity ( #3941 )  
							
							... 
							
							
							
								
								
							
							
							* Rename "Credentials" page to "Security" for clarity
* Change "security" icon from cog to lock 
							
						 
						
							2017-06-25 22:13:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
								
							
							
	4ce1540094  
						 
						
							
							
								
								
								fix(features/compose): Handle external changes to the textarea ( #3632 )  
							
							
							
								
								
							
							
						 
						
							2017-06-25 21:43:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki (@fn_aki@pawoo.net) 
								
							 
						 
						
							
							
								
							
							
	67243bda31  
						 
						
							
							
								
								
								Cover Auth::RegistrationsController more ( #3353 )  
							
							
							
								
								
							
							
						 
						
							2017-06-25 21:42:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki (@fn_aki@pawoo.net) 
								
							 
						 
						
							
							
								
							
							
	8f991831b8  
						 
						
							
							
								
								
								Cover Admin::DomainBlocksController more ( #3329 )  
							
							... 
							
							
							
								
								
							
							
							Also domain_block fabricator now sets unique domains 
							
						 
						
							2017-06-25 21:42:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									amazedkoumei 
								
							 
						 
						
							
							
								
							
							
	87efa38721  
						 
						
							
							
								
								
								more free pgconfig by .env ( #3909 )  
							
							... 
							
							
							
								
								
							
							
							* more free pgconfig for streaming by .env
* fix wrong default values
* database.yml read ENV as same as streaming server 
							
						 
						
							2017-06-25 18:13:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	f7301bd5b9  
						 
						
							
							
								
								
								Add overview of active sessions ( #3929 )  
							
							... 
							
							
							
								
								
							
							
							* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test 
							
						 
						
							2017-06-25 16:54:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									PFM 
								
							 
						 
						
							
							
								
							
							
	099a3b4eac  
						 
						
							
							
								
								
								Fix "undefined" in className ( #3939 )  
							
							
							
								
								
							
							
						 
						
							2017-06-25 16:02:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
								
							
							
	3d4e21f1ec  
						 
						
							
							
								
								
								Don't set ASSET_HOST on build:development ( #3936 )  
							
							... 
							
							
							
								
								
							
							
							Setting ASSET_HOST to `http://0.0.0.0:8080 ` makes urls in manifest.json to
be invalid, e.g. `http://0.0.0.0:8080/packs/application.js `.
Anyway, we don't need set this on build:development because assets would
be delivered from same origin in development (and w/o dev-server). 
							
						 
						
							2017-06-25 12:52:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
								
							
							
	68dca26a5d  
						 
						
							
							
								
								
								Fix react-intl/locale-data import issue on production build ( #3937 )  
							
							... 
							
							
							
								
								
							
							
							Webpack seems to fail to import `react-intl/locale-data/*.js` if those
files has been proceed by babel, and this also breaks applying our translation.
Note that this won't be a problem on English locale, because react-intl
includes it as default and works fine without manually added locale-data.
Also this issue seems to only occurs on production build, but I'm not sure
about reason. 
							
						 
						
							2017-06-25 12:49:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
								
							
							
	1fc096ec75  
						 
						
							
							
								
								
								Fix elephant in onboarding modal being very small sized on small devices ( #3932 )  
							
							
							
								
								
							
							
						 
						
							2017-06-24 23:18:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
								
							
							
	21c2bc119c  
						 
						
							
							
								
								
								Clean column collapsible ( #3931 )  
							
							... 
							
							
							
								
								
							
							
							* Remove unused column_collapsable.js
* Remove old styles
* Extract `> div`  style to independent class 
							
						 
						
							2017-06-24 23:18:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
								
							
							
	d23293c762  
						 
						
							
							
								
								
								feat(components/onboarding_modal): Swipe between pages ( #3934 )  
							
							
							
								
								
							
							
						 
						
							2017-06-24 23:17:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
								
							
							
	138e5a0b1e  
						 
						
							
							
								
								
								Fix webpack config for Windows ( #3926 )  
							
							
							
								
								
							
							
						 
						
							2017-06-24 14:03:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	79dacea962  
						 
						
							
							
								
								
								Fix   #3924  (regression from  #3906 ) ( #3925 )  
							
							
							
								
								
							
							
						 
						
							2017-06-24 12:24:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
								
							
							
	4e6b5e7879  
						 
						
							
							
								
								
								Use debounce for dispatch scrollTopNotification and expandNotifications ( #3700 )  
							
							
							
								
								
							
							
						 
						
							2017-06-24 02:43:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Daniel Hunsaker 
								
							 
						 
						
							
							
								
							
							
	c0979381a4  
						 
						
							
							
								
								
								Fix a typo and give CW'd statuses the right cursor ( #3918 )  
							
							
							
								
								
							
							
						 
						
							2017-06-23 23:13:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	676f577e7e  
						 
						
							
							
								
								
								Fix webpack-dev-server until it's fixed upstream ( #3916 )  
							
							
							
								
								
							
							
						 
						
							2017-06-23 19:40:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	c1a8e3d1eb  
						 
						
							
							
								
								
								Use Class and Property Decorators ( #3730 )  
							
							... 
							
							
							
								
								
							
							
							ref https://tc39.github.io/proposal-decorators/  
							
						 
						
							2017-06-23 19:36:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Takuya Yoshida 
								
							 
						 
						
							
							
								
							
							
	0c44316b22  
						 
						
							
							
								
								
								Fix errorMiddleware to prevent "TypeError: res.writeHead is not a function" ( #3913 )  
							
							... 
							
							
							
								
								
							
							
							* Fix errorMiddleware
* Add "eslint-disable-line no-unused-vars" 
							
						 
						
							2017-06-23 19:22:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
								
							
							
	2211e8d1cd  
						 
						
							
							
								
								
								Revocable sessions ( #3616 )  
							
							... 
							
							
							
								
								
							
							
							* feat: Revocable sessions
* fix: Tests using sign_in
* feat: Configuration entry for the maximum number of session activations 
							
						 
						
							2017-06-23 18:50:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
								
							
							
	3783cadf2d  
						 
						
							
							
								
								
								Apply babel to react-intl to remove prop-types ( #3914 )  
							
							
							
								
								
							
							
						 
						
							2017-06-23 18:21:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	a071047c13  
						 
						
							
							
								
								
								Merge branch 'sorin-davidoi-swipe-gestures'  
							
							
							
								
								
							
							
						 
						
							2017-06-23 17:52:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	281f07244b  
						 
						
							
							
								
								
								Merge branch 'swipe-gestures' of git://github.com/sorin-davidoi/mastodon into sorin-davidoi-swipe-gestures  
							
							
							
								
								
							
							
						 
						
							2017-06-23 17:52:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Akihiko Odaki (@fn_aki@pawoo.net) 
								
							 
						 
						
							
							
								
							
							
	6f34a6a77f  
						 
						
							
							
								
								
								Add index statuses on account_id and id ( #3895 )  
							
							
							
								
								
							
							
						 
						
							2017-06-23 17:46:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
								
							
							
	e078919f07  
						 
						
							
							
								
								
								Upgrade to Webpack 3 with module concatenation ( #3912 )  
							
							
							
								
								
							
							
						 
						
							2017-06-23 17:44:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	7b13e6efc2  
						 
						
							
							
								
								
								Bump version to 1.4.6  
							
							
							
								
								
									
	 
								
							
							
						 
						
							2017-06-23 17:02:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
								
							
							
	3f59238207  
						 
						
							
							
								
								
								Add important test for full-width hashtags ( #3911 )  
							
							
							
								
								
							
							
						 
						
							2017-06-23 17:01:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	eff9416469  
						 
						
							
							
								
								
								Remove unused variables ( #3906 )  
							
							
							
								
								
							
							
						 
						
							2017-06-23 16:05:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
								
							
							
	6fbb3841a6  
						 
						
							
							
								
								
								Add prefix to setting toggle ID ( #3907 )  
							
							
							
								
								
							
							
						 
						
							2017-06-23 13:55:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
								
							
							
	d8c4781377  
						 
						
							
							
								
								
								fix: Apply :hover, :focus and :active only when multiple columns  
							
							
							
								
								
							
							
						 
						
							2017-06-23 13:48:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
								
							
							
	bc6e958229  
						 
						
							
							
								
								
								feat: Swipeable media  
							
							
							
								
								
							
							
						 
						
							2017-06-23 13:48:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
								
							
							
	a6d8d1036a  
						 
						
							
							
								
								
								feat: Swipeable columns  
							
							
							
								
								
							
							
						 
						
							2017-06-23 13:48:46 +02:00