about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-08-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-27Include MOV in upload button tooltip. (#8480)M Somerville
2018-08-27Weblate translations (2018-08-27) (#8483)Renato "Lond" Cerqueira
2018-08-26Better singulars of account followers/toots. (#8471)M Somerville
2018-08-26Make Api::V1::MutesController paginate properly (#8472)Jakub Mendyk
2018-08-26Add more hotkeys to legend (#8469)Marcin Mikołajczak
2018-08-26Add CLI task for rotating keys (#8466)Eugen Rochko
2018-08-26Bump interactions count when a follow happens (#8468)Eugen Rochko
2018-08-26Add thor to Gemfile directly (#8467)Eugen Rochko
2018-08-26Fix low-hanging rubocop gripes (#8458)Quint Guvernator
2018-08-26Merge pull request #674 from ThibG/glitch-soc/merge-upstreamThibG
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-26Add aria-label to notifications (#8460)Eugen Rochko
2018-08-26Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning (#8462)Eugen Rochko
2018-08-26Delay e-mail notifications by 2 minutes (#8438)Eugen Rochko
2018-08-26Add CLI interface for importing custom emoji (#8437)Eugen Rochko
2018-08-26Add messages informing that collections are empty (fixes #4115) (#8418)Jakub Mendyk
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-26Update _bio.html.haml (#8449)Tad Thorley
2018-08-26Fix regression from #8439 (#8455)Eugen Rochko
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-26Merge pull request #671 from ThibG/glitch-soc/merge-upstreamThibG
2018-08-26Add health endpoint to streaming API (#8441)Eugen Rochko
2018-08-26Fix CW issues in static view on Safari (Fixes #8354) (#8446)PatrickRWells
2018-08-26Spread out crawling randomly to avoid DDoSing the link (#8445)Eugen Rochko
2018-08-26Specify allowed media in upload button tooltip. (#8443)M Somerville
2018-08-26Revert "Default puma to running on localhost only." (#8444)Eugen Rochko
2018-08-25Add theme identifier to body classes for easier custom CSS styling (#8439)Eugen Rochko
2018-08-25Wait until relationship is loaded before showing follow button (#8440)Eugen Rochko
2018-08-25fix pam authentication for certain hostnames (#8412)Alexander
2018-08-25Default puma to running on localhost only. (#8429)M Somerville
2018-08-25Disable retries on all scheduled tasks (#8413)Eugen Rochko
2018-08-25Weblate translations (2018-08-25) (#8420)Yamagishi Kazutoshi
2018-08-25Support ActivityStreams’ summaryMap. (#8422)M Somerville
2018-08-25Rename S3_CLOUDFRONT_HOST to S3_ALIAS_HOST. (#8423)M Somerville
2018-08-25Hide reject media checkbox when not relevant. (#8426)M Somerville
2018-08-25Add improved CLI interface for removing remote media (#8411)Eugen Rochko
2018-08-25Revice Japanese translation of `deleted_status` (#8419)MIYAGI Hikaru
2018-08-24Add missing video descriptions (#8416)M Somerville
2018-08-24Reword the "Delete and rewrite" warning (#8415)Sylvhem
2018-08-24Upgrade Doorkeeper to 5.0.0 (#8409)Eugen Rochko
2018-08-24Support UNIX domain socket for streaming service without using PORT (#8217)MIYAGI Hikaru
2018-08-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-24Add admin custom CSS setting (#8399)Eugen Rochko
2018-08-23Bump version to 2.5.0rc1 (#8356)Eugen Rochko
2018-08-23Allow mods to disable login, improve message when login disabled (#8329)Eugen Rochko
2018-08-23Only apply CSP in production modeThibaut Girka
2018-08-23Tighten CSP while allowing CDN hostsThibaut Girka
2018-08-23Update poylfills (fixes #662)Thibaut Girka
2018-08-23[Glitch] Update state when opened dropdown is unmountedThibaut Girka