Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								e4fee6c138 
								
							 
						 
						
							
							
								
								Add Japanese translations ( #3985 )  
							
							... 
							
							
							
							ref #3929 , #3935 , #3949 , #3981  
							
						 
						
							2017-06-28 16:45:21 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								fb421a1f46 
								
							 
						 
						
							
							
								
								i18n: added email to activerecord.pl.yml ( #3981 )  
							
							
							
						 
						
							2017-06-28 14:07:53 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								2a9805b987 
								
							 
						 
						
							
							
								
								i18n: Minor fix in devise.pl.yml ( #3978 )  
							
							
							
						 
						
							2017-06-27 23:14:02 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								da42bfadb5 
								
							 
						 
						
							
							
								
								i18n: E-mail notifications to admins about new reports (pl) ( #3975 )  
							
							
							
						 
						
							2017-06-27 22:21:35 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alda Marteau-Hardi 
								
							 
						 
						
							
							
							
							
								
							
							
								f53ed108b0 
								
							 
						 
						
							
							
								
								Translate pin/unpin and fix some inconsistencies in gender neutral strings ( #3952 )  
							
							
							
						 
						
							2017-06-26 13:04:36 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								138e5a0b1e 
								
							 
						 
						
							
							
								
								Fix webpack config for Windows ( #3926 )  
							
							
							
						 
						
							2017-06-24 14:03:52 +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 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Nolan Lawson 
								
							 
						 
						
							
							
							
							
								
							
							
								e078919f07 
								
							 
						 
						
							
							
								
								Upgrade to Webpack 3 with module concatenation ( #3912 )  
							
							
							
						 
						
							2017-06-23 17:44:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ratmir Karabut 
								
							 
						 
						
							
							
							
							
								
							
							
								9ca02a00a6 
								
							 
						 
						
							
							
								
								Update Russian translation ( #3902 )  
							
							... 
							
							
							
							* Add Russian translation (ru)
* Fix a missing comma
* Fix the wording for better consistency
* Update Russian translation
* Arrange Russian setting alphabetically
* Fix syntax error
* Update Russian translation
* Fix formatting error
* Update Russian translation
* Update Russian translation
* Update ru.jsx
* Fix syntax error
* Remove two_factor_auth.warning (appears obsolete)
* Add missing strings in ru.yml
A lot of new strings translated, especially for the newly added admin section
* Fix translation consistency
* Update Russian translation
* Update Russian translation (pluralizations)
* Update Russian translation
* Update Russian translation
* Update Russian translation (pin)
* Update Russian translation (account deletion)
* Fix extra line 
							
						 
						
							2017-06-22 23:28:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Quent-in 
								
							 
						 
						
							
							
							
							
								
							
							
								98fab24bea 
								
							 
						 
						
							
							
								
								Update of doorkeeper.oc.yml ( #3896 )  
							
							... 
							
							
							
							Just some adjustements 
							
						 
						
							2017-06-22 13:39:13 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								da6fa029f6 
								
							 
						 
						
							
							
								
								i18n: Fixed typo in Polish translation ( #3864 )  
							
							
							
						 
						
							2017-06-20 18:34:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									のら 
								
							 
						 
						
							
							
							
							
								
							
							
								5cc7cd8518 
								
							 
						 
						
							
							
								
								Add Japanese translation "Action taken by" ( #3850 )  
							
							
							
						 
						
							2017-06-19 15:12:41 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									masarakki 
								
							 
						 
						
							
							
							
							
								
							
							
								ff142eb64d 
								
							 
						 
						
							
							
								
								setting-for-account-deletable ( #3852 )  
							
							
							
						 
						
							2017-06-19 15:12:31 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								500e28442f 
								
							 
						 
						
							
							
								
								Re-add disableHostCheck (regression  #3729 ) ( #3854 )  
							
							... 
							
							
							
							ref #2790  
							
						 
						
							2017-06-19 14:01:31 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									spla 
								
							 
						 
						
							
							
							
							
								
							
							
								4367443287 
								
							 
						 
						
							
							
								
								Added new Catalan strings ( #3843 )  
							
							... 
							
							
							
							* Add Catalan language
* Add Catalan language
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update ca.json
* Update settings_helper.rb
* Update mastodon.js
* Update index.js
* Update application.rb
* Update ca.yml
* removed extra spaces at line 225
* Catalan translation update
added activerecord.ca.yml
* Update activerecord.ca.yml
Done
* Updated activerecord.ca.yml
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Catalan language updated
* Update ca.json
Removed :
<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master 
							
						 
						
							2017-06-19 10:29:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f3be605286 
								
							 
						 
						
							
							
								
								Rename FollowRemoteAccountService to ResolveRemoteAccountService ( #3847 )  
							
							... 
							
							
							
							Rename Activitypub to ActivityPub 
							
						 
						
							2017-06-19 01:51:04 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								53e42bf91e 
								
							 
						 
						
							
							
								
								Upgrade Webpacker to version 2.0 ( #3729 )  
							
							
							
						 
						
							2017-06-18 02:57:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Quent-in 
								
							 
						 
						
							
							
							
							
								
							
							
								8fd931dc12 
								
							 
						 
						
							
							
								
								l10n update for account deletion  ( #3820 )  
							
							... 
							
							
							
							* l10n update for acount deletion
* l10n little change
* l10n little changes
Less passive voice, more natural.
* Update oc.yml
Correction, " added 
							
						 
						
							2017-06-17 20:21:25 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								6f34fdb616 
								
							 
						 
						
							
							
								
								updated Polish translation ( #3751 )  
							
							... 
							
							
							
							Signed-off-by: Marcin Mikołajczak <me@m4sk.in> 
							
						 
						
							2017-06-15 02:00:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								da0333f1cb 
								
							 
						 
						
							
							
								
								Add Japanese translation for Account deletion ( #3747 )  
							
							
							
						 
						
							2017-06-14 22:00:08 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								98eacb2238 
								
							 
						 
						
							
							
								
								i18n: updated Polish translation ( #3744 )  
							
							
							
						 
						
							2017-06-14 20:08:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								4a618908e8 
								
							 
						 
						
							
							
								
								Account deletion ( #3728 )  
							
							... 
							
							
							
							* Add form for account deletion
* If avatar or header are gone from source, remove them
* Add option to have SuspendAccountService remove user record, add tests
* Exclude suspended accounts from search 
							
						 
						
							2017-06-14 18:01:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								85af2405cf 
								
							 
						 
						
							
							
								
								Exclude packs/custom.js from webpack compilation to prevent breakage ( #3719 )  
							
							... 
							
							
							
							due to the change in #3373  
							
						 
						
							2017-06-13 03:55:36 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Ratmir Karabut 
								
							 
						 
						
							
							
							
							
								
							
							
								9e53fe5c29 
								
							 
						 
						
							
							
								
								Update Russian translation ( #3692 )  
							
							
							
						 
						
							2017-06-11 10:43:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								3690f04e4a 
								
							 
						 
						
							
							
								
								Remove comments for eslint-disable ( #3691 )  
							
							
							
						 
						
							2017-06-11 10:42:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								2925372ff4 
								
							 
						 
						
							
							
								
								Move create/destroy actions for api/v1/statuses to namespace ( #3678 )  
							
							... 
							
							
							
							Each of mute, favourite, reblog has been updated to:
- Have a separate controller with just a create and destroy action
- Preserve historical route names to not break the API
- Mild refactoring to break up long methods 
							
						 
						
							2017-06-10 09:39:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								778430b54a 
								
							 
						 
						
							
							
								
								i18n: Minor fixes in Polish translation ( #3674 )  
							
							... 
							
							
							
							* i18n
* i18n
* i18n
* i18n
* i18n 
							
						 
						
							2017-06-09 23:08:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								5282ba862a 
								
							 
						 
						
							
							
								
								Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers ( #3646 )  
							
							... 
							
							
							
							* Add specs for api statuses routes
* Update favourited_by and reblogged_by api routes
* Move methods into new controllers
* Use load_accounts methods to simplify index actions
* Clean up load_accounts methods
* Clean up link header generation
* Check for link headers in specs
* Remove unused actions from api/v1/statuses controller
* Remove specs for moved actions 
							
						 
						
							2017-06-09 14:12:40 -04:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								1a065fb146 
								
							 
						 
						
							
							
								
								i18n: updated Polish translation ( #3670 )  
							
							
							
						 
						
							2017-06-09 19:15:55 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								1be48dd805 
								
							 
						 
						
							
							
								
								Refactor views/admin/reports/show.html.haml ( #3656 )  
							
							
							
						 
						
							2017-06-09 15:08:06 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									unarist 
								
							 
						 
						
							
							
							
							
								
							
							
								65d8c73bae 
								
							 
						 
						
							
							
								
								Add Japanese translation for  #3640  ( #3650 )  
							
							
							
						 
						
							2017-06-09 03:14:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8902e265b4 
								
							 
						 
						
							
							
								
								Add explit admin actions to (re)subscribe/unsubscribe remote accounts ( #3640 )  
							
							... 
							
							
							
							* Add explit admin actions to (re)subscribe/unsubscribe remote accounts
and re-download avatar/header
* Improve how admin NSFW toggle looks 
							
						 
						
							2017-06-08 14:58:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									nullkal 
								
							 
						 
						
							
							
							
							
								
							
							
								b8ea28d6d0 
								
							 
						 
						
							
							
								
								Support multiple trusted proxy ip addresses ( #3639 )  
							
							... 
							
							
							
							* Support multiple trusted proxy ip addresses
* correct coding style 
							
						 
						
							2017-06-08 14:33:28 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								7d2b4186c3 
								
							 
						 
						
							
							
								
								Add Japanese translations ( #3635 )  
							
							
							
						 
						
							2017-06-08 13:23:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									m4sk1n 
								
							 
						 
						
							
							
							
							
								
							
							
								90689190a3 
								
							 
						 
						
							
							
								
								i18n: Update Polish translation ( #3637 )  
							
							
							
						 
						
							2017-06-08 13:23:40 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Sorin Davidoi 
								
							 
						 
						
							
							
							
							
								
							
							
								8acadeea76 
								
							 
						 
						
							
							
								
								fix: Warn if JavaScript is disabled ( #3634 )  
							
							
							
						 
						
							2017-06-08 00:52:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									jeroenpraat 
								
							 
						 
						
							
							
							
							
								
							
							
								92bb166246 
								
							 
						 
						
							
							
								
								Rest of 2FA  translated + small fix ( #3630 )  
							
							
							
						 
						
							2017-06-07 20:08:34 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								722d152082 
								
							 
						 
						
							
							
								
								Fix   #3063  - Add dynamic app manifest ( #3563 )  
							
							... 
							
							
							
							* Fix  #3063  - Add dynamic app manifest
* Added short_name
* Add background_color 
							
						 
						
							2017-06-06 19:29:42 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Yamagishi Kazutoshi 
								
							 
						 
						
							
							
							
							
								
							
							
								ad4a28f4f6 
								
							 
						 
						
							
							
								
								Refactor translationRunner.js ( #3604 )  
							
							... 
							
							
							
							- Use yargs instead of minimist
- Simplify validators
- Fix typo (RFC5626 -> RFC5646) 
							
						 
						
							2017-06-06 13:31:57 +02:00