about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-04-22Merge pull request #433 from ThibG/glitch-soc/fixes/status-filteringbeatrix
Status filtering fixes from upstream
2018-04-22Merge pull request #435 from ThibG/glitch-soc/features/public-modalsbeatrix
[Glitch] Show media modal on public pages
2018-04-22Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statusesbeatrix
Add fade and margin to collapsed statuses
2018-04-22Add fade and margin to collapsed statusesUna Thompson
2018-04-22Rescue Mastodon::LengthValidationError in Remoteable (#7228)Eugen Rochko
Fix #7198 by allowing records with optional attachments to save
2018-04-22Fix: Use "exportierten" instead of "exportieren" in translation (#7186)jumoru
Spotted when looking at https://metalhead.club/@thomas/99881521526619858
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
Closes #7221
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
* Force convert to JPG for preview card thumbnails to avoid animations Fix #7093 * Conditionally convert to JPG only if original is GIF Coalesce and strip on all formats to ensure no animated APNGs
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
KeyboardEvent.key may be physical key name (Escape, Tab, etc.) even in text composition and it causes hotkeys or suggestion selection. So we need to check e.which or e.isComposing. Checking e.which also allows us to avoid Esc key on compositionend in Safari.
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 ↵TakesxiSximada
toot in account timeline. (#7202) * Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. * Fix typo * Add custom attribute prefix
2018-04-20Fix video player on toot public viewsThibaut Girka
2018-04-20[Glitch] Show media modal on public pagesThibaut Girka
Port ff7941e652af1d54d9c991254556e7932a8b183c to glitch-soc
2018-04-20Fix #6157: boosting own private toots (#7200)mayaeh
* Fix boosting own private toots. * Run yarn manage:translations and update Japanese translations.
2018-04-20Fix Esc hotkey behavior (#7199)unarist
This fixes following cases which causes hotkey action accidentally: * hitting Esc key to cancel text composition (mostly in CJK) Although events on cancelling composition are still heavily browser / input method dependent, but this implementation would covers current UI Events spec and some exceptions. * hitting Esc key to close autocomplete suggestions This PR changes to use keydown event instead of keyup event as well as other hotkeys.
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
* Use table for statuses in report * Display reported account and reporter in the same table * Split accounts and general report info into two tables again * Redesign report statuses table, notes, merge notes and action log * Remove unused translations * Fix code style issue * Fix code style issue * Fix code style issue
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
* Revert "Make scroll bars wider (#7060)" This reverts commit 11715454d033784bf6176b75a954e5c28b5d79e5. * for real make webkit scrollbar wider
2018-04-19Merge pull request #426 from ThibG/glitch-soc/features/display-focal-pointsDavid Yip
Honor focal points when displaying media
2018-04-19[Glitch] Fix status filtering in contexts reducerThibaut Girka
Port 1a37d7e252aa41fd1c66e780e1a2a1426d8f3545 to glitch-soc
2018-04-19[Glitch] Do not filter the status collection after muting and blockingThibaut Girka
Port fd87e5a53bcaafb886a675c76e9256015e9db897 to glitch-soc
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
This prevents changing the status' height and triggering jumps in the TL
2018-04-19[Glitch] Make detailed status' media gallery standaloneThibaut Girka
2018-04-19[Glitch] Center thumbnails on focus pointThibaut Girka
Port the display part of the following commits to glitch-soc: * 90f12f2e5a41115a9a756f9dd38054736080d4f9 * b170627ceb8838c358aef1fcca9673ce4aa61ab8 * 11697d68942db7b97a4c7384e4fb4148a97b9122 * 56eb5c3f344f0342ac6f26a05748bc21c585a729
2018-04-19Use javascript to set MediaGallery height automaticallyThibaut Girka
2018-04-19Revert some glitch-specific refactoringThibaut Girka
In order to keep my sanity when porting changes between glitch-soc and upstream.
2018-04-19[Glitch] retrieve custom emoji list via API instead of before page loadThibaut Girka
Port b08ab329f4d149fd414e0539574f49062c571a8a to glitch-soc
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
generated by cgit-pink (git 2.37.1) at 2024-11-24 05:32:04 +0000