| 
						
					 | 
					
						
						
							
						
						2e71bb031b
					 | 
					
						
						
							
							Fix Paperclip timeout setting. Fix bug introduced in #437
						
						
						
						
						
						
					 | 
					
						2017-01-08 19:12:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						38bc85e695
					 | 
					
						
						
							
							Merge pull request #443 from blackle/master
						
						
						
						
						
						
						
						Add call-to developers on getting started page 
						
						
					 | 
					
						2017-01-08 13:36:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a8e30060ae
					 | 
					
						
						
							
							Merge pull request #446 from blackle/dropdown2
						
						
						
						
						
						
						
						Expand dropdown leftways on status view 
						
						
					 | 
					
						2017-01-08 13:34:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						05e964688d
					 | 
					
						
						
							
							Expand dropdown leftways on status view
						
						
						
						
						
						
					 | 
					
						2017-01-08 06:32:37 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b4f09bae1d
					 | 
					
						
						
							
							Add call-to developers on getting started page
						
						
						
						
						
						
					 | 
					
						2017-01-08 00:23:22 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						69643338f6
					 | 
					
						
						
							
							Merge pull request #437 from krainboltgreene/patch-1
						
						
						
						
						
						
						
						Simplifying followers mappings 
						
						
					 | 
					
						2017-01-08 04:14:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e8d6f6c8c1
					 | 
					
						
						
							
							Merge pull request #436 from krainboltgreene/patch-2
						
						
						
						
						
						
						
						Less complicated determination of subscription 
						
						
					 | 
					
						2017-01-08 04:00:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						db8a088502
					 | 
					
						
						
							
							Update badges
						
						
						
						
						
						
					 | 
					
						2017-01-08 03:47:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4a7e3e5082
					 | 
					
						
						
							
							Less complicated determination
						
						
						
						
						
						
					 | 
					
						2017-01-07 17:59:51 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6d097d559b
					 | 
					
						
						
							
							Merge pull request #434 from vjackson725/fix_vagrantfile
						
						
						
						
						
						
						
						Fix Vagrantfile to include yarn 
						
						
					 | 
					
						2017-01-08 02:58:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4447c4c7c8
					 | 
					
						
						
							
							Merge pull request #435 from krainboltgreene/patch-1
						
						
						
						
						
						
						
						Using "rails style" order arguments 
						
						
					 | 
					
						2017-01-08 02:58:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e5d9009d71
					 | 
					
						
						
							
							Using "rails style" order arguments
						
						
						
						
						
						
					 | 
					
						2017-01-07 17:55:40 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						db3d5d811c
					 | 
					
						
						
							
							Fix Vagrantfile to include yarn
						
						
						
						
						
						
						
						The current Vagrantfile fails to build upon provisioning, as it lacks yarn.
Change the Vagrantfile to add the yarn repository, and install yarn. 
						
						
					 | 
					
						2017-01-08 12:38:04 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7a0a13ab53
					 | 
					
						
						
							
							Merge pull request #432 from blackle/volume-icon
						
						
						
						
						
						
						
						Show correct volume icons on video player 
						
						
					 | 
					
						2017-01-08 02:36:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8a571158c9
					 | 
					
						
						
							
							Show correct volume icons on video player
						
						
						
						
						
						
					 | 
					
						2017-01-07 20:23:15 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e1ca354956
					 | 
					
						
						
							
							Show logout button on getting started so it's available on mobile
						
						
						
						
						
						
					 | 
					
						2017-01-07 18:41:57 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						679aa35e15
					 | 
					
						
						
							
							Merge pull request #429 from blackle/emojify_usernames
						
						
						
						
						
						
						
						Emojify display names in notifcations 
						
						
					 | 
					
						2017-01-08 00:19:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57ff221c0f
					 | 
					
						
						
							
							Emojify display names in notifcations
						
						
						
						
						
						
					 | 
					
						2017-01-07 18:16:14 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						165df323ae
					 | 
					
						
						
							
							Merge pull request #428 from blackle/contrast
						
						
						
						
						
						
						
						Improve contrast of bio and username text in account info 
						
						
					 | 
					
						2017-01-07 22:51:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						61211b509c
					 | 
					
						
						
							
							Improve contrast of bio and username text in account info
						
						
						
						
						
						
					 | 
					
						2017-01-07 16:39:30 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2fbb38e4b2
					 | 
					
						
						
							
							Merge pull request #425 from ineffyble/vagrant
						
						
						
						
						
						
						
						Add Vagrant support for easy development environments 
						
						
					 | 
					
						2017-01-07 18:31:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						be6ae3546f
					 | 
					
						
						
							
							Replace getting started icon on desktop nav bar with asterisk instead of hamburger
						
						
						
						
						
						
					 | 
					
						2017-01-07 15:46:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5c7add2176
					 | 
					
						
						
							
							Fix #147 - Unreblogging will leave original status in feeds
						
						
						
						
						
						
					 | 
					
						2017-01-07 15:44:22 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7ddec6e7c3
					 | 
					
						
						
							
							Add read timeout to paperclip when it's downloading remote images
						
						
						
						
						
						
					 | 
					
						2017-01-07 15:43:56 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						11ea7336e9
					 | 
					
						
						
							
							Tweak Vagrant info in README
						
						
						
						
						
						
					 | 
					
						2017-01-08 01:30:48 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						46fb634c79
					 | 
					
						
						
							
							Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000
						
						
						
						
						
						
					 | 
					
						2017-01-08 01:28:49 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f1289ca3c0
					 | 
					
						
						
							
							Add Vagrant development environment support
						
						
						
						
						
						
					 | 
					
						2017-01-07 23:22:24 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						989c3f4002
					 | 
					
						
						
							
							Add tab bar alternative to desktop UI, upgrade react & react-redux
						
						
						
						
						
						
					 | 
					
						2017-01-06 22:09:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1bfbce7b45
					 | 
					
						
						
							
							Clean up h-card mess of divs
						
						
						
						
						
						
					 | 
					
						2017-01-06 20:24:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						72c3a41bef
					 | 
					
						
						
							
							Fix h-card classes and remote follow button appearing when it shouldn't
						
						
						
						
						
						
					 | 
					
						2017-01-06 20:15:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8b28b82141
					 | 
					
						
						
							
							Merge branch 'myfreeweb-master'
						
						
						
						
						
						
					 | 
					
						2017-01-06 20:09:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18deeb9db5
					 | 
					
						
						
							
							Add Microformats2 markup
						
						
						
						
						
						
						
						h-feed, h-card and h-entry 
						
						
					 | 
					
						2017-01-06 18:10:10 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						92bd5f62f6
					 | 
					
						
						
							
							Merge pull request #417 from ineffyble/twitter-card-metadata
						
						
						
						
						
						
						
						Twitter Cards support 
						
						
					 | 
					
						2017-01-06 01:16:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6917099a6a
					 | 
					
						
						
							
							Merge pull request #418 from ticky/upgrade-emojione
						
						
						
						
						
						
						
						Upgrade EmojiOne to 2.2.7 
						
						
					 | 
					
						2017-01-06 01:13:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						28a2f79dff
					 | 
					
						
						
							
							Upgrade EmojiOne to 2.2.7
						
						
						
						
						
						
						
						Adds support for, among other things, 🏳️🌈 
						
						
					 | 
					
						2017-01-05 15:16:13 -08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						819bfb75c6
					 | 
					
						
						
							
							Add twitter:card metatag to enable Twitter Cards support
						
						
						
						
						
						
					 | 
					
						2017-01-06 09:47:40 +11:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f21eb6064
					 | 
					
						
						
							
							Merge pull request #415 from ineffyble/master
						
						
						
						
						
						
						
						Prevent duplicate desktop notifications 
						
						
					 | 
					
						2017-01-05 23:15:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						00b9ba64c9
					 | 
					
						
						
							
							Fixed unexpected error
						
						
						
						
						
						
					 | 
					
						2017-01-05 14:23:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a1de2e332d
					 | 
					
						
						
							
							Fix compose form bug
						
						
						
						
						
						
					 | 
					
						2017-01-05 14:18:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ca7dce4a5a
					 | 
					
						
						
							
							Fix selection resetting in compose form after unrelated data updates
						
						
						
						
						
						
					 | 
					
						2017-01-05 14:11:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						10e6288444
					 | 
					
						
						
							
							Revert to Roboto for all
						
						
						
						
						
						
					 | 
					
						2017-01-05 13:59:58 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3354dc117b
					 | 
					
						
						
							
							Merge pull request #406 from Gargron/revert-404-emoji
						
						
						
						
						
						
						
						Revert "Display native emoji on browsers which support it" 
						
						
					 | 
					
						2017-01-05 13:45:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9e6ceb3201
					 | 
					
						
						
							
							Revert "Display native emoji on browsers which support it"
						
						
						
						
						
						
					 | 
					
						2017-01-05 13:45:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						87f76d4095
					 | 
					
						
						
							
							Merge pull request #403 from ticky/use-system-fonts
						
						
						
						
						
						
						
						Use system fonts on more platforms 
						
						
					 | 
					
						2017-01-05 13:37:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c3c9879b5e
					 | 
					
						
						
							
							Merge pull request #404 from mistydemeo/emoji
						
						
						
						
						
						
						
						Display native emoji on browsers which support it 
						
						
					 | 
					
						2017-01-05 13:37:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						df89cb5488
					 | 
					
						
						
							
							Merge pull request #399 from ticky/public-timeline-de-hoist
						
						
						
						
						
						
						
						Public timeline de-hoist 
						
						
					 | 
					
						2017-01-05 13:36:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |