aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
981 Commits
135 Branches
278 Tags
1.0 GiB
Commit Graph

981 Commits (205ba000174e1c553b871ee4ef1313e282e68a68)
 

Author SHA1 Message Date
Eugen Rochko 205ba00017 Fix sandboxed iOS login again
Eugen Rochko 5d558c14b4 Merge branch 'blackle-master'
Eugen Rochko def1f8c5b3 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
Eugen Rochko d6a456dc71 Merge branch 'blackle-dropdown'
Eugen Rochko 3bddd647e0 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
Eugen Rochko 75f80bef10 Persist UI settings, add missing localizations for German
Eugen Rochko 23ebf60b95 Improve initialState loading
blackle 131bae89fd Generate key for each input so we can upload the same file even after deleting
blackle d64c454cfe Switch to compose view when tapping 'mention' in dropdown on mobile
Eugen Rochko 2e71bb031b Fix Paperclip timeout setting. Fix bug introduced in
Eugen 38bc85e695 Merge pull request from blackle/master 
Add call-to developers on getting started page
Eugen a8e30060ae Merge pull request from blackle/dropdown2 
Expand dropdown leftways on status view
blackle 05e964688d Expand dropdown leftways on status view
blackle b4f09bae1d Add call-to developers on getting started page
Eugen 69643338f6 Merge pull request from krainboltgreene/patch-1 
Simplifying followers mappings
Eugen e8d6f6c8c1 Merge pull request from krainboltgreene/patch-2 
Less complicated determination of subscription
Eugen db8a088502 Update badges
Kurtis Rainbolt-Greene abe3ae1cc2 Simplifying followers mappings 
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
Kurtis Rainbolt-Greene 4a7e3e5082 Less complicated determination
Eugen 6d097d559b Merge pull request from vjackson725/fix_vagrantfile 
Fix Vagrantfile to include yarn
Eugen 4447c4c7c8 Merge pull request from krainboltgreene/patch-1 
Using "rails style" order arguments
Kurtis Rainbolt-Greene e5d9009d71 Using "rails style" order arguments
vjackson725 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.
Eugen 7a0a13ab53 Merge pull request from blackle/volume-icon 
Show correct volume icons on video player
blackle 8a571158c9 Show correct volume icons on video player
Eugen cec7e69827 Merge pull request from blackle/logout_mobile 
Show logout button on getting started so it's available on mobile
blackle e1ca354956 Show logout button on getting started so it's available on mobile
Eugen 679aa35e15 Merge pull request from blackle/emojify_usernames 
Emojify display names in notifcations
blackle 57ff221c0f Emojify display names in notifcations
Eugen 165df323ae Merge pull request from blackle/contrast 
Improve contrast of bio and username text in account info
blackle 61211b509c Improve contrast of bio and username text in account info
Eugen 2fbb38e4b2 Merge pull request from ineffyble/vagrant 
Add Vagrant support for easy development environments
Eugen Rochko be6ae3546f Replace getting started icon on desktop nav bar with asterisk instead of hamburger
Eugen Rochko 5c7add2176 Fix - Unreblogging will leave original status in feeds
Eugen Rochko 7ddec6e7c3 Add read timeout to paperclip when it's downloading remote images
Effy Elden 11ea7336e9 Tweak Vagrant info in README
Effy Elden 46fb634c79 Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000
Effy Elden f1289ca3c0 Add Vagrant development environment support
Eugen Rochko 989c3f4002 Add tab bar alternative to desktop UI, upgrade react & react-redux
Eugen Rochko 1bfbce7b45 Clean up h-card mess of divs
Eugen Rochko 72c3a41bef Fix h-card classes and remote follow button appearing when it shouldn't
Eugen Rochko 8b28b82141 Merge branch 'myfreeweb-master'
Greg V 18deeb9db5 Add Microformats2 markup 
h-feed, h-card and h-entry
Eugen 92bd5f62f6 Merge pull request from ineffyble/twitter-card-metadata 
Twitter Cards support
Eugen 6917099a6a Merge pull request from ticky/upgrade-emojione 
Upgrade EmojiOne to 2.2.7
Eugen Rochko 7b9f8766e8 Fix - Generate random unique 14-byte (19 characters) shortcodes 
for local attachments, use them in URLs. Check status privacy
before redirecting to actual file.
Jessica Stokes 28a2f79dff
Upgrade EmojiOne to 2.2.7 
Adds support for, among other things, 🏳️‍🌈
Effy Elden 819bfb75c6 Add twitter:card metatag to enable Twitter Cards support
Eugen 9f21eb6064 Merge pull request from ineffyble/master 
Prevent duplicate desktop notifications
Effy Elden 10a9ebae3b Add tag property to desktop notifications, preventing duplicates (i.e. when multiple Mastodon tabs are open)