9254 Commits (0f1d2f4d71d1720833244708491ac6438d38ee2e)

 

All Branches   

Search

Author	SHA1	Message	Date
dependabot[bot]	b3d218e5a1	Bump bootsnap from 1.4.3 to 1.4.4 (#10634) ... Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.3...v1.4.4) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Eugen Rochko	be7bab1fd9	Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)	5 years ago
Eugen Rochko	2ba12c8917	Fix not being able to save e-mail preference for new pending accounts (#10622)	5 years ago
ThibG	23e87a4742	Fix upload progressbar when image resizing is involved (#10632)	5 years ago
ThibG	140be28787	Reject follow requests of blocked users (#10633)	5 years ago
Thibaut Girka	642a298ceb	Do not ask to register web intent handler	5 years ago
Thibaut Girka	8942036345	Fix color of muted statuses content not wrapped in a p tag	5 years ago
Thibaut Girka	73f83ef399	Redesign blockquote styling	5 years ago
Thibaut Girka	f5ea016889	Better distinguish titles from text	5 years ago
Thibaut Girka	8003dd8849	Remove extra margin in paragraphs inside blockquotes	5 years ago
Thibaut Girka	a855f38086	Make bold text bolder	5 years ago
Thibaut Girka	ad30895262	Remove margins around `p` tags in lists	5 years ago
Thibaut Girka	ce2da44c2c	Rename status__text to status__content__text for consistency with upstream	5 years ago
Thibaut Girka	facc95f71a	Fix status header display in toot mobile menu	5 years ago
Thibaut Girka	b43cfd3eb3	Fix upload progressbar when image resizing is involved	5 years ago
Thibaut Girka	4a95bfe919	Hide media upload form if no media are attached	5 years ago
ThibG	0ffd5fdd2c	Merge pull request #1007 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	5 years ago
Thibaut Girka	0f97c82eac	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Thibaut Girka	07367bc6ec	Fix file upload	5 years ago
Thibaut Girka	86108e7af7	Fix settings modal	5 years ago
dependabot[bot]	d5d779cd34	Bump sidekiq from 5.2.6 to 5.2.7 (#10627) ... Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.6 to 5.2.7. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.6...v5.2.7) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	795f2a7c8f	Bump capybara from 3.17.0 to 3.18.0 (#10626) ... Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.17.0 to 3.18.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.17.0...3.18.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Eugen Rochko	55449c0b41	Fix stoplight logging to stderr separate from Rails logger (#10624)	5 years ago
Eugen Rochko	72f3242a59	Fix sign up button not saying sign up when invite is used (#10623) ... Fix #10616	5 years ago
dependabot[bot]	7ea37bbdc8	[Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620) ... Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.2 to 1.10.3. **This update includes security fixes.** - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.2...v1.10.3) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
dependabot[bot]	907415ac08	Bump capybara from 3.16.2 to 3.17.0 (#10602) ... Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.16.2 to 3.17.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.16.2...3.17.0) Signed-off-by: dependabot[bot] <support@dependabot.com>	5 years ago
Fabian Schlenz	2d6fd9197b	Fixed Healthchecks in docker-compose.yml (#10553)	5 years ago
Thibaut Girka	2d2eca5bda	Do not leak local-only toots to remote mentioned users	5 years ago
Thibaut Girka	2ad61962ae	Load custom CSS rules after standard ones ... Fixes #933 Due to glitch-soc's theming system, JS and CSS files are imported in a slightly different order, and custom CSS rules were loaded *before* everything else. They will now be loaded *after* everything else, which is a bit different from upstream but should work better overall.	5 years ago
Thibaut Girka	9aeb714b7a	Add support for lists in statuses	5 years ago
Thibaut Girka	fea727c61a	Do not switch to italic for status media buttons	5 years ago
Thibaut Girka	22ad8c89b2	Accept richer text from remote statuses ... Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5 HTML elements in remote statuses, add corresponding CSS.	5 years ago
ThibG	b2f73231a4	Merge pull request #1002 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	5 years ago
kedama	4ce6358787	[Glitch] Fix modal items cannot scroll on touch devices ... Port 92ced1e94b to glitch-soc	5 years ago
Thibaut Girka	6f85bb754b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc	5 years ago
Thibaut Girka	1b8d2af1f9	Fix ReferenceError in dropdown	5 years ago
Thibaut Girka	25cfabce26	Fix broken reference to handleSubmit	5 years ago
Thibaut Girka	041e27bd2d	Cleanup	5 years ago
Thibaut Girka	2ee26ba420	Move ComposerPublisher to Compose	5 years ago
Thibaut Girka	bf8b0394b7	Add OptionsContainer	5 years ago
Thibaut Girka	ef17da32f9	Move composer Dropdown from features/composer to features/compose	5 years ago
Thibaut Girka	a6bb49adf1	Move ComposerTextareaIcons to TextareaIcons	5 years ago
Thibaut Girka	08faf16d66	ComposerTextarea → AutosuggestTextarea	5 years ago
Thibaut Girka	513547ba57	ComposerUploadForm → UploadForm + UploadFormContainer	5 years ago
Thibaut Girka	f7d1772fc8	Move PollForm from features/composer to features/compose	5 years ago
Thibaut Girka	2021f14e8f	Inline spoiler input	5 years ago
Thibaut Girka	3529f6f4ae	ComposerReply → ReplyIndicator	5 years ago
Thibaut Girka	ad6166f0ef	Refactor Compose*Warning → ContainerWarning ... Regression: only one warning at a time	5 years ago
Thibaut Girka	5e4588524b	features/composer/index.js → ComposeForm	5 years ago
Thibaut Girka	8ea0e64864	DrawerHeader → Header + HeaderContainer	5 years ago