about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-04-26Refactor selectComposeSuggestion so that different paths can be updatedThibaut Girka
2019-04-26New string added for Slovak translation (#10637)Marek Ľach
2019-04-25Bump bootsnap from 1.4.3 to 1.4.4 (#10634)dependabot[bot]
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>
2019-04-25Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621)Eugen Rochko
2019-04-25Fix not being able to save e-mail preference for new pending accounts (#10622)Eugen Rochko
2019-04-25Fix upload progressbar when image resizing is involved (#10632)ThibG
2019-04-25Reject follow requests of blocked users (#10633)ThibG
2019-04-24Do not ask to register web intent handlerThibaut Girka
2019-04-24Fix color of muted statuses content not wrapped in a p tagThibaut Girka
2019-04-24Redesign blockquote stylingThibaut Girka
2019-04-24Better distinguish titles from textThibaut Girka
2019-04-24Remove extra margin in paragraphs inside blockquotesThibaut Girka
2019-04-24Make bold text bolderThibaut Girka
2019-04-24Remove margins around `p` tags in listsThibaut Girka
2019-04-24Rename status__text to status__content__text for consistency with upstreamThibaut Girka
2019-04-24Fix status header display in toot mobile menuThibaut Girka
2019-04-24Fix upload progressbar when image resizing is involvedThibaut Girka
2019-04-24Hide media upload form if no media are attachedThibaut Girka
2019-04-24Merge pull request #1007 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-04-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-24Fix file uploadThibaut Girka
2019-04-23Fix settings modalThibaut Girka
2019-04-23Bump sidekiq from 5.2.6 to 5.2.7 (#10627)dependabot[bot]
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>
2019-04-23Bump capybara from 3.17.0 to 3.18.0 (#10626)dependabot[bot]
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>
2019-04-23Fix stoplight logging to stderr separate from Rails logger (#10624)Eugen Rochko
2019-04-23Fix sign up button not saying sign up when invite is used (#10623)Eugen Rochko
Fix #10616
2019-04-23[Security] Bump nokogiri from 1.10.2 to 1.10.3 (#10620)dependabot[bot]
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>
2019-04-23Bump capybara from 3.16.2 to 3.17.0 (#10602)dependabot[bot]
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>
2019-04-23Fixed Healthchecks in docker-compose.yml (#10553)Fabian Schlenz
2019-04-22Do not leak local-only toots to remote mentioned usersThibaut Girka
2019-04-22Load custom CSS rules after standard onesThibaut Girka
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.
2019-04-22Add support for lists in statusesThibaut Girka
2019-04-22Do not switch to italic for status media buttonsThibaut Girka
2019-04-22Accept richer text from remote statusesThibaut Girka
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5 HTML elements in remote statuses, add corresponding CSS.
2019-04-22Merge pull request #1002 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-04-22[Glitch] Fix modal items cannot scroll on touch deviceskedama
Port d763d39d2628bef123cdc801b2a3a3922b7e37f2 to glitch-soc
2019-04-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2019-04-22Fix ReferenceError in dropdownThibaut Girka
2019-04-22Fix broken reference to handleSubmitThibaut Girka
2019-04-22CleanupThibaut Girka
2019-04-22Move ComposerPublisher to ComposeThibaut Girka
2019-04-22Add OptionsContainerThibaut Girka
2019-04-22Move composer Dropdown from features/composer to features/composeThibaut Girka
2019-04-22Move ComposerTextareaIcons to TextareaIconsThibaut Girka
2019-04-22ComposerTextarea → AutosuggestTextareaThibaut Girka
2019-04-22ComposerUploadForm → UploadForm + UploadFormContainerThibaut Girka
2019-04-22Move PollForm from features/composer to features/composeThibaut Girka
2019-04-22Inline spoiler inputThibaut Girka
2019-04-22ComposerReply → ReplyIndicatorThibaut Girka
2019-04-22Refactor Compose*Warning → ContainerWarningThibaut Girka
Regression: only one warning at a time