6643 Commits (4749fe5019fd120ce8a60140b05c5364d0778684)

 

All Branches   

Search

Author	SHA1	Message	Date
beatrix	1b58c44557	Merge pull request #435 from ThibG/glitch-soc/features/public-modals ... [Glitch] Show media modal on public pages	7 years ago
beatrix	dd13a0461b	Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statuses ... Add fade and margin to collapsed statuses	7 years ago
Una Thompson	880db71121	Add fade and margin to collapsed statuses	7 years ago
Eugen Rochko	0ad5e05e4a	Rescue Mastodon::LengthValidationError in Remoteable (#7228) ... Fix #7198 by allowing records with optional attachments to save	7 years ago
jumoru	915ec9c988	Fix: Use "exportierten" instead of "exportieren" in translation (#7186) ... Spotted when looking at https://metalhead.club/@thomas/99881521526619858	7 years ago
Lynx Kotoura	e0c3d950d1	Fix text colors (#7227)	7 years ago
ThibG	f57fc4ca51	Do not set emoji as inline-block (fixes #5743) (#7207)	7 years ago
David Baucum	259e3aa7bf	Ability to specify Redis passwd on mastodon:setup (#7222) ... Closes #7221	7 years ago
Yamagishi Kazutoshi	32b71c8a25	Fix randomly fail (similar #7219) (#7225)	7 years ago
Matthias Beyer	b56a55352a	Fix: Use "welches" instead of "dass" in translation (#7185)	7 years ago
Yamagishi Kazutoshi	3637c4983b	Reset locale on registration tests (#7219)	7 years ago
Yamagishi Kazutoshi	308be04040	Replace badge to CircleCI (#7216)	7 years ago
Yamagishi Kazutoshi	c461895933	Add parallel test processors (#7215)	7 years ago
Lynx Kotoura	670b5bcc6a	Separate high contrast theme (#7213)	7 years ago
Yamagishi Kazutoshi	7da649efb4	Use raw status code on have_http_status (#7214)	7 years ago
Eugen Rochko	85c3f7eb1b	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	86c2ceb21f	one grammar fix (#7212)	7 years ago
Yamagishi Kazutoshi	0d4342e146	Introduce rspec-retry (#7206)	7 years ago
unarist	456fff2bba	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	0939d9ede6	Fix spec for sr-Latn (#7203)	7 years ago
TakesxiSximada	937c93e8d9	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	e4b0a92c0f	Fix video player on toot public views	7 years ago
Thibaut Girka	d6693f3ae3	[Glitch] Show media modal on public pages ... Port 47d2277ef1 to glitch-soc	7 years ago
mayaeh	1b881b585d	Fix #6157: boosting own private toots (#7200) ... * Fix boosting own private toots. * Run yarn manage:translations and update Japanese translations.	7 years ago
unarist	42d7307565	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	efa4eb4d13	Replace Travis to CircleCI (#7196)	7 years ago
Yamagishi Kazutoshi	3aee1034e5	Add extract_foreign_key_action to Mastodon::MigrationHelpers (#7195)	7 years ago
Eugen Rochko	354a6e4026	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	7a8c526709	Replace preload link tag to Rails helper (#7192)	7 years ago
Jenkins	c9265e97cc	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
beatrix	172ce95cd4	Fix webkit scrollbars (#7191) ... * Revert "Make scroll bars wider (#7060)" This reverts commit c0ad48c683. * for real make webkit scrollbar wider	7 years ago
David Yip	589974dd9f	Merge pull request #426 from ThibG/glitch-soc/features/display-focal-points ... Honor focal points when displaying media	7 years ago
Thibaut Girka	f15ee5fdb9	[Glitch] Fix status filtering in contexts reducer ... Port 899cca061b to glitch-soc	7 years ago
Thibaut Girka	f7ec78e220	[Glitch] Do not filter the status collection after muting and blocking ... Port ce0d30feb7 to glitch-soc	7 years ago
Emelia Smith	185407d3a2	Reports: Merge contents and comment columns (#7189)	7 years ago
Thibaut Girka	74bfb1e579	Fix auto-collapsed toots making the TL jump (fixes #417)	7 years ago
Thibaut Girka	f63da992fc	Clean up dead code	7 years ago
Thibaut Girka	fe20ada59a	Use React's new lifecycles for scrollable lists	7 years ago
Thibaut Girka	f83dc9507f	Glitchsoc-specific changes to allow boosting own private toots	7 years ago
Thibaut Girka	9b72f23fdd	Only compute height dynamically for standalone media ... This prevents changing the status' height and triggering jumps in the TL	7 years ago
Thibaut Girka	46b36c44ce	[Glitch] Make detailed status' media gallery standalone	7 years ago
Thibaut Girka	e0bffe8856	[Glitch] Center thumbnails on focus point ... Port the display part of the following commits to glitch-soc: * 865c7e7178 * 62d18a3f9b * 15ec9431be * c1d44284ca	7 years ago
Thibaut Girka	c4209e12f6	Use javascript to set MediaGallery height automatically	7 years ago
Thibaut Girka	b283f463c9	Revert some glitch-specific refactoring ... In order to keep my sanity when porting changes between glitch-soc and upstream.	7 years ago
Thibaut Girka	5cd64fd6c6	[Glitch] retrieve custom emoji list via API instead of before page load ... Port f3db0d6ecc to glitch-soc	7 years ago
Jenkins	a359d69b09	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	b5d0bf338c	Fix text color in "show more" link inside boost confirmation modal (#7183)	7 years ago
David Yip	337662fa0c	Merge remote-tracking branch 'glitchsoc/master' into gs-master	7 years ago
David Yip	48f5f736a0	db: make schema.rb version subsume bookmarks migration.	7 years ago
David Yip	bae5435010	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json	7 years ago