Thibaut Girka
b0527a4ce7
Handle alt+enter in the spoiler input as shortcut for secondary post
Fixes #780
6 years ago
Thibaut Girka
70d346ea95
Fix auto-unfold CWs when no regexp is set
Fixes #778
6 years ago
Thibaut Girka
3d5d899094
Allow selecting both default flavour and theme
Fixes #672
6 years ago
Eugen Rochko
fac529975b
Improve signature verification safeguards ( #8959 )
* 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 a00ce8c92c
.
* 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
6 years ago
ThibG
0075964244
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
6 years ago
Thibaut Girka
8f720be9f3
Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream
6 years ago
dependabot[bot]
ac7df62a04
Bump better_errors from 2.4.0 to 2.5.0 ( #8946 )
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>
6 years ago
Thibaut Girka
bb1103d974
Really fix HotKeys
6 years ago
dependabot[bot]
070f817177
Bump bullet from 5.7.5 to 5.7.6 ( #8947 )
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>
6 years ago
dependabot[bot]
47d7381d60
Bump scss_lint from 0.57.0 to 0.57.1 ( #8948 )
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>
6 years ago
Eugen Rochko
2459da29c2
Add description meta tag additionally to og:description ( #8941 )
Fix #8685
6 years ago
Eugen Rochko
da7705b274
Add dns-prefetch if using different host for assets or uploads ( #8942 )
6 years ago
Thibaut Girka
a02244f17c
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
6 years ago
dependabot[bot]
46e4a759bb
Bump capistrano-rails from 1.3.1 to 1.4.0 ( #8936 )
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>
6 years ago
dependabot[bot]
076ceffa84
Bump dotenv-rails from 2.2.2 to 2.5.0 ( #8934 )
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>
6 years ago
mayaeh
e50cb5f4bd
Fix that the copy button of verify link did not work. ( #8938 )
6 years ago
Eugen Rochko
7f9dd92a27
Track historical space stats in PgHero to determine PostgreSQL growth ( #8906 )
6 years ago
Thibaut Girka
269edc0e48
Fix CW icon color in local-settings modal
6 years ago
Thibaut Girka
721aec40cd
Define some local-settings hints
6 years ago
Thibaut Girka
26409f3e8e
Add support for hints (or extended descriptions) in local-settings pages
6 years ago
Thibaut Girka
5f308a7f05
When screen width is too narrow, hide local-settings page text, keep only icons
6 years ago
Thibaut Girka
6cd793f0ac
Change “preferences” icon to match settings page icon
6 years ago
Thibaut Girka
edb9ec8543
Add icons for each of the local-setting pages
6 years ago
ThibG
641d056e0f
Merge pull request #774 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
6 years ago
dependabot[bot]
d4b7d75968
Bump faker from 1.8.7 to 1.9.1 ( #8935 )
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>
6 years ago
dependabot[bot]
a47c8545c7
Bump memory_profiler from 0.9.11 to 0.9.12 ( #8937 )
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>
6 years ago
Thibaut Girka
122ac9cd1d
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
4134a10549
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
6 years ago
Thibaut Girka
d0b1369a85
Fix app-wide hotkeys randomly failing to work
6 years ago
Sascha
b2a57a5d6f
add ffmpeg initializer ( #8855 )
* add ffmpeg initializer
* use different expression to check for environment var
6 years ago
mayaeh
87abbb07f3
Add Japanese translations. ( #8927 )
6 years ago
Thibaut Girka
b368d3c15d
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh
770e337497
Fixed error occurrence when pinning the DM column. ( #8922 )
6 years ago
Thibaut Girka
d17844e6d1
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
96c3d26870
Move “Show action buttons in collapsed toots” option
6 years ago
Thibaut Girka
faecb35fe0
Switch from selects to radio buttons for local settings, improve styling
6 years ago
dependabot[bot]
4c4ff05a46
Bump capybara from 3.8.2 to 3.9.0 ( #8924 )
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>
6 years ago
dependabot[bot]
8639f000ea
Bump tty-prompt from 0.17.0 to 0.17.1 ( #8925 )
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>
6 years ago
dependabot[bot]
10e38b441f
Bump aws-sdk-s3 from 1.20.0 to 1.21.0 ( #8926 )
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>
6 years ago
dependabot[bot]
87ad9c408c
Bump i18n-tasks from 0.9.21 to 0.9.25 ( #8923 )
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>
6 years ago
ashleyhull-versent
f194857ac9
rubocop issues - Cleaning up ( #8912 )
* cleanup pass
* undo mistakes
* fixed.
* revert
6 years ago
Eugen Rochko
a00ce8c92c
Remove dead code ( #8919 )
SignatureVerification#matches_time_window? is not called anywhere.
6 years ago
ashleyhull-versent
2dba313100
Replace SVG asset with Custom mascot ( #8766 )
6 years ago
Eugen Rochko
774ac47373
Add conversations API ( #8832 )
* 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
6 years ago
Thibaut Girka
a3677a828d
[Glitch] Change documentation URL
Port 28401962ca
to glitch-soc
6 years ago
Thibaut Girka
b4ba1058b8
[Glitch] RTL: fix margins of public-account-header__tabs
Port 185cb2dc3a
to glitch-soc
6 years ago
ThibG
f1c3053d36
Merge pull request #768 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
6 years ago
Thibaut Girka
611740ce81
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
25744d43b0
Ensure only toots from the reported users are reported ( #8916 )
6 years ago
Eugen Rochko
09d789e79b
Add POST /api/v1/notifications/:id/dismiss ( #8905 )
POST /api/v1/notifications/dismiss was a mistake in #2251
6 years ago