about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-04-22Merge pull request #433 from ThibG/glitch-soc/fixes/status-filteringbeatrix
2018-04-22Merge pull request #435 from ThibG/glitch-soc/features/public-modalsbeatrix
2018-04-22Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statusesbeatrix
2018-04-22Add fade and margin to collapsed statusesUna Thompson
2018-04-22Rescue Mastodon::LengthValidationError in Remoteable (#7228)Eugen Rochko
2018-04-22Fix: Use "exportierten" instead of "exportieren" in translation (#7186)jumoru
2018-04-22Fix text colors (#7227)Lynx Kotoura
2018-04-22Do not set emoji as inline-block (fixes #5743) (#7207)ThibG
2018-04-22Ability to specify Redis passwd on mastodon:setup (#7222)David Baucum
2018-04-22Fix randomly fail (similar #7219) (#7225)Yamagishi Kazutoshi
2018-04-22Fix: Use "welches" instead of "dass" in translation (#7185)Matthias Beyer
2018-04-21Reset locale on registration tests (#7219)Yamagishi Kazutoshi
2018-04-21Replace badge to CircleCI (#7216)Yamagishi Kazutoshi
2018-04-21Add parallel test processors (#7215)Yamagishi Kazutoshi
2018-04-21Separate high contrast theme (#7213)Lynx Kotoura
2018-04-21Use raw status code on have_http_status (#7214)Yamagishi Kazutoshi
2018-04-21Force convert to JPG for preview card thumbnails to avoid animations (#7109)Eugen Rochko
2018-04-22one grammar fix (#7212)goofy-bz
2018-04-20Introduce rspec-retry (#7206)Yamagishi Kazutoshi
2018-04-20Ignore keyevents during text composition (#7205)unarist
2018-04-20Fix spec for sr-Latn (#7203)Yamagishi Kazutoshi
2018-04-20Fix the hot key (j, k) does not function correctly when there is a pinned too...TakesxiSximada
2018-04-20Fix video player on toot public viewsThibaut Girka
2018-04-20[Glitch] Show media modal on public pagesThibaut Girka
2018-04-20Fix #6157: boosting own private toots (#7200)mayaeh
2018-04-20Fix Esc hotkey behavior (#7199)unarist
2018-04-20Replace Travis to CircleCI (#7196)Yamagishi Kazutoshi
2018-04-20Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)Yamagishi Kazutoshi
2018-04-20Improve report layout (#7188)Eugen Rochko
2018-04-20Replace preload link tag to Rails helper (#7192)Yamagishi Kazutoshi
2018-04-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-19Fix webkit scrollbars (#7191)beatrix
2018-04-19Merge pull request #426 from ThibG/glitch-soc/features/display-focal-pointsDavid Yip
2018-04-19[Glitch] Fix status filtering in contexts reducerThibaut Girka
2018-04-19[Glitch] Do not filter the status collection after muting and blockingThibaut Girka
2018-04-19Reports: Merge contents and comment columns (#7189)Emelia Smith
2018-04-19Fix auto-collapsed toots making the TL jump (fixes #417)Thibaut Girka
2018-04-19Clean up dead codeThibaut Girka
2018-04-19Use React's new lifecycles for scrollable listsThibaut Girka
2018-04-19Glitchsoc-specific changes to allow boosting own private tootsThibaut Girka
2018-04-19Only compute height dynamically for standalone mediaThibaut Girka
2018-04-19[Glitch] Make detailed status' media gallery standaloneThibaut Girka
2018-04-19[Glitch] Center thumbnails on focus pointThibaut Girka
2018-04-19Use javascript to set MediaGallery height automaticallyThibaut Girka
2018-04-19Revert some glitch-specific refactoringThibaut Girka
2018-04-19[Glitch] retrieve custom emoji list via API instead of before page loadThibaut Girka
2018-04-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-19Fix text color in "show more" link inside boost confirmation modal (#7183)Eugen Rochko
2018-04-18Merge remote-tracking branch 'glitchsoc/master' into gs-masterDavid Yip
2018-04-18db: make schema.rb version subsume bookmarks migration.David Yip