about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-08-29Add opt-in feature to have the spoilers field always on (fixes #634)Thibaut Girka
2018-08-29Merge pull request #690 from ThibG/glitch-soc/merge-upstreamThibG
2018-08-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-29Replace '貼' with '嘟' for 'toot' (#8421)caasi Huang
2018-08-29Add ffmpeg buildpack for scalingo (#8500)Satsuki Yanagi
2018-08-29formatter spec fixes & clarification (#8481)sundevour
2018-08-29Reduce padding of profile metadata boxes to allow more text (#8491)Mélanie Chauvel (ariasuni)
2018-08-29Fix followers/follows layout issues from #8418 (#8505)Jakub Mendyk
2018-08-29Delete .gitkeep file since the app/javascript/mastodon directory is no longer...Drew Schuster
2018-08-28Fix CSP with S3/SWIFT hostsThibaut Girka
2018-08-28[Glitch] Add CSS class to repliesThibaut Girka
2018-08-28[Glitch] Preserve hashtag casing in web UI hashtag historyThibaut Girka
2018-08-28[Glitch] Implement tag auto-completion by historyThibaut Girka
2018-08-28Preserve hashtag casing in threaded modeThibaut Girka
2018-08-28Merge pull request #684 from ThibG/glitch-soc/merge-upstreamThibG
2018-08-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-28Adjust CSP to fix image resizingThibaut Girka
2018-08-28Display pending message on admin relays UI (#8494)Eugen Rochko
2018-08-27[Glitch] Add missing video descriptionsThibaut Girka
2018-08-27[Glitch] Wait until relationship is loaded before showing follow buttonThibaut Girka
2018-08-27Merge pull request #675 from ThibG/glitch-soc/merge-upstreamThibG
2018-08-27Add CSS class to replies (#8473)Maciek Baron
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