Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								bf7306636e 
								
							 
						 
						
							
							
								
								Allow import/export of mutes list ( #1541 )  
							
							... 
							
							
							
							* Allow export of mutes list
* Allow importing of mutes list
* Refactor to use Settings::Exports::BaseController and DRY up exports code 
							
						 
						
							2017-04-12 18:20:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								63e46e27f0 
								
							 
						 
						
							
							
								
								Refactor exports controller ( #1567 )  
							
							... 
							
							
							
							* Add basic coverage for settings/exports controller
* Remove unused @account variable from settings/exports controller
* Add coverage for download export actions
* Remove deprecated `render :text` in favor of `send_data` for csv downloads
* Add model to handle exports
* Use Export class in settings/exports controller
* Simplify settings/exports controller methods
* Move settings/export to more restful routes 
							
						 
						
							2017-04-11 22:00:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b440b2a9ee 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/blackle/mastodon  into blackle-master  
							
							
							
						 
						
							2017-04-11 20:43:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									blackle 
								
							 
						 
						
							
							
							
							
								
							
							
								e7d77f4e13 
								
							 
						 
						
							
							
								
								Allow user to disable the boost confirm dialog in preferences  
							
							
							
						 
						
							2017-04-11 10:10:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Matt Jankowski 
								
							 
						 
						
							
							
							
							
								
							
							
								874a240a58 
								
							 
						 
						
							
							
								
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								b532134503 
								
							 
						 
						
							
							
								
								Fix   #795 ,  fix   #704 ,  fix   #835  - 2FA requires confirmation to be enabled ( #1278 )  
							
							... 
							
							
							
							* Fix  #795 , fix  #704 , fix  #835  - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled
* Clean up 
							
						 
						
							2017-04-08 22:20:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								244da78105 
								
							 
						 
						
							
							
								
								Import feature for following/blocking lists (addresses  #62 ,  #177 ,  #201 ,  #454 )  
							
							
							
						 
						
							2017-03-30 19:42:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b339e488fe 
								
							 
						 
						
							
							
								
								Export follow/block lists as CSV  
							
							
							
						 
						
							2017-03-19 20:29:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0cb5a2a0a7 
								
							 
						 
						
							
							
								
								Add digest e-mails  
							
							
							
						 
						
							2017-03-04 00:00:48 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a741049a77 
								
							 
						 
						
							
							
								
								Fix   #104  - Style OAuth authorized applications page  
							
							... 
							
							
							
							Add ability to search accounts by display name 
							
						 
						
							2017-02-27 00:15:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a83dc927d8 
								
							 
						 
						
							
							
								
								Fix   #587  - Display TOTP secret next to QR code  
							
							
							
						 
						
							2017-02-13 20:56:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								af82038b98 
								
							 
						 
						
							
							
								
								Fix preferences save  
							
							
							
						 
						
							2017-02-07 00:23:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b1f2683ecc 
								
							 
						 
						
							
							
								
								Add API modifiers to limit returned toots from public/hashtag timelines  
							
							... 
							
							
							
							to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen 
							
						 
						
							2017-02-06 23:16:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								557de8e24c 
								
							 
						 
						
							
							
								
								Update settings to re-use admin layout, one big navigation tree, improve settings forms  
							
							
							
						 
						
							2017-01-28 03:56:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								9b8670c939 
								
							 
						 
						
							
							
								
								Added optional two-factor authentication  
							
							
							
						 
						
							2017-01-27 20:35:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7e7c2bbb0f 
								
							 
						 
						
							
							
								
								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 
								
							 
						 
						
							
							
							
							
								
							
							
								fde1917a54 
								
							 
						 
						
							
							
								
								Add preferences for follow request notification e-mails  
							
							
							
						 
						
							2016-12-26 22:04:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								09a477c782 
								
							 
						 
						
							
							
								
								Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users  
							
							
							
						 
						
							2016-12-22 21:34:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7752662f97 
								
							 
						 
						
							
							
								
								Add filters for suspended accounts  
							
							
							
						 
						
							2016-12-06 18:03:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8d4ef0b6c3 
								
							 
						 
						
							
							
								
								Per-status control for unlisted mode, also federation for unlisted mode  
							
							... 
							
							
							
							Fix  #233 , fix  #268  
						
							2016-11-30 21:34:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ea0846645a 
								
							 
						 
						
							
							
								
								Fix   #65  - Options to block notifications from people you don't follow/who don't follow you  
							
							
							
						 
						
							2016-11-25 13:13:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alyssa Ross 
								
							 
						 
						
							
							
							
							
								
							
							
								cb06801b21 
								
							 
						 
						
							
							
								
								Extract filename obfuscation into module  
							
							
							
						 
						
							2016-11-24 00:30:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Andrea Faulds 
								
							 
						 
						
							
							
							
							
								
							
							
								66a20701b7 
								
							 
						 
						
							
							
								
								Rename media to avoid exposing filename ( fixes   #207 )  
							
							
							
						 
						
							2016-11-23 21:03:03 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								74df3ba1d7 
								
							 
						 
						
							
							
								
								Local accounts can control "silenced" attribute which removes them from public timeline  
							
							
							
						 
						
							2016-11-21 23:06:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b8e6ca45e5 
								
							 
						 
						
							
							
								
								Add user locale setting  
							
							
							
						 
						
							2016-11-16 17:56:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								0e956910c3 
								
							 
						 
						
							
							
								
								Adding some localizations  
							
							
							
						 
						
							2016-11-15 23:02:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e71b152d89 
								
							 
						 
						
							
							
								
								Fix rubocop issues, introduce usage of frozen literal to improve performance  
							
							
							
						 
						
							2016-11-15 16:56:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								588cb77e9f 
								
							 
						 
						
							
							
								
								E-mail preferences page  
							
							
							
						 
						
							2016-10-14 02:28:49 +02:00