about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-04Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0Kurtis Rainbolt-Greene
2017-04-05Merge branch 'fakenine-add_more_tests_to_models'Eugen Rochko
2017-04-05Fix specEugen Rochko
2017-04-05Merge branch 'master' into add_more_tests_to_modelsEugen
2017-04-05Merge pull request #885 from optikfluffel/patch-1Eugen
Update Production-guide.md
2017-04-05Merge pull request #839 from SirCmpwn/profile-readabilityEugen
Improve readability of text on profiles
2017-04-05Merge pull request #860 from pierreozoux/patch-1Eugen
Update the list of instances
2017-04-05Merge branch 'master' into patch-1Eugen
2017-04-05Merge pull request #859 from dereckson/patch-1Eugen
Add social.nasqueron.org instance
2017-04-05Merge branch 'master' into patch-1Eugen
2017-04-05Merge pull request #843 from fmauNeko/patch-1Eugen
Update List-of-Mastodon-instances.md
2017-04-05Merge branch 'master' into patch-1Eugen
2017-04-04Improve readability of text on profilesDrew DeVault
2017-04-05Merge pull request #863 from Eychics/masterEugen
Add closed_registrations message on French language
2017-04-05Merge pull request #818 from JantsoP/masterEugen
Updated Finnish Translation
2017-04-05Merge pull request #846 from TrollDecker/masterEugen
Update social.diskseven.com's IPv6 status
2017-04-05Merge pull request #842 from Angristan/patch-2Eugen
Missing quotes
2017-04-05Merge pull request #845 from thurloat/patch-1Eugen
Add mastodon.club to running instances list
2017-04-05Merge pull request #848 from ProgVal/patch-3Eugen
Add oc.todon.fr to the list of instances.
2017-04-05Merge pull request #854 from Angristan/patch-3Eugen
Fix crontab edit
2017-04-05Merge pull request #866 from kklleemm/patch-1Eugen
Fix typos on french translations
2017-04-05Merge pull request #792 from chapeaumeinfreund/masterEugen
Updated and fixed german orthography
2017-04-05Merge pull request #790 from chapeaumeinfreund/patch-1Eugen
Updated and fixed german orthography
2017-04-05Merge pull request #852 from peterkeen/email-whitelist-817Eugen
[#817] Add email whitelist
2017-04-05Merge pull request #891 from ashfurrow/patch-1Eugen
Adds instructions for adding admin users for Heroku installs
2017-04-05Merge pull request #805 from nevillepark/masterEugen
Changed "reblogs" to "boosts"
2017-04-05Merge pull request #894 from asm/mastodon_ccEugen
Adding https://mastodon.cc
2017-04-05Merge pull request #898 from SirCmpwn/remote-follow-improvementsEugen
Remote follow improvements
2017-04-05Merge pull request #858 from krainboltgreene/patch-6Eugen
Use active record shorthand
2017-04-04Updates instructions.Ash Furrow
2017-04-05Merge pull request #872 from kwaio/patch-1Eugen
typo in admin doc
2017-04-04Remote follow improvementsDrew DeVault
This stores the @username@instance you provide in your session and reuses it the next time you remote follow someone from this instance.
2017-04-05Merge pull request #868 from Angristan/patch-4Eugen
Add file package
2017-04-05Remove PuSH subscriptions when delivery is answered with a 4xx errorEugen Rochko
2017-04-04Adding https://mastodon.ccJason Snell
2017-04-05alphebatically order test gem group as required by rubocopSamy KACIMI
2017-04-05fix rubocop issuesSamy KACIMI
2017-04-04Adds instructions for adding admin users.Ash Furrow
2017-04-05Merge branch 'master' into add_more_tests_to_modelsSamy KACIMI
2017-04-05update account_specSamy KACIMI
2017-04-05rollback database.yml updateSamy KACIMI
2017-04-05add more tests to modelsSamy KACIMI
2017-04-04Update Production-guide.mdUdo Kramer
2017-04-04Merge pull request #876 from krainboltgreene/patch-7Eugen
Quick attempt to get pull requests passing
2017-04-04Quick attempt to get pull requests passingKurtis Rainbolt-Greene
2017-04-04typo in admin docNope Nope
s/rails/rake/
2017-04-04Add file packageAngristan
If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media.
2017-04-04Spawn FeedInsertWorker to deliver status into personal feedEugen Rochko
2017-04-04Fix typos on french translationsClément D
2017-04-04Add closed_registrations message on French languageThibaut (Eychics)