about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-01-13Extend rails-settings-cached to merge db-saved hash values with defaultsEugen Rochko
2017-01-12Add settings for contact informationEugen Rochko
2017-01-12Migrate from ledermann/rails-settings to rails-settings-cached which allows ↵Eugen Rochko
global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage
2017-01-12Merge pull request #461 from vjackson725/masterEugen
fix Vagrantfile so that the correct ruby is installed
2017-01-12fix Vagrantfile so that the correct ruby is installedvjackson725
Prior to this commit, the vagrantfile installs ruby 2.3.3. Due to commit mastodon@7951e7f, this no longer works. Change the provision scrip so that 2.3.1 is installed via rbenv. Note this drastically increases provision time.
2017-01-12Add rake task for clearing out media from silenced accountsEugen Rochko
2017-01-12Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user ↵Eugen Rochko
to xss themselves rather than anyone else)
2017-01-11Add ruby version to Gemfile, move devDependencies in package.json to ↵Eugen Rochko
dependencies, fix bug in process feed service
2017-01-11Merge pull request #456 from ineffyble/fix-repo-urlEugen
Fix repo URL
2017-01-11Better animationsEugen Rochko
2017-01-11Update the Mastodon repository URL from Gargron/ to tootsuite/ in various placesEffy Elden
2017-01-10Fix env variable nameEugen
2017-01-10Fix issue when settings are not defined for column typeEugen Rochko
2017-01-10Home column filtersEugen Rochko
2017-01-10Add "not found" component to UIEugen Rochko
2017-01-10Add link to list of appsEugen
2017-01-10Merge pull request #450 from blackle/masterEugen
simplify emojification on public pages with .emojify class
2017-01-09simplify emojification on public pages with .emojify classblackle
2017-01-09Fix sandboxed iOS login againEugen Rochko
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
generated by cgit-pink (git 2.37.1) at 2024-12-04 19:51:23 +0000