Thibaut Girka
a8e896af12
Fix fav/boosts hotkeys not working on detailed statuses
2018-10-18 19:00:59 +02:00
Thibaut Girka
8a87a1cda4
Fix deleting individual notifications from glitch-soc's web interface
...
Fixes #783
2018-10-15 22:36:55 +02:00
Thibaut Girka
ccf5ddfd88
Handle alt+enter in the spoiler input as shortcut for secondary post
...
Fixes #780
2018-10-14 12:00:21 +02:00
Thibaut Girka
794b2dad99
Fix auto-unfold CWs when no regexp is set
...
Fixes #778
2018-10-12 23:34:26 +02:00
Thibaut Girka
dbc1b36b61
Allow selecting both default flavour and theme
...
Fixes #672
2018-10-12 19:06:35 +02:00
Eugen Rochko
27376e2457
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 65d1a2d10a
.
* 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-12 07:00:41 +02:00
ThibG
10ed0ddd2a
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-11 21:28:03 +02:00
Thibaut Girka
70a7f72fda
Merge commit '0167397218110e26300bbc6891bc4b1849add083' into glitch-soc/merge-upstream
2018-10-11 14:12:36 +02:00
dependabot[bot]
0167397218
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>
2018-10-10 19:36:41 +02:00
Thibaut Girka
bf559a477a
Really fix HotKeys
2018-10-10 17:40:06 +02:00
dependabot[bot]
9c66e239d1
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>
2018-10-10 22:09:53 +09:00
dependabot[bot]
de89e3670e
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>
2018-10-10 22:09:23 +09:00
Eugen Rochko
af3ef0afb0
Add description meta tag additionally to og:description ( #8941 )
...
Fix #8685
2018-10-10 02:21:30 +02:00
Eugen Rochko
c227151023
Add dns-prefetch if using different host for assets or uploads ( #8942 )
2018-10-10 01:31:10 +02:00
Thibaut Girka
8cb843039c
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
2018-10-09 21:08:26 +02:00
dependabot[bot]
02b17344fd
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>
2018-10-09 19:43:26 +02:00
dependabot[bot]
a1be1d17fe
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>
2018-10-09 19:43:05 +02:00
mayaeh
cf43973ecd
Fix that the copy button of verify link did not work. ( #8938 )
2018-10-09 19:36:13 +02:00
Eugen Rochko
ad0f37e924
Track historical space stats in PgHero to determine PostgreSQL growth ( #8906 )
2018-10-09 19:35:14 +02:00
Thibaut Girka
f9fc7d7660
Fix CW icon color in local-settings modal
2018-10-09 18:10:54 +02:00
Thibaut Girka
d21c9f08e5
Define some local-settings hints
2018-10-09 18:10:54 +02:00
Thibaut Girka
c40ba63f42
Add support for hints (or extended descriptions) in local-settings pages
2018-10-09 18:10:54 +02:00
Thibaut Girka
c598692cdf
When screen width is too narrow, hide local-settings page text, keep only icons
2018-10-09 18:10:54 +02:00
Thibaut Girka
56773bc55c
Change “preferences” icon to match settings page icon
2018-10-09 18:10:54 +02:00
Thibaut Girka
065a19b18b
Add icons for each of the local-setting pages
2018-10-09 18:10:54 +02:00
ThibG
02422158ae
Merge pull request #774 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-09 13:23:01 +02:00
dependabot[bot]
4580979e28
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>
2018-10-09 19:59:34 +09:00
dependabot[bot]
dbaded7ed2
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>
2018-10-09 19:39:46 +09:00
Thibaut Girka
f09150f2a9
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-09 12:12:03 +02:00
ThibG
d73c1df33b
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-09 12:11:14 +02:00
Thibaut Girka
e968dcea13
Fix app-wide hotkeys randomly failing to work
2018-10-09 12:10:51 +02:00
Sascha
b7a337f63c
add ffmpeg initializer ( #8855 )
...
* add ffmpeg initializer
* use different expression to check for environment var
2018-10-09 03:02:52 +02:00
mayaeh
bcb43baf50
Add Japanese translations. ( #8927 )
2018-10-09 07:12:37 +09:00
Thibaut Girka
683608dd60
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 15:34:53 +02:00
mayaeh
96a313d02b
Fixed error occurrence when pinning the DM column. ( #8922 )
2018-10-08 14:43:38 +02:00
Thibaut Girka
74e411f4e8
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-08 13:51:33 +02:00
Thibaut Girka
3f68e9ed11
Move “Show action buttons in collapsed toots” option
2018-10-08 13:49:25 +02:00
Thibaut Girka
caa56b01a9
Switch from selects to radio buttons for local settings, improve styling
2018-10-08 13:49:25 +02:00
dependabot[bot]
e303c0730f
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>
2018-10-08 07:45:31 +02:00
dependabot[bot]
7e089b5a31
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>
2018-10-08 07:45:08 +02:00
dependabot[bot]
63581a9262
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>
2018-10-08 07:44:53 +02:00
dependabot[bot]
098012ab39
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>
2018-10-08 14:24:07 +09:00
ashleyhull-versent
00d31a292c
rubocop issues - Cleaning up ( #8912 )
...
* cleanup pass
* undo mistakes
* fixed.
* revert
2018-10-08 04:50:11 +02:00
Eugen Rochko
65d1a2d10a
Remove dead code ( #8919 )
...
SignatureVerification#matches_time_window? is not called anywhere.
2018-10-08 04:48:54 +02:00
ashleyhull-versent
ea57aca5e1
Replace SVG asset with Custom mascot ( #8766 )
2018-10-08 00:20:45 +02:00
Eugen Rochko
c9b5168ebd
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
2018-10-07 23:44:58 +02:00
Thibaut Girka
58cbb9ef8f
[Glitch] Change documentation URL
...
Port 7635a136c9
to glitch-soc
2018-10-07 22:56:24 +02:00
Thibaut Girka
52f97080e7
[Glitch] RTL: fix margins of public-account-header__tabs
...
Port e2065ceead
to glitch-soc
2018-10-07 22:56:24 +02:00
ThibG
c8690cc917
Merge pull request #768 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-07 20:13:07 +02:00
Thibaut Girka
bdbbbb1bdb
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-07 19:47:56 +02:00