about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #975 from tomfhowe/patch-4Shel R
Use autohiding scrollbars in Microsoft Edge
2017-04-07Merge branch 'master' into patch-4Shel R
2017-04-07Merge pull request #973 from ZiiX/patch-1Shel R
added instance
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #972 from amandavisconti/masterShel R
Added digitalhumanities.club instance
2017-04-07Merge branch 'master' into masterShel R
2017-04-07Merge pull request #970 from estuans/patch-1Shel R
Update Production-guide.md
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #969 from Fortyseven/patch-1Shel R
Add social.bytestemplar.com to instances list
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #959 from mkody/patch-1Shel R
Added im-in.space
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #953 from Technowix/patch-1Shel R
Add niu.moe, cuz it's kawaii
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-07Merge pull request #944 from VirtuBox/patch-1Shel R
Update List-of-Mastodon-instances.md
2017-04-07Merge branch 'master' into patch-1Shel R
2017-04-08Merge pull request #1204 from benklop/patch-1Eugen
Update Administration-guide.md
2017-04-08Merge pull request #1200 from huertanix/patch-2Eugen
Update Heroku-guide.md
2017-04-08Merge pull request #1210 from raymestalez/patch-3Eugen
Add HackerNewsBot
2017-04-07Add HackerNewsBotRay Alez
I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.
2017-04-07Update Administration-guide.mdbenklop
the syntax for running the rake task wasn't correct.
2017-04-08Merge pull request #1125 from jasonrhodes/patch-1Eugen
Email service options :P
2017-04-07Merge pull request #1147 from fmauNeko/docker_smaller_imageEugen
Fix npm/yarn cache cleaning
2017-04-07Update Heroku-guide.mdDavid Huerta
Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit.
2017-04-07Merge pull request #1191 from d3vgru/masterEugen
change suggested cipher for nginx
2017-04-07Fix npm/yarn cache cleaningFlorian Maunier
2017-04-07Merge pull request #1172 from mjankowski/mj-heroku-docsEugen
Update heroku instructions
2017-04-07Merge pull request #1183 from thoughtbot/cp-post-status-service-specsEugen
Add specs for PostStatusService
2017-04-07Merge pull request #1184 from thoughtbot/extract-proper-statusEugen
DRY up reblog vs original status check
2017-04-07Merge pull request #1192 from seekr/patch-2Eugen
typo
2017-04-07Merge pull request #1193 from thoughtbot/status-specsEugen
Implement pending specs on Status
2017-04-07Implement pending specs on StatusJoël Quenneville
Implement the two pending specs on `Status`: `reblogs_count` and `favourites_count`.
2017-04-07typoseekr
2017-04-07change suggested cipher for nginxEd Knutson
2017-04-07Use I18n for media attachment validation errorsChad Pytel
These are currently user facing errors, but are not localized. This adds the ability for these messages to be localized.
2017-04-07Add specs for PostStatusServiceChad Pytel
This implements all pending specs, and adds additional coverage for the following functionality: * Normal status creation * Creating a reply status * Creating a sensitive status * Creating a status with spoiler text * A status with no spoiler text gets an empty string for spoiler text * Creating a status with custom visibility * Creating a status for an application * Processing mentions * Processing Hashtags * Pinging PuSH hubs * Crawling links * Attaching media
2017-04-07DRY up reblog vs original status checkJoël Quenneville
Checking reblog vs original status was happening in multiple places across the app. For views, this logic was encapsulated in a helper method named `proper_status` but in the other layers of the app, the logic was duplicated. Because the logic is used at all layers of the app, we extracted it into a `Status#proper` method on the model and changed all uses of the logic to use this method. There is now a single source of truth for this condition. We added test coverage to untested methods that got refactored.
2017-04-07Add specs for media attachment validationsChad Pytel
There are currently not specs for the two media validations that are performed by `PostStatusService`. This adds specs for the validations that ensure that you cannot attach more than four files, and that a status cannot have both image and video attachments.
2017-04-07Update heroku instructionsMatt Jankowski
2017-04-07Moved into a comment per feedbackJason Rhodes
2017-04-07Merge pull request #1146 from tootsuite/fix-object-type-nil-exceptionEugen
Fix nil#object_type error
2017-04-07Merge pull request #1145 from tootsuite/feature-customized-default-localeEugen
Allow setting of default language through config
2017-04-07Merge branch 'master' into fix-object-type-nil-exceptionEugen
2017-04-07Merge branch 'master' into feature-customized-default-localeEugen
2017-04-07Fix nil#object_type errorEugen Rochko
2017-04-07Update Finnish translations, add sample Minio config (#954)Jantso Porali
2017-04-07Allow setting of default language through configEugen Rochko
Setting of locale in controller extracted to Localized concern, the doorkeeper authorized applications controller moved under custom namespace with inclusion of Localized, which resolves the "it sometimes appears in a different random language" bug
2017-04-07Re-add forgotten <author> element on standalone <entry>Eugen Rochko
2017-04-07Force UTF8 encoding on generated XML (#1140)Eugen