6497 Commits (62840398327790b868139328324668682cc5b306)

 

All Branches   

Search

Author	SHA1	Message	Date
beatrix	8f1ec48cbe	Merge pull request #421 from ThibG/glitch-soc/features/custom-emoji-api ... [Glitch] retrieve custom emoji list via API instead of before page load	7 years ago
beatrix	125e8c7f5a	Merge pull request #427 from ThibG/glitch-soc/fixes/scroll-behavior ... Improve ScrollableList behavior	7 years ago
beatrix	cd5728b176	Merge pull request #434 from ThibG/glitch-soc/fixes/public-inline-video ... Fix video player on toot public views	7 years ago
beatrix	6fb610f865	Merge pull request #433 from ThibG/glitch-soc/fixes/status-filtering ... Status filtering fixes from upstream	7 years ago
beatrix	e88ce27855	Merge pull request #435 from ThibG/glitch-soc/features/public-modals ... [Glitch] Show media modal on public pages	7 years ago
beatrix	d7ae97c10a	Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statuses ... Add fade and margin to collapsed statuses	7 years ago
Una Thompson	5f9b85a0cf	Add fade and margin to collapsed statuses	7 years ago
Eugen Rochko	4ca2f73b12	Rescue Mastodon::LengthValidationError in Remoteable (#7228) ... Fix #7198 by allowing records with optional attachments to save	7 years ago
jumoru	b305a23933	Fix: Use "exportierten" instead of "exportieren" in translation (#7186) ... Spotted when looking at https://metalhead.club/@thomas/99881521526619858	7 years ago
Lynx Kotoura	3c5006ec7f	Fix text colors (#7227)	7 years ago
ThibG	597948fb13	Do not set emoji as inline-block (fixes #5743) (#7207)	7 years ago
David Baucum	ca9192d9ba	Ability to specify Redis passwd on mastodon:setup (#7222) ... Closes #7221	7 years ago
Yamagishi Kazutoshi	648d645c2f	Fix randomly fail (similar #7219) (#7225)	7 years ago
Matthias Beyer	3fa3161472	Fix: Use "welches" instead of "dass" in translation (#7185)	7 years ago
Yamagishi Kazutoshi	3f6893c641	Reset locale on registration tests (#7219)	7 years ago
Yamagishi Kazutoshi	9b8bb2a5df	Replace badge to CircleCI (#7216)	7 years ago
Yamagishi Kazutoshi	b8f0cfd6e3	Add parallel test processors (#7215)	7 years ago
Lynx Kotoura	a4a36d994b	Separate high contrast theme (#7213)	7 years ago
Yamagishi Kazutoshi	d10447c3a8	Use raw status code on have_http_status (#7214)	7 years ago
Eugen Rochko	bfe26ef67b	Force convert to JPG for preview card thumbnails to avoid animations (#7109) ... * 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	7 years ago
goofy-bz	1a27f9f46f	one grammar fix (#7212)	7 years ago
Yamagishi Kazutoshi	b438224751	Introduce rspec-retry (#7206)	7 years ago
unarist	84214b864c	Ignore keyevents during text composition (#7205) ... 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.	7 years ago
Yamagishi Kazutoshi	87e3f0a41d	Fix spec for sr-Latn (#7203)	7 years ago
TakesxiSximada	23106844a1	Fix the hot key (j, k) does not function correctly when there is a pinned 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	7 years ago
Thibaut Girka	e4dff10934	Fix video player on toot public views	7 years ago
Thibaut Girka	7a68079b3f	[Glitch] Show media modal on public pages ... Port ff7941e652 to glitch-soc	7 years ago
mayaeh	ee2e0f694a	Fix #6157: boosting own private toots (#7200) ... * Fix boosting own private toots. * Run yarn manage:translations and update Japanese translations.	7 years ago
unarist	4e35ce8269	Fix Esc hotkey behavior (#7199) ... 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.	7 years ago
Yamagishi Kazutoshi	6f63cbb53c	Replace Travis to CircleCI (#7196)	7 years ago
Yamagishi Kazutoshi	084cf0babf	Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)	7 years ago
Eugen Rochko	a9c440637c	Improve report layout (#7188) ... * 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	7 years ago
Yamagishi Kazutoshi	1663368724	Replace preload link tag to Rails helper (#7192)	7 years ago
Jenkins	ed17e173d6	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
beatrix	ca2cbe8f0f	Fix webkit scrollbars (#7191) ... * Revert "Make scroll bars wider (#7060)" This reverts commit 11715454d0. * for real make webkit scrollbar wider	7 years ago
David Yip	40006bcd03	Merge pull request #426 from ThibG/glitch-soc/features/display-focal-points ... Honor focal points when displaying media	7 years ago
Thibaut Girka	13fa8ec2c7	[Glitch] Fix status filtering in contexts reducer ... Port 1a37d7e252 to glitch-soc	7 years ago
Thibaut Girka	f84b4d90cb	[Glitch] Do not filter the status collection after muting and blocking ... Port fd87e5a53b to glitch-soc	7 years ago
Emelia Smith	b9c35785e2	Reports: Merge contents and comment columns (#7189)	7 years ago
Thibaut Girka	694337d9bb	Fix auto-collapsed toots making the TL jump (fixes #417)	7 years ago
Thibaut Girka	931a4d1ebf	Clean up dead code	7 years ago
Thibaut Girka	8f8b71a278	Use React's new lifecycles for scrollable lists	7 years ago
Thibaut Girka	3068384dbc	Glitchsoc-specific changes to allow boosting own private toots	7 years ago
Thibaut Girka	779aa707ec	Only compute height dynamically for standalone media ... This prevents changing the status' height and triggering jumps in the TL	7 years ago
Thibaut Girka	52229405ed	[Glitch] Make detailed status' media gallery standalone	7 years ago
Thibaut Girka	dcc1c10937	[Glitch] Center thumbnails on focus point ... Port the display part of the following commits to glitch-soc: * 90f12f2e5a * b170627ceb * 11697d6894 * 56eb5c3f34	7 years ago
Thibaut Girka	f1e25b672a	Use javascript to set MediaGallery height automatically	7 years ago
Thibaut Girka	a95f8271be	Revert some glitch-specific refactoring ... In order to keep my sanity when porting changes between glitch-soc and upstream.	7 years ago
Thibaut Girka	1822ce89f9	[Glitch] retrieve custom emoji list via API instead of before page load ... Port b08ab329f4 to glitch-soc	7 years ago
Jenkins	d55ab8e3e8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago