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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								38bc85e695
								
							
						 | 
						
							
							
								
								Merge pull request #443 from blackle/master
							
							
							
							
							
							
							
							Add call-to developers on getting started page 
							
						 | 
						
							2017-01-08 13:36:02 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									blackle
								
							 
						 | 
						
							
							
							
							
								
							
							
								05e964688d
								
							
						 | 
						
							
							
								
								Expand dropdown leftways on status view
							
							
							
							
							
						 | 
						
							2017-01-08 06:32:37 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									blackle
								
							 
						 | 
						
							
							
							
							
								
							
							
								b4f09bae1d
								
							
						 | 
						
							
							
								
								Add call-to developers on getting started page
							
							
							
							
							
						 | 
						
							2017-01-08 00:23:22 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								69643338f6
								
							
						 | 
						
							
							
								
								Merge pull request #437 from krainboltgreene/patch-1
							
							
							
							
							
							
							
							Simplifying followers mappings 
							
						 | 
						
							2017-01-08 04:14:54 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Kurtis Rainbolt-Greene
								
							 
						 | 
						
							
							
							
							
								
							
							
								abe3ae1cc2
								
							
						 | 
						
							
							
								
								Simplifying followers mappings
							
							
							
							
							
							
							
							Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory. 
							
						 | 
						
							2017-01-07 18:09:00 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Kurtis Rainbolt-Greene
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a7e3e5082
								
							
						 | 
						
							
							
								
								Less complicated determination
							
							
							
							
							
						 | 
						
							2017-01-07 17:59:51 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Kurtis Rainbolt-Greene
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5d9009d71
								
							
						 | 
						
							
							
								
								Using "rails style" order arguments
							
							
							
							
							
						 | 
						
							2017-01-07 17:55:40 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a0a13ab53
								
							
						 | 
						
							
							
								
								Merge pull request #432 from blackle/volume-icon
							
							
							
							
							
							
							
							Show correct volume icons on video player 
							
						 | 
						
							2017-01-08 02:36:12 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									blackle
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a571158c9
								
							
						 | 
						
							
							
								
								Show correct volume icons on video player
							
							
							
							
							
						 | 
						
							2017-01-07 20:23:15 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								cec7e69827
								
							
						 | 
						
							
							
								
								Merge pull request #430 from blackle/logout_mobile
							
							
							
							
							
							
							
							Show logout button on getting started so it's available on mobile 
							
						 | 
						
							2017-01-08 01:24:06 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									blackle
								
							 
						 | 
						
							
							
							
							
								
							
							
								e1ca354956
								
							
						 | 
						
							
							
								
								Show logout button on getting started so it's available on mobile
							
							
							
							
							
						 | 
						
							2017-01-07 18:41:57 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									blackle
								
							 
						 | 
						
							
							
							
							
								
							
							
								57ff221c0f
								
							
						 | 
						
							
							
								
								Emojify display names in notifcations
							
							
							
							
							
						 | 
						
							2017-01-07 18:16:14 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									blackle
								
							 
						 | 
						
							
							
							
							
								
							
							
								61211b509c
								
							
						 | 
						
							
							
								
								Improve contrast of bio and username text in account info
							
							
							
							
							
						 | 
						
							2017-01-07 16:39:30 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								be6ae3546f
								
							
						 | 
						
							
							
								
								Replace getting started icon on desktop nav bar with asterisk instead of hamburger
							
							
							
							
							
						 | 
						
							2017-01-07 15:46:39 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								5c7add2176
								
							
						 | 
						
							
							
								
								Fix #147 - Unreblogging will leave original status in feeds
							
							
							
							
							
						 | 
						
							2017-01-07 15:44:22 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								989c3f4002
								
							
						 | 
						
							
							
								
								Add tab bar alternative to desktop UI, upgrade react & react-redux
							
							
							
							
							
						 | 
						
							2017-01-06 22:09:55 +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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								92bd5f62f6
								
							
						 | 
						
							
							
								
								Merge pull request #417 from ineffyble/twitter-card-metadata
							
							
							
							
							
							
							
							Twitter Cards support 
							
						 | 
						
							2017-01-06 01:16:45 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b9f8766e8
								
							
						 | 
						
							
							
								
								Fix #416 - Generate random unique 14-byte (19 characters) shortcodes
							
							
							
							
							
							
							
							for local attachments, use them in URLs. Check status privacy
before redirecting to actual file. 
							
						 | 
						
							2017-01-06 00:29:12 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Effy Elden
								
							 
						 | 
						
							
							
							
							
								
							
							
								819bfb75c6
								
							
						 | 
						
							
							
								
								Add twitter:card metatag to enable Twitter Cards support
							
							
							
							
							
						 | 
						
							2017-01-06 09:47:40 +11:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Effy Elden
								
							 
						 | 
						
							
							
							
							
								
							
							
								10a9ebae3b
								
							
						 | 
						
							
							
								
								Add tag property to desktop notifications, preventing duplicates (i.e. when multiple Mastodon tabs are open)
							
							
							
							
							
						 | 
						
							2017-01-06 08:26:45 +11:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								00b9ba64c9
								
							
						 | 
						
							
							
								
								Fixed unexpected error
							
							
							
							
							
						 | 
						
							2017-01-05 14:23:59 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								a1de2e332d
								
							
						 | 
						
							
							
								
								Fix compose form bug
							
							
							
							
							
						 | 
						
							2017-01-05 14:18:38 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca7dce4a5a
								
							
						 | 
						
							
							
								
								Fix selection resetting in compose form after unrelated data updates
							
							
							
							
							
						 | 
						
							2017-01-05 14:11:18 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen Rochko
								
							 
						 | 
						
							
							
							
							
								
							
							
								10e6288444
								
							
						 | 
						
							
							
								
								Revert to Roboto for all
							
							
							
							
							
						 | 
						
							2017-01-05 13:59:58 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e6ceb3201
								
							
						 | 
						
							
							
								
								Revert "Display native emoji on browsers which support it"
							
							
							
							
							
						 | 
						
							2017-01-05 13:45:21 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								87f76d4095
								
							
						 | 
						
							
							
								
								Merge pull request #403 from ticky/use-system-fonts
							
							
							
							
							
							
							
							Use system fonts on more platforms 
							
						 | 
						
							2017-01-05 13:37:48 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								c3c9879b5e
								
							
						 | 
						
							
							
								
								Merge pull request #404 from mistydemeo/emoji
							
							
							
							
							
							
							
							Display native emoji on browsers which support it 
							
						 | 
						
							2017-01-05 13:37:29 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								df89cb5488
								
							
						 | 
						
							
							
								
								Merge pull request #399 from ticky/public-timeline-de-hoist
							
							
							
							
							
							
							
							Public timeline de-hoist 
							
						 | 
						
							2017-01-05 13:36:55 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eugen
								
							 
						 | 
						
							
							
							
							
								
							
							
								92638308ee
								
							
						 | 
						
							
							
								
								Merge pull request #400 from ticky/differentiate-settings-links
							
							
							
							
							
							
							
							Differentiate settings links 
							
						 | 
						
							2017-01-05 13:36:13 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |