about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-10-13Merge branch 'glitch'pluralcafe-docker
2018-10-12Fix auto-unfold CWs when no regexp is setThibaut Girka
Fixes #778
2018-10-12Allow selecting both default flavour and themeThibaut Girka
Fixes #672
2018-10-12Improve signature verification safeguards (#8959)Eugen Rochko
* Downcase signed_headers string before building the signed string The HTTP Signatures draft does not mandate the “headers” field to be downcased, but mandates the header field names to be downcased in the signed string, which means that prior to this patch, Mastodon could fail to process signatures from some compliant clients. It also means that it would not actually check the Digest of non-compliant clients that wouldn't use a lowercased Digest field name. Thankfully, I don't know of any such client. * Revert "Remove dead code (#8919)" This reverts commit a00ce8c92c06f42109aad5cfe65d46862cf037bb. * Restore time window checking, change it to 12 hours By checking the Date header, we can prevent replaying old vulnerable signatures. The focus is to prevent replaying old vulnerable requests from software that has been fixed in the meantime, so a somewhat long window should be fine and accounts for timezone misconfiguration. * Escape users' URLs when formatting them Fixes possible HTML injection * Escape all string interpolations in Formatter class Slightly improve performance by reducing class allocations from repeated Formatter#encode calls * Fix code style issues
2018-10-11Merge pull request #775 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-11Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into ↵Thibaut Girka
glitch-soc/merge-upstream
2018-10-10Bump better_errors from 2.4.0 to 2.5.0 (#8946)dependabot[bot]
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.4.0 to 2.5.0. - [Release notes](https://github.com/BetterErrors/better_errors/releases) - [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md) - [Commits](https://github.com/BetterErrors/better_errors/compare/v2.4.0...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-10Really fix HotKeysThibaut Girka
2018-10-10Bump bullet from 5.7.5 to 5.7.6 (#8947)dependabot[bot]
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.5 to 5.7.6. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/5.7.5...5.7.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-10Bump scss_lint from 0.57.0 to 0.57.1 (#8948)dependabot[bot]
Bumps [scss_lint](https://github.com/brigade/scss-lint) from 0.57.0 to 0.57.1. - [Release notes](https://github.com/brigade/scss-lint/releases) - [Changelog](https://github.com/brigade/scss-lint/blob/master/CHANGELOG.md) - [Commits](https://github.com/brigade/scss-lint/compare/v0.57.0...v0.57.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-10Add description meta tag additionally to og:description (#8941)Eugen Rochko
Fix #8685
2018-10-10Add dns-prefetch if using different host for assets or uploads (#8942)Eugen Rochko
2018-10-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js
2018-10-09Bump capistrano-rails from 1.3.1 to 1.4.0 (#8936)dependabot[bot]
Bumps [capistrano-rails](https://github.com/capistrano/rails) from 1.3.1 to 1.4.0. - [Release notes](https://github.com/capistrano/rails/releases) - [Changelog](https://github.com/capistrano/rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/capistrano/rails/compare/v1.3.1...v1.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-09Bump dotenv-rails from 2.2.2 to 2.5.0 (#8934)dependabot[bot]
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.2.2 to 2.5.0. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/compare/v2.2.2...v2.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-09Fix that the copy button of verify link did not work. (#8938)mayaeh
2018-10-09Track historical space stats in PgHero to determine PostgreSQL growth (#8906)Eugen Rochko
2018-10-09Fix CW icon color in local-settings modalThibaut Girka
2018-10-09Define some local-settings hintsThibaut Girka
2018-10-09Add support for hints (or extended descriptions) in local-settings pagesThibaut Girka
2018-10-09When screen width is too narrow, hide local-settings page text, keep only iconsThibaut Girka
2018-10-09Change “preferences” icon to match settings page iconThibaut Girka
2018-10-09Add icons for each of the local-setting pagesThibaut Girka
2018-10-09Merge pull request #774 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-09Bump faker from 1.8.7 to 1.9.1 (#8935)dependabot[bot]
Bumps [faker](https://github.com/stympy/faker) from 1.8.7 to 1.9.1. - [Release notes](https://github.com/stympy/faker/releases) - [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md) - [Commits](https://github.com/stympy/faker/compare/v1.8.7...v1.9.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-09Bump memory_profiler from 0.9.11 to 0.9.12 (#8937)dependabot[bot]
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.11 to 0.9.12. - [Release notes](https://github.com/SamSaffron/memory_profiler/releases) - [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.11...v0.9.12) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-09Merge pull request #770 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-09Fix app-wide hotkeys randomly failing to workThibaut Girka
2018-10-09add ffmpeg initializer (#8855)Sascha
* add ffmpeg initializer * use different expression to check for environment var
2018-10-09Add Japanese translations. (#8927)mayaeh
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08Fixed error occurrence when pinning the DM column. (#8922)mayaeh
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08Move “Show action buttons in collapsed toots” optionThibaut Girka
2018-10-08Switch from selects to radio buttons for local settings, improve stylingThibaut Girka
2018-10-08Bump capybara from 3.8.2 to 3.9.0 (#8924)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.8.2 to 3.9.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.8.2...3.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-08Bump tty-prompt from 0.17.0 to 0.17.1 (#8925)dependabot[bot]
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.0 to 0.17.1. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.0...v0.17.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-08Bump aws-sdk-s3 from 1.20.0 to 1.21.0 (#8926)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.20.0 to 1.21.0. - [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/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-08Bump i18n-tasks from 0.9.21 to 0.9.25 (#8923)dependabot[bot]
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.21 to 0.9.25. - [Release notes](https://github.com/glebm/i18n-tasks/releases) - [Changelog](https://github.com/glebm/i18n-tasks/blob/master/CHANGES.md) - [Commits](https://github.com/glebm/i18n-tasks/compare/v0.9.21...v0.9.25) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-10-08rubocop issues - Cleaning up (#8912)ashleyhull-versent
* cleanup pass * undo mistakes * fixed. * revert
2018-10-08Remove dead code (#8919)Eugen Rochko
SignatureVerification#matches_time_window? is not called anywhere.
2018-10-08Replace SVG asset with Custom mascot (#8766)ashleyhull-versent
2018-10-07Add conversations API (#8832)Eugen Rochko
* Add conversations API * Add web UI for conversations * Add test for conversations API * Add tests for ConversationAccount * Improve web UI * Rename ConversationAccount to AccountConversation * Remove conversations on block and mute * Change last_status_id to be a denormalization of status_ids * Add optimistic locking
2018-10-07[Glitch] Change documentation URLThibaut Girka
Port 28401962caff028f328d674878e1f0abd16ffdfd to glitch-soc
2018-10-07[Glitch] RTL: fix margins of public-account-header__tabsThibaut Girka
Port 185cb2dc3aac59ee27aa962fff48b064bd638567 to glitch-soc
2018-10-07Merge pull request #768 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-07Ensure only toots from the reported users are reported (#8916)ThibG
2018-10-07Add POST /api/v1/notifications/:id/dismiss (#8905)Eugen Rochko
POST /api/v1/notifications/dismiss was a mistake in #2251
generated by cgit-pink (git 2.37.1) at 2024-11-28 16:51:16 +0000