about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-01-09Merge branch 'blackle-master'Eugen Rochko
2017-01-09Merge branch 'master' of https://github.com/blackle/mastodon into blackle-masterEugen Rochko
2017-01-09Merge branch 'blackle-dropdown'Eugen Rochko
2017-01-09Merge branch 'dropdown' of https://github.com/blackle/mastodon into ↵Eugen Rochko
blackle-dropdown
2017-01-09Persist UI settings, add missing localizations for GermanEugen Rochko
2017-01-09Improve initialState loadingEugen Rochko
2017-01-08Generate key for each input so we can upload the same file even after deletingblackle
2017-01-08Switch to compose view when tapping 'mention' in dropdown on mobileblackle
2017-01-08Fix Paperclip timeout setting. Fix bug introduced in #437Eugen Rochko
2017-01-08Merge pull request #443 from blackle/masterEugen
Add call-to developers on getting started page
2017-01-08Merge pull request #446 from blackle/dropdown2Eugen
Expand dropdown leftways on status view
2017-01-08Expand dropdown leftways on status viewblackle
2017-01-08Add call-to developers on getting started pageblackle
2017-01-08Merge pull request #437 from krainboltgreene/patch-1Eugen
Simplifying followers mappings
2017-01-08Merge pull request #436 from krainboltgreene/patch-2Eugen
Less complicated determination of subscription
2017-01-08Update badgesEugen
2017-01-07Simplifying followers mappingsKurtis Rainbolt-Greene
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
2017-01-07Less complicated determinationKurtis Rainbolt-Greene
2017-01-08Merge pull request #434 from vjackson725/fix_vagrantfileEugen
Fix Vagrantfile to include yarn
2017-01-08Merge pull request #435 from krainboltgreene/patch-1Eugen
Using "rails style" order arguments
2017-01-07Using "rails style" order argumentsKurtis Rainbolt-Greene
2017-01-08Fix Vagrantfile to include yarnvjackson725
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-08Merge pull request #432 from blackle/volume-iconEugen
Show correct volume icons on video player
2017-01-07Show correct volume icons on video playerblackle
2017-01-08Merge pull request #430 from blackle/logout_mobileEugen
Show logout button on getting started so it's available on mobile
2017-01-07Show logout button on getting started so it's available on mobileblackle
2017-01-08Merge pull request #429 from blackle/emojify_usernamesEugen
Emojify display names in notifcations
2017-01-07Emojify display names in notifcationsblackle
2017-01-07Merge pull request #428 from blackle/contrastEugen
Improve contrast of bio and username text in account info
2017-01-07Improve contrast of bio and username text in account infoblackle
2017-01-07Merge pull request #425 from ineffyble/vagrantEugen
Add Vagrant support for easy development environments
2017-01-07Replace getting started icon on desktop nav bar with asterisk instead of ↵Eugen Rochko
hamburger
2017-01-07Fix #147 - Unreblogging will leave original status in feedsEugen Rochko
2017-01-07Add read timeout to paperclip when it's downloading remote imagesEugen Rochko
2017-01-08Tweak Vagrant info in READMEEffy Elden
2017-01-08Improve Vagrantfile, load environment variables from .env.vagrant, always ↵Effy Elden
forward localhost:3000
2017-01-07Add Vagrant development environment supportEffy Elden
2017-01-06Add tab bar alternative to desktop UI, upgrade react & react-reduxEugen Rochko
2017-01-06Clean up h-card mess of divsEugen Rochko
2017-01-06Fix h-card classes and remote follow button appearing when it shouldn'tEugen Rochko
2017-01-06Merge branch 'myfreeweb-master'Eugen Rochko
2017-01-06Add Microformats2 markupGreg V
h-feed, h-card and h-entry
2017-01-06Merge pull request #417 from ineffyble/twitter-card-metadataEugen
Twitter Cards support
2017-01-06Merge pull request #418 from ticky/upgrade-emojioneEugen
Upgrade EmojiOne to 2.2.7
2017-01-06Fix #416 - Generate random unique 14-byte (19 characters) shortcodesEugen Rochko
for local attachments, use them in URLs. Check status privacy before redirecting to actual file.
2017-01-05Upgrade EmojiOne to 2.2.7Jessica Stokes
Adds support for, among other things, 🏳️‍🌈
2017-01-06Add twitter:card metatag to enable Twitter Cards supportEffy Elden
2017-01-05Merge pull request #415 from ineffyble/masterEugen
Prevent duplicate desktop notifications
2017-01-06Add tag property to desktop notifications, preventing duplicates (i.e. when ↵Effy Elden
multiple Mastodon tabs are open)
2017-01-05Fixed unexpected errorEugen Rochko