Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							6cf44ca92c 
							
						 
					 
					
						
						
							
							Improve how the list entry Account component looks when target is blocked/follow is requested  
						
						
						
						
					 
					
						2017-01-16 19:36:32 +01:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							889709a2a6 
							
						 
					 
					
						
						
							
							Show 'do not display in public timeline' when replying to self  
						
						
						
						
					 
					
						2017-01-16 10:26:44 -05:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1a33e4042e 
							
						 
					 
					
						
						
							
							Fix upload file input being re-rendered needlessly  
						
						
						
						
					 
					
						2017-01-16 14:21:55 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7d53ee73f3 
							
						 
					 
					
						
						
							
							Fix   #238  - Add "favourites" column  
						
						
						
						
					 
					
						2017-01-16 13:28:25 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							da5d366230 
							
						 
					 
					
						
						
							
							Fix   #414  - Improve lightbox, add loading indicator  
						
						
						
						
					 
					
						2017-01-16 12:04:02 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							2ae0fb4419 
							
						 
					 
					
						
						
							
							Merge branch 'sensitive' of  https://github.com/blackle/mastodon  into blackle-sensitive  
						
						
						
						
					 
					
						2017-01-16 11:36:02 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							0439c7d58b 
							
						 
					 
					
						
						
							
							Move follow requests link above logout link in getting started column  
						
						
						
						
					 
					
						2017-01-16 11:35:32 +01:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							144402ec7e 
							
						 
					 
					
						
						
							
							Show visibility toggle on media gallery for sensitive images  
						
						
						
						
					 
					
						2017-01-15 20:27:08 -05:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							383114add3 
							
						 
					 
					
						
						
							
							Change boost sprite to look like fa-retweet  
						
						
						
						
					 
					
						2017-01-15 11:40:05 -05:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							926459fc0a 
							
						 
					 
					
						
						
							
							Fix typo introduced in  #470  which made unlisted toggle only fade in/out and not also collapse  
						
						
						
						
					 
					
						2017-01-15 14:59:25 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7d7a11250c 
							
						 
					 
					
						
						
							
							Fix   #427  - don't suggest hashtag if the search value contains a space  
						
						
						
						
					 
					
						2017-01-15 14:47:39 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1d5cbfa356 
							
						 
					 
					
						
						
							
							Fix   #449  - don't do relationships fetch for empty array of IDs  
						
						
						
						
					 
					
						2017-01-15 14:47:39 +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 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							1f7c0ad8d3 
							
						 
					 
					
						
						
							
							Merge pull request  #464  from blackle/backflip  
						
						... 
						
						
						
						Make boost button spin around 
						
						
					 
					
						2017-01-15 13:19:15 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							ed41f9f0b1 
							
						 
					 
					
						
						
							
							Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether  
						
						
						
						
					 
					
						2017-01-15 10:30:23 +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 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							a67ffcbf56 
							
						 
					 
					
						
						
							
							Make boost button arrows spin around  
						
						
						
						
					 
					
						2017-01-14 17:56:24 -05: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 
						 
				 
			
				
					
						
							
							
								Effy Elden 
							
						 
					 
					
						
						
						
						
							
						
						
							32d756fb22 
							
						 
					 
					
						
						
							
							Hide 'Do not display on public timeline' for reply toots.  Fixes   #412 .  
						
						
						
						
					 
					
						2017-01-15 06:10:23 +11:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							f63f0c4625 
							
						 
					 
					
						
						
							
							Fix too late return  
						
						
						
						
					 
					
						2017-01-14 02:22:16 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							2939e9898b 
							
						 
					 
					
						
						
							
							Extend rails-settings-cached to merge db-saved hash values with defaults  
						
						
						
						
					 
					
						2017-01-13 02:42:22 +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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7951e7ffd5 
							
						 
					 
					
						
						
							
							Add ruby version to Gemfile, move devDependencies in package.json to dependencies,  
						
						... 
						
						
						
						fix bug in process feed service 
						
						
					 
					
						2017-01-11 15:39:31 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							10739df458 
							
						 
					 
					
						
						
							
							Merge pull request  #456  from ineffyble/fix-repo-url  
						
						... 
						
						
						
						Fix repo URL 
						
						
					 
					
						2017-01-11 14:19:19 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3ad0496ccb 
							
						 
					 
					
						
						
							
							Better animations  
						
						
						
						
					 
					
						2017-01-11 04:21:49 +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 Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							18b11100e7 
							
						 
					 
					
						
						
							
							Fix issue when settings are not defined for column type  
						
						
						
						
					 
					
						2017-01-10 17:33:32 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							312c51b5c8 
							
						 
					 
					
						
						
							
							Home column filters  
						
						
						
						
					 
					
						2017-01-10 17:25:10 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1e9d2c4b1e 
							
						 
					 
					
						
						
							
							Add "not found" component to UI  
						
						
						
						
					 
					
						2017-01-10 13:50:59 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							def1f8c5b3 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/blackle/mastodon  into blackle-master  
						
						
						
						
					 
					
						2017-01-09 14:12:40 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3bddd647e0 
							
						 
					 
					
						
						
							
							Merge branch 'dropdown' of  https://github.com/blackle/mastodon  into blackle-dropdown  
						
						
						
						
					 
					
						2017-01-09 14:10:32 +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 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							131bae89fd 
							
						 
					 
					
						
						
							
							Generate key for each input so we can upload the same file even after deleting  
						
						
						
						
					 
					
						2017-01-08 21:00:13 -05:00 
						 
				 
			
				
					
						
							
							
								blackle 
							
						 
					 
					
						
						
						
						
							
						
						
							d64c454cfe 
							
						 
					 
					
						
						
							
							Switch to compose view when tapping 'mention' in dropdown on mobile  
						
						
						
						
					 
					
						2017-01-08 17:12:00 -05:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							2e71bb031b 
							
						 
					 
					
						
						
							
							Fix Paperclip timeout setting. Fix bug introduced in  #437  
						
						
						
						
					 
					
						2017-01-08 19:12:54 +01:00