| 
								
								
									 Effy Elden | ad61a21752 | Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places | 2017-01-11 13:24:14 +11:00 |  | 
				
					
						| 
								
								
									 Eugen | 001a73c6fc | Fix env variable name | 2017-01-10 22:01:13 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | bc17613e70 | Fix issue when settings are not defined for column type | 2017-01-10 17:33:32 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | c8bcd413e2 | Home column filters | 2017-01-10 17:25:10 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 15b183117c | Add "not found" component to UI | 2017-01-10 13:50:59 +01:00 |  | 
				
					
						| 
								
								
									 Eugen | 14a0bec2d8 | Add link to list of apps | 2017-01-10 12:23:30 +01:00 |  | 
				
					
						| 
								
								
									 Eugen | efd4565389 | Merge pull request #450 from blackle/master simplify emojification on public pages with .emojify class | 2017-01-10 12:21:06 +01:00 |  | 
				
					
						| 
								
								
									 blackle | 57e496e1bc | simplify emojification on public pages with .emojify class | 2017-01-09 22:41:47 -05:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 0c0d4b7c92 | Fix sandboxed iOS login again | 2017-01-09 19:43:53 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | ee6b885468 | Merge branch 'blackle-master' | 2017-01-09 14:13:46 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 394f185e91 | Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master | 2017-01-09 14:12:40 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 609748016f | Merge branch 'blackle-dropdown' | 2017-01-09 14:12:00 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | a1783b80b2 | Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown | 2017-01-09 14:10:32 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 4293e132d1 | Persist UI settings, add missing localizations for German | 2017-01-09 14:00:55 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | c1c814e6a1 | Improve initialState loading | 2017-01-09 12:37:53 +01:00 |  | 
				
					
						| 
								
								
									 blackle | 62167338b8 | Generate key for each input so we can upload the same file even after deleting | 2017-01-08 21:00:13 -05:00 |  | 
				
					
						| 
								
								
									 blackle | a697b5473a | Switch to compose view when tapping 'mention' in dropdown on mobile | 2017-01-08 17:12:00 -05:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | f29df16eea | Fix Paperclip timeout setting. Fix bug introduced in #437 | 2017-01-08 19:12:54 +01:00 |  | 
				
					
						| 
								
								
									 Eugen | 9f3e2737e9 | Merge pull request #443 from blackle/master Add call-to developers on getting started page | 2017-01-08 13:36:02 +01:00 |  | 
				
					
						| 
								
								
									 Eugen | 2ee3e2f4a4 | Merge pull request #446 from blackle/dropdown2 Expand dropdown leftways on status view | 2017-01-08 13:34:27 +01:00 |  | 
				
					
						| 
								
								
									 blackle | 9d66dfecf6 | Expand dropdown leftways on status view | 2017-01-08 06:32:37 -05:00 |  | 
				
					
						| 
								
								
									 blackle | 1adfe59c14 | Add call-to developers on getting started page | 2017-01-08 00:23:22 -05:00 |  | 
				
					
						| 
								
								
									 Eugen | 72843ea705 | Merge pull request #437 from krainboltgreene/patch-1 Simplifying followers mappings | 2017-01-08 04:14:54 +01:00 |  | 
				
					
						| 
								
								
									 Eugen | c65508da26 | Merge pull request #436 from krainboltgreene/patch-2 Less complicated determination of subscription | 2017-01-08 04:00:22 +01:00 |  | 
				
					
						| 
								
								
									 Eugen | 5bbd50e180 | Update badges | 2017-01-08 03:47:33 +01:00 |  | 
				
					
						| 
								
								
									 Kurtis Rainbolt-Greene | 5cecff7f2a | 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 | ff835f3377 | Less complicated determination | 2017-01-07 17:59:51 -08:00 |  | 
				
					
						| 
								
								
									 Eugen | e715e3e009 | Merge pull request #434 from vjackson725/fix_vagrantfile Fix Vagrantfile to include yarn | 2017-01-08 02:58:43 +01:00 |  | 
				
					
						| 
								
								
									 Eugen | e7132be958 | Merge pull request #435 from krainboltgreene/patch-1 Using "rails style" order arguments | 2017-01-08 02:58:19 +01:00 |  | 
				
					
						| 
								
								
									 Kurtis Rainbolt-Greene | 82b0eb2ae4 | Using "rails style" order arguments | 2017-01-07 17:55:40 -08:00 |  | 
				
					
						| 
								
								
									 vjackson725 | 4f9cc841b2 | 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 |  | 
				
					
						| 
								
								
									 Eugen | 3f639be601 | Merge pull request #432 from blackle/volume-icon Show correct volume icons on video player | 2017-01-08 02:36:12 +01:00 |  | 
				
					
						| 
								
								
									 blackle | 85cc2dd826 | Show correct volume icons on video player | 2017-01-07 20:23:15 -05:00 |  | 
				
					
						| 
								
								
									 Eugen | 00c9ce1eff | 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 | 8ceae22535 | Show logout button on getting started so it's available on mobile | 2017-01-07 18:41:57 -05:00 |  | 
				
					
						| 
								
								
									 Eugen | 177d9cd8fe | Merge pull request #429 from blackle/emojify_usernames Emojify display names in notifcations | 2017-01-08 00:19:24 +01:00 |  | 
				
					
						| 
								
								
									 blackle | 75c2397ed1 | Emojify display names in notifcations | 2017-01-07 18:16:14 -05:00 |  | 
				
					
						| 
								
								
									 Eugen | 94d1457cd7 | 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 |  | 
				
					
						| 
								
								
									 blackle | a914180df6 | Improve contrast of bio and username text in account info | 2017-01-07 16:39:30 -05:00 |  | 
				
					
						| 
								
								
									 Eugen | c398d2d82b | Merge pull request #425 from ineffyble/vagrant Add Vagrant support for easy development environments | 2017-01-07 18:31:59 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | d019f1632c | Replace getting started icon on desktop nav bar with asterisk instead of hamburger | 2017-01-07 15:46:39 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 126aba0e13 | Fix #147 - Unreblogging will leave original status in feeds | 2017-01-07 15:44:22 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 438446b397 | Add read timeout to paperclip when it's downloading remote images | 2017-01-07 15:43:56 +01:00 |  | 
				
					
						| 
								
								
									 Effy Elden | 7afe78b1d6 | Tweak Vagrant info in README | 2017-01-08 01:30:48 +11:00 |  | 
				
					
						| 
								
								
									 Effy Elden | 6ef79c6948 | Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000 | 2017-01-08 01:28:49 +11:00 |  | 
				
					
						| 
								
								
									 Effy Elden | 2b92e4a37a | Add Vagrant development environment support | 2017-01-07 23:22:24 +11:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 0dac73b5cc | Add tab bar alternative to desktop UI, upgrade react & react-redux | 2017-01-06 22:09:55 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 26390b1997 | Clean up h-card mess of divs | 2017-01-06 20:24:51 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | ecd7a46f98 | Fix h-card classes and remote follow button appearing when it shouldn't | 2017-01-06 20:15:24 +01:00 |  | 
				
					
						| 
								
								
									 Eugen Rochko | 9b5dabfa90 | Merge branch 'myfreeweb-master' | 2017-01-06 20:09:34 +01:00 |  |