about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2019-04-22features/composer/index.js → ComposeFormThibaut Girka
2019-04-22DrawerHeader → Header + HeaderContainerThibaut Girka
2019-04-22DrawerAccount → NavigationBar + NavigationContainerThibaut Girka
2019-04-22[Glitch] Show suggested follows on search screen in mobile layoutEugen Rochko
Port ad510db3a19640267f94062756d558a45472af14 to glitch-soc
2019-04-22DrawerResults → SearchResults + SearchResultsContainerThibaut Girka
2019-04-22Rework DrawerResults to make them closer to upstreamThibaut Girka
2019-04-22Move DrawerSearch to Search + SearchContainerThibaut Girka
2019-04-22Inline DrawerSearchPopout in DrawerSearchThibaut Girka
2019-04-22Refactor a bit DrawerSearch to make it closer to upstreamThibaut Girka
2019-04-22Rename flavours/glitch/features/drawer to flavours/glitch/features/composeThibaut Girka
2019-04-22Bump aws-sdk-s3 from 1.36.0 to 1.36.1 (#10618)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.36.0 to 1.36.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.36.0...v1.36.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-22Bump doorkeeper from 5.0.2 to 5.1.0 (#10598)dependabot[bot]
Bumps [doorkeeper](https://github.com/doorkeeper-gem/doorkeeper) from 5.0.2 to 5.1.0. - [Release notes](https://github.com/doorkeeper-gem/doorkeeper/releases) - [Changelog](https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md) - [Commits](https://github.com/doorkeeper-gem/doorkeeper/compare/v5.0.2...v5.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-22Allow switching between singe-option and multiple-option polls (#10603)ThibG
2019-04-22Fix modal items cannot scroll on touch devices (#10605)kedama
2019-04-22Minor code cleanup (#10613)ThibG
2019-04-22Bump cld3 from 3.2.3 to 3.2.4 (#10617)dependabot[bot]
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.2.3 to 3.2.4. - [Release notes](https://github.com/akihikodaki/cld3-ruby/releases) - [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.2.3...v3.2.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-21i18n: Fix misleading strings in Polish translation (#10615)marcin mikołajczak
2019-04-21Small fix Dutch translation (#10612)jeroenpraat
* Small fix Dutch translation * Better descriptive titles See #10611
2019-04-21i18n: Update Catalan translation (#10559)Yamagishi Kazutoshi
* Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations
2019-04-21Default to the web domain (eg. mastodon.lubar.me) instead of the local ↵Ben Lubar
domain (eg. lubar.me) for keybase proofs (#10565)
2019-04-21Add hi.json (#10573)Yamagishi Kazutoshi
2019-04-21Bump webpush from 0.3.7 to 0.3.8 (#10592)dependabot[bot]
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.7 to 0.3.8. - [Release notes](https://github.com/zaru/webpush/releases) - [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md) - [Commits](https://github.com/zaru/webpush/compare/v0.3.7...v0.3.8) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-21Bump lograge from 0.10.0 to 0.11.0 (#10588)dependabot[bot]
Bumps [lograge](https://github.com/roidrage/lograge) from 0.10.0 to 0.11.0. - [Release notes](https://github.com/roidrage/lograge/releases) - [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md) - [Commits](https://github.com/roidrage/lograge/compare/v0.10.0...v0.11.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-04-21Update hy.json (#10591)partev
2019-04-21Treat meta[property] as a space-separated list (#10604)Daniel Aleksandersen
The @property attribute in HTML is a space-separated list of values. This change normalizes whitespace and finds the desired value in the list instead of requiring an exact single-value match. More details: https://www.ctrl.blog/entry/rdfa-socialmedia-metadata.html
2019-04-21Animate avatar GIFs on-hover on public profiles (#10549)Jessica
* Third time is the charm? * Use full asset URL for data-static and data-original ̀image_tag` expands to the full asset URL, we have to do the same in `data` attributes so that it can work when assets and user data are stored on a different host
2019-04-21Update NL (Dutch) translation (#10601)jeroenpraat
* Update NL language strings Have to do it this way, cause this file is locked on Weblate * fix * Update simple_form.nl.yml * Update nl.yml
2019-04-21Use correct local names for fonts (#10594)ThibG