Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ccb8ac8573 
								
							 
						 
						
							
							
								
								Make the streaming API also handle websockets (because trying to get the browser EventSource interface to  
							
							... 
							
							
							
							work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand. 
							
						 
						
							2017-02-04 00:34:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c2fbd144cf 
								
							 
						 
						
							
							
								
								Add "open in web" link to detailed public status pages  
							
							
							
						 
						
							2017-01-30 23:01:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								23b997ae55 
								
							 
						 
						
							
							
								
								Split 2FA login into two prompts  
							
							
							
						 
						
							2017-01-28 20:43:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f4bc9620a9 
								
							 
						 
						
							
							
								
								Update settings to re-use admin layout, one big navigation tree, improve settings forms  
							
							
							
						 
						
							2017-01-28 03:56:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ba192f12e3 
								
							 
						 
						
							
							
								
								Added optional two-factor authentication  
							
							
							
						 
						
							2017-01-27 20:35:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								eb62778bec 
								
							 
						 
						
							
							
								
								Fix   #537  - opengraph description should display spoiler text when present  
							
							
							
						 
						
							2017-01-26 03:45:14 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								6d98a73180 
								
							 
						 
						
							
							
								
								Domain blocks now have varying severity - auto-suspend vs auto-silence  
							
							
							
						 
						
							2017-01-23 17:38:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e22a56183a 
								
							 
						 
						
							
							
								
								Improve error page layouting. 500 page has to stay static because it's  
							
							... 
							
							
							
							used from nginx when Rails fails. 
							
						 
						
							2017-01-21 22:30:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								b4a4eb73ae 
								
							 
						 
						
							
							
								
								Merge branch 'fix/error-pages' of  https://github.com/ineffyble/mastodon  into ineffyble-fix/error-pages  
							
							
							
						 
						
							2017-01-21 22:20:01 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f0de621e76 
								
							 
						 
						
							
							
								
								Fix   #463  - Fetch and display previews of URLs using OpenGraph tags  
							
							
							
						 
						
							2017-01-20 01:00:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cde0476ca2 
								
							 
						 
						
							
							
								
								Fix   #487  
							
							
							
						 
						
							2017-01-17 20:11:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								cc1eccc8bc 
								
							 
						 
						
							
							
								
								Fix   #466  - when logged in, make "get started" link to the frontpage instead of sign up  
							
							
							
						 
						
							2017-01-15 14:47:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e9737c2235 
								
							 
						 
						
							
							
								
								Fix tests, add applications to eager loading/cache for statuses, fix  
							
							... 
							
							
							
							application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from #464  until it's consistent with non-animated version 
							
						 
						
							2017-01-15 14:01:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ab165547fd 
								
							 
						 
						
							
							
								
								Merge branch 'feature/toot-app-source' of  https://github.com/ineffyble/mastodon  into ineffyble-feature/toot-app-source  
							
							
							
						 
						
							2017-01-15 13:23:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								e45fed58cb 
								
							 
						 
						
							
							
								
								Add a textual 'Back to Mastodon' link in footer of settings pages  
							
							
							
						 
						
							2017-01-15 11:03:35 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								3f84816b24 
								
							 
						 
						
							
							
								
								Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether  
							
							
							
						 
						
							2017-01-15 10:27:54 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								f81dc7a33a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source  
							
							
							
						 
						
							2017-01-15 09:12:11 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								6c002cf615 
								
							 
						 
						
							
							
								
								Test for presence of Application in haml before trying to render details, to fix errors identified by CI  
							
							
							
						 
						
							2017-01-15 09:10:44 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								65122798b2 
								
							 
						 
						
							
							
								
								Fix typo in rel  
							
							
							
						 
						
							2017-01-15 09:04:14 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								d6bc0e8db4 
								
							 
						 
						
							
							
								
								Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views.  Resolves   #11  
							
							
							
						 
						
							2017-01-15 08:58:50 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								7cde08e30b 
								
							 
						 
						
							
							
								
								Improve extended about page layout  
							
							
							
						 
						
							2017-01-13 20:27:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								c01dd089ff 
								
							 
						 
						
							
							
								
								Adding about/more page with extended information that can be set up by an admin  
							
							
							
						 
						
							2017-01-13 20:16:38 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								e25170f960 
								
							 
						 
						
							
							
								
								Add extended about page stub  
							
							
							
						 
						
							2017-01-13 03:24:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								ca50ceeaf0 
								
							 
						 
						
							
							
								
								Add settings for contact information  
							
							
							
						 
						
							2017-01-12 20:54:14 +01: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 
								
							 
						 
						
							
							
							
							
								
							
							
								4a2ee43e80 
								
							 
						 
						
							
							
								
								Fix   #457  - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)  
							
							
							
						 
						
							2017-01-12 03:54:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								f876a8681d 
								
							 
						 
						
							
							
								
								Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places  
							
							
							
						 
						
							2017-01-11 13:24:14 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen 
								
							 
						 
						
							
							
							
							
								
							
							
								67a31454ad 
								
							 
						 
						
							
							
								
								Merge pull request  #450  from blackle/master  
							
							... 
							
							
							
							simplify emojification on public pages with .emojify class 
							
						 
						
							2017-01-10 12:21:06 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									blackle 
								
							 
						 
						
							
							
							
							
								
							
							
								917cf0bf5d 
								
							 
						 
						
							
							
								
								simplify emojification on public pages with .emojify class  
							
							
							
						 
						
							2017-01-09 22:41:47 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								205ba00017 
								
							 
						 
						
							
							
								
								Fix sandboxed iOS login again  
							
							
							
						 
						
							2017-01-09 19:43:53 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								75f80bef10 
								
							 
						 
						
							
							
								
								Persist UI settings, add missing localizations for German  
							
							
							
						 
						
							2017-01-09 14:00:55 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								72c3a41bef 
								
							 
						 
						
							
							
								
								Fix h-card classes and remote follow button appearing when it shouldn't  
							
							
							
						 
						
							2017-01-06 20:15:24 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Greg V 
								
							 
						 
						
							
							
							
							
								
							
							
								18deeb9db5 
								
							 
						 
						
							
							
								
								Add Microformats2 markup  
							
							... 
							
							
							
							h-feed, h-card and h-entry 
							
						 
						
							2017-01-06 18:10:10 +03:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Effy Elden 
								
							 
						 
						
							
							
							
							
								
							
							
								819bfb75c6 
								
							 
						 
						
							
							
								
								Add twitter:card metatag to enable Twitter Cards support  
							
							
							
						 
						
							2017-01-06 09:47:40 +11:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								f79ba2de83 
								
							 
						 
						
							
							
								
								Fix admin UI not loading JS, make sure to strip "acct:" out of remote account's usernames when authorizing follow  
							
							
							
						 
						
							2017-01-02 22:31:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8f47f6a7ec 
								
							 
						 
						
							
							
								
								Adding remote follow button  
							
							
							
						 
						
							2017-01-01 19:54:34 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								a302e56f9a 
								
							 
						 
						
							
							
								
								Add API for retrieving favourites  
							
							
							
						 
						
							2016-12-29 20:33:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								49834a6e7f 
								
							 
						 
						
							
							
								
								Add API for retrieving blocked accounts  
							
							
							
						 
						
							2016-12-29 20:12:32 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								8724094ed0 
								
							 
						 
						
							
							
								
								Support remote follow request providing URL instead of acct  
							
							
							
						 
						
							2016-12-29 17:23:27 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								eca6110fc4 
								
							 
						 
						
							
							
								
								Add preferences for follow request notification e-mails  
							
							
							
						 
						
							2016-12-26 22:04:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								2146ac91a0 
								
							 
						 
						
							
							
								
								Follow requests send e-mail notifications, but are excluded from notifications API  
							
							... 
							
							
							
							Better initial state for unlisted/nsfw toggles 
							
						 
						
							2016-12-26 21:52:03 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								3282448878 
								
							 
						 
						
							
							
								
								Fix   #86  - resolve layout breaking on zoom-out on accounts grid  
							
							
							
						 
						
							2016-12-26 18:48:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Eugen Rochko 
								
							 
						 
						
							
							
							
							
								
							
							
								26f969665d 
								
							 
						 
						
							
							
								
								Fix alignment  
							
							
							
						 
						
							2016-12-23 00:45:16 +01:00